From b92dfd6718bd2e2c8c4d561b033ab35e0be575b1 Mon Sep 17 00:00:00 2001
From: Thasan <thasan@koodaa.net>
Date: Fri, 25 Sep 2015 23:06:56 +0300
Subject: [PATCH 001/250] Adding support for apache 2.4 This requires
 mod_version installed, but many distributions ship it by default

---
 .htaccess | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index ec345a41c..3ff67c0cc 100644
--- a/.htaccess
+++ b/.htaccess
@@ -3,7 +3,14 @@
 </IfModule>
 
 <FilesMatch "\.(sqlite|sdb|s3db|db)$">
-	Deny from all
+	# Apache 2.4
+	<IfVersion >= 2.4>
+		Require all denied
+	</IfVersion>
+	# Apache 2.2
+	<IfVersion < 2.4>
+		Deny from all
+	</IfVersion>
 </FilesMatch>
 
 <IfModule mod_rewrite.c>

From 993bedc10ce3e575350642ed0645753fc4be12ba Mon Sep 17 00:00:00 2001
From: Thasan <thasan@koodaa.net>
Date: Sun, 27 Sep 2015 22:48:30 +0300
Subject: [PATCH 002/250] Changing to use IfModule instead of IfVersion

---
 .htaccess | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.htaccess b/.htaccess
index 3ff67c0cc..fd9515908 100644
--- a/.htaccess
+++ b/.htaccess
@@ -3,14 +3,12 @@
 </IfModule>
 
 <FilesMatch "\.(sqlite|sdb|s3db|db)$">
-	# Apache 2.4
-	<IfVersion >= 2.4>
+	<IfModule mod_authz_host.c>
 		Require all denied
-	</IfVersion>
-	# Apache 2.2
-	<IfVersion < 2.4>
+	</IfModule>
+	<IfModule !mod_authz_host.c>
 		Deny from all
-	</IfVersion>
+	</IfModule>
 </FilesMatch>
 
 <IfModule mod_rewrite.c>

From 23b9d7d8da2132b47bfb1cdd3149e894c1d4ec24 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 8 Oct 2015 18:03:45 +0100
Subject: [PATCH 003/250] improved metatag regex

---
 ext/numeric_score/main.php |  4 ++--
 ext/user/main.php          | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/numeric_score/main.php b/ext/numeric_score/main.php
index 8cb65a7b0..b7efed348 100644
--- a/ext/numeric_score/main.php
+++ b/ext/numeric_score/main.php
@@ -247,9 +247,9 @@ public function onSearchTermParse(SearchTermParseEvent $event) {
 				"images.id in (SELECT image_id FROM numeric_score_votes WHERE user_id=:ns_user_id AND score=-1)",
 				array("ns_user_id"=>$iid)));
 		}
-		else if(preg_match("/^order[=|:](numeric_)?(score)[_]?(desc|asc)?$/i", $event->term, $matches)){
+		else if(preg_match("/^order[=|:](?:numeric_)?(score)(?:_(desc|asc))?$/i", $event->term, $matches)){
 			$default_order_for_column = "DESC";
-			$sort = isset($matches[3]) ? strtoupper($matches[3]) : $default_order_for_column;
+			$sort = isset($matches[2]) ? strtoupper($matches[2]) : $default_order_for_column;
 			Image::$order_sql = "images.numeric_score $sort";
 			$event->add_querylet(new Querylet("1=1")); //small hack to avoid metatag being treated as normal tag
 		}
diff --git a/ext/user/main.php b/ext/user/main.php
index 19f87ca76..32d31eaab 100644
--- a/ext/user/main.php
+++ b/ext/user/main.php
@@ -313,8 +313,8 @@ public function onSearchTermParse(SearchTermParseEvent $event) {
 		global $user;
 
 		$matches = array();
-		if(preg_match("/^(poster|user)[=|:](.*)$/i", $event->term, $matches)) {
-			$duser = User::by_name($matches[2]);
+		if(preg_match("/^(?:poster|user)[=|:](.*)$/i", $event->term, $matches)) {
+			$duser = User::by_name($matches[1]);
 			if(!is_null($duser)) {
 				$user_id = $duser->id;
 			}
@@ -323,12 +323,12 @@ public function onSearchTermParse(SearchTermParseEvent $event) {
 			}
 			$event->add_querylet(new Querylet("images.owner_id = $user_id"));
 		}
-		else if(preg_match("/^(poster|user)_id[=|:]([0-9]+)$/i", $event->term, $matches)) {
-			$user_id = int_escape($matches[2]);
+		else if(preg_match("/^(?:poster|user)_id[=|:]([0-9]+)$/i", $event->term, $matches)) {
+			$user_id = int_escape($matches[1]);
 			$event->add_querylet(new Querylet("images.owner_id = $user_id"));
 		}
-		else if($user->can("view_ip") && preg_match("/^(poster|user)_ip[=|:]([0-9\.]+)$/i", $event->term, $matches)) {
-			$user_ip = $matches[2]; // FIXME: ip_escape?
+		else if($user->can("view_ip") && preg_match("/^(?:poster|user)_ip[=|:]([0-9\.]+)$/i", $event->term, $matches)) {
+			$user_ip = $matches[1]; // FIXME: ip_escape?
 			$event->add_querylet(new Querylet("images.owner_ip = '$user_ip'"));
 		}
 	}

From 6ff80ab2c8985e5f9bdaaeed5ce8fd694e3638c0 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 8 Oct 2015 18:22:20 +0100
Subject: [PATCH 004/250] move tag sanitization, alias checking & tag parsing
 to TagSetEvent

---
 core/imageboard.pack.php |  9 ---------
 ext/tag_edit/main.php    | 27 ++++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index dc92b1457..9d24d8817 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -576,9 +576,6 @@ public function set_tags($tags) {
 		assert('is_array($tags) && count($tags) > 0', var_export($tags, true));
 		global $database;
 
-		$tags = array_map(array('Tag', 'sanitise'), $tags);
-		$tags = Tag::resolve_aliases($tags);
-
 		if(count($tags) <= 0) {
 			throw new SCoreException('Tried to set zero tags');
 		}
@@ -588,12 +585,6 @@ public function set_tags($tags) {
 			$this->delete_tags_from_image();
 			// insert each new tags
 			foreach($tags as $tag) {
-				$ttpe = new TagTermParseEvent($tag, $this->id);
-				send_event($ttpe);
-				if($ttpe->is_metatag()) {
-					continue;
-				}
-
 				if(mb_strlen($tag, 'UTF-8') > 255){
 					flash_message("The tag below is longer than 255 characters, please use a shorter tag.\n$tag\n");
 					continue;
diff --git a/ext/tag_edit/main.php b/ext/tag_edit/main.php
index 1dfa025ea..09d86ba12 100644
--- a/ext/tag_edit/main.php
+++ b/ext/tag_edit/main.php
@@ -95,11 +95,32 @@ public function __construct(Image $image, $source) {
 class TagSetEvent extends Event {
 	/** @var \Image */
 	public $image;
-	var $tags;
+	public $tags;
+	public $metatags;
 
 	public function __construct(Image $image, $tags) {
-		$this->image = $image;
-		$this->tags = Tag::explode($tags);
+		$this->image    = $image;
+
+		$this->tags     = array();
+		$this->metatags = array();
+
+		//tags need to be sanitised, alias checked & have metatags removed before being passed to onTagSet
+		$tag_array = Tag::explode($tags);
+		$tag_array = array_map(array('Tag', 'sanitise'), $tag_array);
+		$tag_array = Tag::resolve_aliases($tag_array);
+
+		foreach($tag_array as $tag) {
+			//TODO: Parsing metatags BEFORE set_tags is sent seems like a bad idea?
+			$ttpe = new TagTermParseEvent($tag, $image->id);
+			send_event($ttpe);
+
+			//seperate tags from metatags
+			if(!$ttpe->is_metatag()) {
+				array_push($this->tags, $tag);
+			}else{
+				array_push($this->metatags, $tag);
+			}
+		}
 	}
 }
 

From 744989a983ab2901e308fa31b1824db46c4abe60 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 8 Oct 2015 18:25:03 +0100
Subject: [PATCH 005/250] Tag::explode should now remove duplicate tags

---
 core/imageboard.pack.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 9d24d8817..8b539f3af 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -1147,6 +1147,8 @@ public static function explode($tags, $tagme=true) {
 			$tag_array = array("tagme");
 		}
 
+		$tag_array = array_iunique($tag_array); //remove duplicate tags
+
 		sort($tag_array);
 
 		return $tag_array;

From b11041898b5d2a7c9c51dfd7592040a8c83ab942 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 8 Oct 2015 18:28:00 +0100
Subject: [PATCH 006/250] Tag::explode instead of explode this fixes the off
 chance that an empty tag could be passed

---
 core/imageboard.pack.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 8b539f3af..de659e3a0 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -1247,7 +1247,7 @@ public static function resolve_aliases($tags) {
 		$i = 0;
 		$tag_count = count($tags);
 		while($i<$tag_count) {
-			$aliases = explode(' ', Tag::resolve_alias($tags[$i]));
+			$aliases = Tag::explode(Tag::resolve_alias($tags[$i]), FALSE);
 			foreach($aliases as $alias){
 				if(!in_array($alias, $new)){
 					if($tags[$i] == $alias){

From 43d0a297b8c6bff9423f3e945844c9a030bc58ca Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 8 Oct 2015 18:58:52 +0100
Subject: [PATCH 007/250] move metatag parsing to after set_tags is sent,
 rather than before

---
 core/imageboard.pack.php     | 12 ++++++++++++
 ext/numeric_score/main.php   |  2 +-
 ext/relatationships/main.php |  4 ++--
 ext/tag_edit/main.php        | 21 ++++++++++++---------
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index de659e3a0..ebe011584 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -623,6 +623,18 @@ public function set_tags($tags) {
 		}
 	}
 
+	/**
+	 * Send list of metatags to be parsed.
+	 *
+	 * @param [] $metatags
+	 */
+	public function parse_metatags(/*arr*/ $metatags, $image_id) {
+		foreach($metatags as $tag) {
+			$ttpe = new TagTermParseEvent($tag, $image_id, TRUE);
+			send_event($ttpe);
+		}
+	}
+
 	/**
 	 * Delete this image from the database and disk
 	 */
diff --git a/ext/numeric_score/main.php b/ext/numeric_score/main.php
index b7efed348..9286e7e2f 100644
--- a/ext/numeric_score/main.php
+++ b/ext/numeric_score/main.php
@@ -258,7 +258,7 @@ public function onSearchTermParse(SearchTermParseEvent $event) {
 	public function onTagTermParse(TagTermParseEvent $event) {
 		$matches = array();
 
-		if(preg_match("/^vote[=|:](up|down|remove)$/", $event->term, $matches)) {
+		if(preg_match("/^vote[=|:](up|down|remove)$/", $event->term, $matches) && $event->parse) {
 			global $user;
 			$score = ($matches[1] == "up" ? 1 : ($matches[1] == "down" ? -1 : 0));
 			if(!$user->is_anonymous()) {
diff --git a/ext/relatationships/main.php b/ext/relatationships/main.php
index 6cd1a7b0e..8ecc69912 100644
--- a/ext/relatationships/main.php
+++ b/ext/relatationships/main.php
@@ -58,7 +58,7 @@ public function onSearchTermParse(SearchTermParseEvent $event) {
 	public function onTagTermParse(TagTermParseEvent $event) {
 		$matches = array();
 
-		if(preg_match("/^parent[=|:]([0-9]+|none)$/", $event->term, $matches)) {
+		if(preg_match("/^parent[=|:]([0-9]+|none)$/", $event->term, $matches) && $event->parse) {
 			$parentID = $matches[1];
 
 			if($parentID == "none" || $parentID == "0"){
@@ -67,7 +67,7 @@ public function onTagTermParse(TagTermParseEvent $event) {
 				$this->set_parent($event->id, $parentID);
 			}
 		}
-		else if(preg_match("/^child[=|:]([0-9]+)$/", $event->term, $matches)) {
+		else if(preg_match("/^child[=|:]([0-9]+)$/", $event->term, $matches) && $event->parse) {
 			$childID = $matches[1];
 
 			$this->set_child($event->id, $childID);
diff --git a/ext/tag_edit/main.php b/ext/tag_edit/main.php
index 09d86ba12..918a01116 100644
--- a/ext/tag_edit/main.php
+++ b/ext/tag_edit/main.php
@@ -110,8 +110,7 @@ public function __construct(Image $image, $tags) {
 		$tag_array = Tag::resolve_aliases($tag_array);
 
 		foreach($tag_array as $tag) {
-			//TODO: Parsing metatags BEFORE set_tags is sent seems like a bad idea?
-			$ttpe = new TagTermParseEvent($tag, $image->id);
+			$ttpe = new TagTermParseEvent($tag, $this->image->id, FALSE); //Only check for metatags, don't parse. Parsing is done after set_tags.
 			send_event($ttpe);
 
 			//seperate tags from metatags
@@ -152,14 +151,17 @@ public function __construct(Image $image, $locked) {
  * Signal that a tag term needs parsing
  */
 class TagTermParseEvent extends Event {
-	var $term = null;
-	var $id = null;
+	public $term = NULL; //tag
+	public $id   = NULL; //image_id
 	/** @var bool */
-	public $metatag = false;
+	public $metatag = FALSE;
+	/** @var bool */
+	public $parse  = TRUE; //marks the tag to be parsed, and not just checked if valid metatag
 
-	public function __construct($term, $id) {
-		$this->term = $term;
-		$this->id = $id;
+	public function __construct($term, $id, $parse) {
+		$this->term  = $term;
+		$this->id    = $id;
+		$this->parse = $parse;
 	}
 
 	/**
@@ -236,6 +238,7 @@ public function onTagSet(TagSetEvent $event) {
 		if($user->can("edit_image_tag") && (!$event->image->is_locked() || $user->can("edit_image_lock"))) {
 			$event->image->set_tags($event->tags);
 		}
+		$event->image->parse_metatags($event->metatags, $event->image->id);
 	}
 
 	public function onSourceSet(SourceSetEvent $event) {
@@ -278,7 +281,7 @@ public function onImageInfoBoxBuilding(ImageInfoBoxBuildingEvent $event) {
 	public function onTagTermParse(TagTermParseEvent $event) {
 		$matches = array();
 
-		if(preg_match("/^source[=|:](.*)$/i", $event->term, $matches)) {
+		if(preg_match("/^source[=|:](.*)$/i", $event->term, $matches) && $event->parse) {
 			$source = ($matches[1] !== "none" ? $matches[1] : null);
 			send_event(new SourceSetEvent(Image::by_id($event->id), $source));
 		}

From de761c11d779837119aabb1a7b0b574734889d95 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 8 Oct 2015 19:20:40 +0100
Subject: [PATCH 008/250] speed: don't check tag for metatag if doesn't contain
 : or =

---
 ext/tag_edit/main.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ext/tag_edit/main.php b/ext/tag_edit/main.php
index 918a01116..12be5ab71 100644
--- a/ext/tag_edit/main.php
+++ b/ext/tag_edit/main.php
@@ -110,6 +110,13 @@ public function __construct(Image $image, $tags) {
 		$tag_array = Tag::resolve_aliases($tag_array);
 
 		foreach($tag_array as $tag) {
+			if((strpos($tag, ':') === FALSE) && (strpos($tag, '=') === FALSE)) {
+				//Tag doesn't contain : or =, meaning it can't possibly be a metatag.
+				//This should help speed wise, as it avoids running every single tag through a bunch of preg_match instead.
+				array_push($this->tags, $tag);
+				continue;
+			}
+
 			$ttpe = new TagTermParseEvent($tag, $this->image->id, FALSE); //Only check for metatags, don't parse. Parsing is done after set_tags.
 			send_event($ttpe);
 

From 600011219f41561996f5dc8a9b91cda6ff5c9d84 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 8 Oct 2015 19:25:38 +0100
Subject: [PATCH 009/250] update docs

---
 core/imageboard.pack.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index ebe011584..e27bc7a0a 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -627,8 +627,9 @@ public function set_tags($tags) {
 	 * Send list of metatags to be parsed.
 	 *
 	 * @param [] $metatags
+	 * @param int $image_id
 	 */
-	public function parse_metatags(/*arr*/ $metatags, $image_id) {
+	public function parse_metatags($metatags, $image_id) {
 		foreach($metatags as $tag) {
 			$ttpe = new TagTermParseEvent($tag, $image_id, TRUE);
 			send_event($ttpe);

From b9f6b44301f19f76725824410256c3e25328d6e5 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Mon, 26 Oct 2015 12:14:36 +0000
Subject: [PATCH 010/250] bump

---
 core/sys_config.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/sys_config.inc.php b/core/sys_config.inc.php
index 5db805faf..506c89932 100644
--- a/core/sys_config.inc.php
+++ b/core/sys_config.inc.php
@@ -36,7 +36,7 @@ function _d($name, $value) {if(!defined($name)) define($name, $value);}
 _d("NICE_URLS", false);      // boolean  force niceurl mode
 _d("SEARCH_ACCEL", false);   // boolean  use search accelerator
 _d("WH_SPLITS", 1);          // int      how many levels of subfolders to put in the warehouse
-_d("VERSION", '2.5.5');      // string   shimmie version
+_d("VERSION", '2.5.5+');     // string   shimmie version
 _d("TIMEZONE", null);        // string   timezone
 _d("CORE_EXTS", "bbcode,user,mail,upload,image,view,handle_pixel,ext_manager,setup,upgrade,handle_404,comment,tag_list,index,tag_edit,alias_editor"); // extensions to always enable
 _d("EXTRA_EXTS", "");        // optional extra extensions

From 6fb43eab198bcaaf6eba444b69273fc6d75e024c Mon Sep 17 00:00:00 2001
From: William Crandell <william@crandell.ws>
Date: Mon, 26 Oct 2015 08:51:02 -0400
Subject: [PATCH 011/250] On Develop branch

 Sorry about that
---
 themes/material/layout.class.php   | 283 +++++++++++++++++++++++++++++
 themes/material/material.min.css   |   8 +
 themes/material/material.min.js    |  10 +
 themes/material/script.js          |   0
 themes/material/script0.js         |  95 ++++++++++
 themes/material/style.css          |   3 +
 themes/material/themelet.class.php |   3 +
 themes/material/upload.theme.php   |  11 ++
 themes/material/user.theme.php     |  29 +++
 themes/material/view.theme.php     |  82 +++++++++
 10 files changed, 524 insertions(+)
 create mode 100644 themes/material/layout.class.php
 create mode 100644 themes/material/material.min.css
 create mode 100644 themes/material/material.min.js
 create mode 100644 themes/material/script.js
 create mode 100644 themes/material/script0.js
 create mode 100644 themes/material/style.css
 create mode 100644 themes/material/themelet.class.php
 create mode 100644 themes/material/upload.theme.php
 create mode 100644 themes/material/user.theme.php
 create mode 100644 themes/material/view.theme.php

diff --git a/themes/material/layout.class.php b/themes/material/layout.class.php
new file mode 100644
index 000000000..e8da63d67
--- /dev/null
+++ b/themes/material/layout.class.php
@@ -0,0 +1,283 @@
+<?php
+/**
+ * A class to turn a Page data structure into a blob of HTML
+ */
+class Layout {
+	/**
+	 * turns the Page into HTML
+	 */
+	public function display_page(Page $page) {
+		global $config;
+
+		$theme_name = $config->get_string('theme', 'material');
+		$site_name = $config->get_string('title');
+		$data_href = get_base_href();
+		$main_page = $config->get_string('main_page');
+		$contact_link = $config->get_string('contact_link');
+    $site_link = make_link();
+
+		$header_html = "";
+		ksort($page->html_headers);
+		foreach($page->html_headers as $line) {
+			$header_html .= "\t\t$line\n";
+		}
+
+		$left_block_html = "";
+		$main_block_html = "";
+		$head_block_html = "";
+		$sub_block_html = "";
+		$drawer_block_html = ""; //use exampled in user.theme.php & view.theme.php
+		$toolbar_block_html = ""; // not used at this point
+		$subtoolbar_block_html = ""; // use exampled in user.theme.php
+    $navigation = "";
+
+    $h_search = "
+      <div class='mdl-textfield mdl-js-textfield mdl-textfield--expandable
+                  mdl-textfield--floating-label mdl-textfield--align-right'>
+        <form action='".make_link()."' method='GET'>
+          <label class='mdl-button mdl-js-button mdl-button--icon'
+                 for='waterfall-exp'>
+            <i class='material-icons'>search</i>
+          </label>
+          <div class='mdl-textfield__expandable-holder'>
+            <input id='waterfall-exp' class='autocomplete_tags mdl-textfield__input' name='search' type='text' placeholder='Search' value='' />
+            <input type='hidden' name='q' value='/post/list'>
+            <input type='submit' value='Find' style='display: none;' />
+          </div>
+        </form>
+      </div>
+    ";
+
+		foreach($page->blocks as $block) {
+			switch($block->section) {
+				case "toolbar":
+					$toolbar_block_html .= $this->get_html($block, "toolbar");
+					break;
+				case "subtoolbar":
+					$subtoolbar_block_html .= $this->get_html($block, "subtoolbar");
+  				break;
+				case "left":
+          if($block->header == "Navigation"){
+            $subtoolbar_block_html = $this->rework_navigation($block);
+            break;
+          }
+					// $left_block_html .= $block->get_html(true);
+          $left_block_html .= $this->get_html($block, "full", true, "left-blocks nav-card mdl-cell--4-col-tablet");
+					break;
+				case "head":
+          $head_block_html .= $this->get_html($block, "third", true, "nav-card head-blocks");
+					break;
+				case "drawer":
+          $drawer_block_html .= $this->get_html($block, "full", true, "nav-card drawer-blocks");
+					break;
+				case "main":
+					// $main_block_html .= $block->get_html(false);
+          $main_block_html .= $this->get_html($block, "main", true, "");
+					break;
+				case "subheading":
+					// $sub_block_html .= $block->body; // $this->block_to_html($block, true);
+          $sub_block_html .= $this->get_html($block, "third", true, "nav-card");
+					break;
+				default:
+					print "<p>error: {$block->header} using an unknown section ({$block->section})";
+					break;
+			}
+		}
+
+		$debug = get_debug_info();
+
+		$contact = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a>";
+		/*$subheading = empty($page->subheading) ? "" : "<div id='subtitle'>{$page->subheading}</div>";
+
+		$wrapper = "";
+		if(strlen($page->heading) > 100) {
+			$wrapper = ' style="height: 3em; overflow: auto;"';
+		}
+		*/
+
+		$flash = get_prefixed_cookie("flash_message");
+		$flash_html = "";
+		if($flash) {
+			$flash_html = "<b id='flash'>".nl2br(html_escape($flash))." <a href='#' onclick=\"\$('#flash').hide(); return false;\">[X]</a></b>";
+			set_prefixed_cookie("flash_message", "", -1, "/");
+		}
+
+		print <<<EOD
+<!doctype html>
+<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
+<!--[if IE 7]>    <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
+<!--[if IE 8]>    <html class="no-js lt-ie9" lang="en"> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
+	<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<title>{$page->title}</title>
+    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en">
+    <link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons"  rel="stylesheet">
+    <link rel="stylesheet" href="{$data_href}/themes/{$theme_name}/material.min.css?v1.0.5"  rel="stylesheet">
+    $header_html
+		<script type="text/javascript" src="{$data_href}/themes/{$theme_name}/material.min.js?v1.0.5"></script>
+		<script type="text/javascript" src="{$data_href}/themes/{$theme_name}/script0.js?v1"></script>
+    <!-- having conflicts this ensures the screens will not remain hidden \while the layout is adjusted -->
+	</head>
+
+	<body>
+
+    <div class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
+      <header class="mdl-layout__header mdl-layout__header--waterfall">
+        <!-- Top row, always visible -->
+        <div class="mdl-layout__header-row ">
+          <!-- Title -->
+          <span class="mdl-layout-title">
+            <a class="mdl-logo" href="{$site_link}">{$site_name}</a>
+          </span>
+          <div class="mdl-layout-spacer"></div>
+          $h_search
+          {$toolbar_block_html}
+          <button id="menu-left-col-menu"
+                  class="mdl-button mdl-js-button mdl-button--icon">
+            <i class="material-icons">more_vert</i>
+          </button>
+        </div>
+        <!-- Bottom row, not visible on scroll -->
+        <div class="mdl-layout__header-row">
+          <div class="mdl-layout-spacer"></div>
+          <!-- Navigation -->
+          {$subtoolbar_block_html}
+        </div>
+      </header>
+      <div class="mdl-layout__drawer">
+        <span class="mdl-layout-title">Drawer</span>
+          <div class="mdl-grid">
+            $drawer_block_html
+          </div>
+        <nav class="mdl-navigation">
+          <a class="mdl-navigation__link" href="http://code.shishnet.org/shimmie2/">Shimmie  &copy;</a>
+        </nav>
+      </div>
+      <main class="mdl-layout__content">
+        <div class="mdl-grid">
+          <div class="mdl-cell mdl-cell--12-col mdl-grid ">
+            $head_block_html
+            $sub_block_html
+          </div>
+        </div>
+        <div id="main-grid" class="mdl-grid">
+          <div id="left-block" class="mdl-cell mdl-cell--4-col mdl-cell--8-col-tablet mdl-cell--4-col-phone mdl-color--grey-200">
+            <script>
+              document.getElementById("left-block").style.display="none";
+            </script>
+            <div id="left-blk-content" class="mdl-cell mdl-cell--12-col mdl-grid">
+              <!-- Start Left Block -->
+              $left_block_html
+            </div>
+          </div>
+          <div id="main-block" class="mdl-cell mdl-shadow--2dp mdl-cell--8-col mdl-cell--8-col-tablet mdl-color--grey-200 mdl-grid">
+              <script>
+                document.getElementById("main-block").style.display="none";
+              </script>
+              <!-- Start art Block -->
+              <article class="mdl-cell mdl-cell--12-col mdl-cell--top">
+              $flash_html
+              $main_block_html
+              </article>
+          </div>
+        </div>
+          <footer class="mdl-mini-footer">
+              $debug
+              $contact
+          </footer>
+      </main>
+    </div>
+
+    <ul class="mdl-menu mdl-menu--bottom-right mdl-js-menu mdl-js-ripple-effect"
+        for="menu-left-col-menu">
+      <li id="layout-top" class="mdl-menu__item">Layout Top</li>
+      <li id="layout-right" class="mdl-menu__item">Layout Right</li>
+      <li id="layout-bottom" class="mdl-menu__item">Layout Bottom</li>
+      <li id="layout-left" class="mdl-menu__item">Layout Left</li>
+    </ul>
+	</body>
+</html>
+EOD;
+	}
+
+  public function rework_navigation(Block $block){
+    $h = $block->header;
+    $b = $block->body;
+    $i = $block->id;
+
+    $dom = new DomDocument();
+    $dom->loadHTML($b);
+    $output = array();
+    $html = "<section id='$i'>\n<nav class='mdl-navigation'>\n";
+    foreach ($dom->getElementsByTagName('a') as $item) {
+       $item->setAttribute('class', 'mdl-navigation__link');
+       $html .= $dom->saveHTML($item);
+      //  $output[] = array (
+      //     ,'str' => $dom->saveHTML($item)
+      //     // ,'href' => $item->getAttribute('href')
+      //     // ,'anchorText' => $item->nodeValue
+      //  );
+    }
+    $html .= "</nav>\n</section>\n";
+    return $html;
+  }
+
+  /**
+   * Get the HTML for this block. from core
+   *
+   * @param bool $hidable
+   * @return string
+   */
+  public function get_html(Block $block, $section="main", $hidable=false, $extra_class="") {
+    $h = $block->header;
+    $b = $block->body;
+    $i = $block->id;
+    $i = preg_replace('/[^\w-]/', '', $i);//blotter extention id has `!`
+
+    if($section == "toolbar"){
+      $html = "<section id='$i'>\n<nav class='mdl-navigation'>\n";
+      if(!empty($b)) $html .= "$b";
+      $html .= "</nav>\n</section>\n";
+      return $html;
+    }
+    if($section == "subtoolbar"){
+      $html = "<section id='$i'>\n<nav class='mdl-navigation'>\n";
+      if(!empty($b)) $html .= "$b";
+      $html .= "</nav>\n</section>\n";
+      return $html;
+    }
+    if($section == "full"){
+      $html = "<div class='mdl-card mdl-shadow--4dp mdl-cell mdl-cell--12-col $extra_class'><section id='$i'>";
+      $h_toggler = $hidable ? " shm-toggler" : "";
+      if(!empty($h)) $html .="<div class='mdl-card__title'><h3 data-toggle-sel='#$i' class='mdl-card__title-text $h_toggler'>$h</h3></div>";
+      if(!empty($b)) $html .="<div class='mdl-card__supporting-text blockbody'>$b</div>";
+      $html .= "</section></div>\n";
+      return $html;
+    }
+    if($section == "third"){
+      $html = "<div class='mdl-card mdl-shadow--4dp mdl-cell mdl-cell--4-col $extra_class'><section id='$i'>";
+      $h_toggler = $hidable ? " shm-toggler" : "";
+      if(!empty($h)) $html .="<div class='mdl-card__title'><h3 data-toggle-sel='#$i' class='mdl-card__title-text $h_toggler'>$h</h3></div>";
+      if(!empty($b)) $html .="<div class='mdl-card__supporting-text blockbody'>$b</div>";
+      $html .= "</section></div>\n";
+      return $html;
+    }
+    $html = "<section id='$i'>";
+    $h_toggler = $hidable ? " shm-toggler" : "";
+    if(!empty($h)) $html .= "<h3 data-toggle-sel='#$i' class='$h_toggler'>$h</h3>";
+    if(!empty($b)) $html .= "<div class='blockbody'>$b</div>";
+    $html .= "</section>\n";
+    return $html;
+  }
+
+}
+
+
+//@todo fix ext/blotter id tag
+//@todo fix table row error for ext/ip_ban
+//@todo fix table row error for ext/image_hash_ban
+//@todo fix table row error for ext/untag
+//@todo fix ext private-messages gives Uncaught TypeError: Cannot read property 'href' of null when no messages are there..
diff --git a/themes/material/material.min.css b/themes/material/material.min.css
new file mode 100644
index 000000000..e72ca355d
--- /dev/null
+++ b/themes/material/material.min.css
@@ -0,0 +1,8 @@
+/**
+ * material-design-lite - Material Design Components in CSS, JS and HTML
+ * @version v1.0.5
+ * @license Apache-2.0
+ * @copyright 2015 Google, Inc.
+ * @link https://github.com/google/material-design-lite
+ */
+@charset "UTF-8";html{color:rgba(0,0,0,.87)}::-moz-selection{background:#b3d4fc;text-shadow:none}::selection{background:#b3d4fc;text-shadow:none}hr{display:block;height:1px;border:0;border-top:1px solid #ccc;margin:1em 0;padding:0}audio,canvas,iframe,img,svg,video{vertical-align:middle}fieldset{border:0;margin:0;padding:0}textarea{resize:vertical}.browserupgrade{margin:.2em 0;background:#ccc;color:#000;padding:.2em 0}.hidden{display:none!important}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.clearfix:before,.clearfix:after{content:" ";display:table}.clearfix:after{clear:both}@media print{*,*:before,*:after,*:first-letter,*:first-line{background:transparent!important;color:#000!important;box-shadow:none!important;text-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href)")"}abbr[title]:after{content:" (" attr(title)")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}a,.mdl-accordion,.mdl-button,.mdl-card,.mdl-checkbox,.mdl-dropdown-menu,.mdl-icon-toggle,.mdl-item,.mdl-radio,.mdl-slider,.mdl-switch,.mdl-tabs__tab{-webkit-tap-highlight-color:transparent;-webkit-tap-highlight-color:rgba(255,255,255,0)}html{width:100%;height:100%;-ms-touch-action:manipulation;touch-action:manipulation}body{width:100%;min-height:100%}main{display:block}*[hidden]{display:none!important}html,body{font-family:"Helvetica","Arial",sans-serif;font-size:14px;font-weight:400;line-height:20px}h1,h2,h3,h4,h5,h6,p{padding:0}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400;line-height:1.35;letter-spacing:-.02em;opacity:.54;font-size:.6em}h1{font-size:56px;line-height:1.35;letter-spacing:-.02em;margin:24px 0}h1,h2{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400}h2{font-size:45px;line-height:48px}h2,h3{margin:24px 0}h3{font-size:34px;line-height:40px}h3,h4{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400}h4{font-size:24px;line-height:32px;-moz-osx-font-smoothing:grayscale;margin:24px 0 16px}h5{font-size:20px;font-weight:500;line-height:1;letter-spacing:.02em}h5,h6{font-family:"Roboto","Helvetica","Arial",sans-serif;margin:24px 0 16px}h6{font-size:16px;letter-spacing:.04em}h6,p{font-weight:400;line-height:24px}p{font-size:14px;letter-spacing:0;margin:0 0 16px}a{color:rgb(255,110,64);font-weight:500}blockquote{font-family:"Roboto","Helvetica","Arial",sans-serif;position:relative;font-size:24px;font-weight:300;font-style:italic;line-height:1.35;letter-spacing:.08em}blockquote:before{position:absolute;left:-.5em;content:'“'}blockquote:after{content:'”';margin-left:-.05em}mark{background-color:#f4ff81}dt{font-weight:700}address{font-size:12px;line-height:1;font-style:normal}address,ul,ol{font-weight:400;letter-spacing:0}ul,ol{font-size:14px;line-height:24px}.mdl-typography--display-4,.mdl-typography--display-4-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:112px;font-weight:300;line-height:1;letter-spacing:-.04em}.mdl-typography--display-4-color-contrast{opacity:.54}.mdl-typography--display-3,.mdl-typography--display-3-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:56px;font-weight:400;line-height:1.35;letter-spacing:-.02em}.mdl-typography--display-3-color-contrast{opacity:.54}.mdl-typography--display-2,.mdl-typography--display-2-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:45px;font-weight:400;line-height:48px}.mdl-typography--display-2-color-contrast{opacity:.54}.mdl-typography--display-1,.mdl-typography--display-1-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:34px;font-weight:400;line-height:40px}.mdl-typography--display-1-color-contrast{opacity:.54}.mdl-typography--headline,.mdl-typography--headline-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:24px;font-weight:400;line-height:32px;-moz-osx-font-smoothing:grayscale}.mdl-typography--headline-color-contrast{opacity:.87}.mdl-typography--title,.mdl-typography--title-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:20px;font-weight:500;line-height:1;letter-spacing:.02em}.mdl-typography--title-color-contrast{opacity:.87}.mdl-typography--subhead,.mdl-typography--subhead-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:16px;font-weight:400;line-height:24px;letter-spacing:.04em}.mdl-typography--subhead-color-contrast{opacity:.87}.mdl-typography--body-2,.mdl-typography--body-2-color-contrast{font-size:14px;font-weight:700;line-height:24px;letter-spacing:0}.mdl-typography--body-2-color-contrast{opacity:.87}.mdl-typography--body-1,.mdl-typography--body-1-color-contrast{font-size:14px;font-weight:400;line-height:24px;letter-spacing:0}.mdl-typography--body-1-color-contrast{opacity:.87}.mdl-typography--body-2-force-preferred-font,.mdl-typography--body-2-force-preferred-font-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;line-height:24px;letter-spacing:0}.mdl-typography--body-2-force-preferred-font-color-contrast{opacity:.87}.mdl-typography--body-1-force-preferred-font,.mdl-typography--body-1-force-preferred-font-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:400;line-height:24px;letter-spacing:0}.mdl-typography--body-1-force-preferred-font-color-contrast{opacity:.87}.mdl-typography--caption,.mdl-typography--caption-force-preferred-font{font-size:12px;font-weight:400;line-height:1;letter-spacing:0}.mdl-typography--caption-force-preferred-font{font-family:"Roboto","Helvetica","Arial",sans-serif}.mdl-typography--caption-color-contrast,.mdl-typography--caption-force-preferred-font-color-contrast{font-size:12px;font-weight:400;line-height:1;letter-spacing:0;opacity:.54}.mdl-typography--caption-force-preferred-font-color-contrast,.mdl-typography--menu{font-family:"Roboto","Helvetica","Arial",sans-serif}.mdl-typography--menu{font-size:14px;font-weight:500;line-height:1;letter-spacing:0}.mdl-typography--menu-color-contrast{opacity:.87}.mdl-typography--menu-color-contrast,.mdl-typography--button,.mdl-typography--button-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;line-height:1;letter-spacing:0}.mdl-typography--button,.mdl-typography--button-color-contrast{text-transform:uppercase}.mdl-typography--button-color-contrast{opacity:.87}.mdl-typography--text-left{text-align:left}.mdl-typography--text-right{text-align:right}.mdl-typography--text-center{text-align:center}.mdl-typography--text-justify{text-align:justify}.mdl-typography--text-nowrap{white-space:nowrap}.mdl-typography--text-lowercase{text-transform:lowercase}.mdl-typography--text-uppercase{text-transform:uppercase}.mdl-typography--text-capitalize{text-transform:capitalize}.mdl-typography--font-thin{font-weight:200!important}.mdl-typography--font-light{font-weight:300!important}.mdl-typography--font-regular{font-weight:400!important}.mdl-typography--font-medium{font-weight:500!important}.mdl-typography--font-bold{font-weight:700!important}.mdl-typography--font-black{font-weight:900!important}.mdl-color-text--red{color:#f44336 !important}.mdl-color--red{background-color:#f44336 !important}.mdl-color-text--red-50{color:#ffebee !important}.mdl-color--red-50{background-color:#ffebee !important}.mdl-color-text--red-100{color:#ffcdd2 !important}.mdl-color--red-100{background-color:#ffcdd2 !important}.mdl-color-text--red-200{color:#ef9a9a !important}.mdl-color--red-200{background-color:#ef9a9a !important}.mdl-color-text--red-300{color:#e57373 !important}.mdl-color--red-300{background-color:#e57373 !important}.mdl-color-text--red-400{color:#ef5350 !important}.mdl-color--red-400{background-color:#ef5350 !important}.mdl-color-text--red-500{color:#f44336 !important}.mdl-color--red-500{background-color:#f44336 !important}.mdl-color-text--red-600{color:#e53935 !important}.mdl-color--red-600{background-color:#e53935 !important}.mdl-color-text--red-700{color:#d32f2f !important}.mdl-color--red-700{background-color:#d32f2f !important}.mdl-color-text--red-800{color:#c62828 !important}.mdl-color--red-800{background-color:#c62828 !important}.mdl-color-text--red-900{color:#b71c1c !important}.mdl-color--red-900{background-color:#b71c1c !important}.mdl-color-text--red-A100{color:#ff8a80 !important}.mdl-color--red-A100{background-color:#ff8a80 !important}.mdl-color-text--red-A200{color:#ff5252 !important}.mdl-color--red-A200{background-color:#ff5252 !important}.mdl-color-text--red-A400{color:#ff1744 !important}.mdl-color--red-A400{background-color:#ff1744 !important}.mdl-color-text--red-A700{color:#d50000 !important}.mdl-color--red-A700{background-color:#d50000 !important}.mdl-color-text--pink{color:#e91e63 !important}.mdl-color--pink{background-color:#e91e63 !important}.mdl-color-text--pink-50{color:#fce4ec !important}.mdl-color--pink-50{background-color:#fce4ec !important}.mdl-color-text--pink-100{color:#f8bbd0 !important}.mdl-color--pink-100{background-color:#f8bbd0 !important}.mdl-color-text--pink-200{color:#f48fb1 !important}.mdl-color--pink-200{background-color:#f48fb1 !important}.mdl-color-text--pink-300{color:#f06292 !important}.mdl-color--pink-300{background-color:#f06292 !important}.mdl-color-text--pink-400{color:#ec407a !important}.mdl-color--pink-400{background-color:#ec407a !important}.mdl-color-text--pink-500{color:#e91e63 !important}.mdl-color--pink-500{background-color:#e91e63 !important}.mdl-color-text--pink-600{color:#d81b60 !important}.mdl-color--pink-600{background-color:#d81b60 !important}.mdl-color-text--pink-700{color:#c2185b !important}.mdl-color--pink-700{background-color:#c2185b !important}.mdl-color-text--pink-800{color:#ad1457 !important}.mdl-color--pink-800{background-color:#ad1457 !important}.mdl-color-text--pink-900{color:#880e4f !important}.mdl-color--pink-900{background-color:#880e4f !important}.mdl-color-text--pink-A100{color:#ff80ab !important}.mdl-color--pink-A100{background-color:#ff80ab !important}.mdl-color-text--pink-A200{color:#ff4081 !important}.mdl-color--pink-A200{background-color:#ff4081 !important}.mdl-color-text--pink-A400{color:#f50057 !important}.mdl-color--pink-A400{background-color:#f50057 !important}.mdl-color-text--pink-A700{color:#c51162 !important}.mdl-color--pink-A700{background-color:#c51162 !important}.mdl-color-text--purple{color:#9c27b0 !important}.mdl-color--purple{background-color:#9c27b0 !important}.mdl-color-text--purple-50{color:#f3e5f5 !important}.mdl-color--purple-50{background-color:#f3e5f5 !important}.mdl-color-text--purple-100{color:#e1bee7 !important}.mdl-color--purple-100{background-color:#e1bee7 !important}.mdl-color-text--purple-200{color:#ce93d8 !important}.mdl-color--purple-200{background-color:#ce93d8 !important}.mdl-color-text--purple-300{color:#ba68c8 !important}.mdl-color--purple-300{background-color:#ba68c8 !important}.mdl-color-text--purple-400{color:#ab47bc !important}.mdl-color--purple-400{background-color:#ab47bc !important}.mdl-color-text--purple-500{color:#9c27b0 !important}.mdl-color--purple-500{background-color:#9c27b0 !important}.mdl-color-text--purple-600{color:#8e24aa !important}.mdl-color--purple-600{background-color:#8e24aa !important}.mdl-color-text--purple-700{color:#7b1fa2 !important}.mdl-color--purple-700{background-color:#7b1fa2 !important}.mdl-color-text--purple-800{color:#6a1b9a !important}.mdl-color--purple-800{background-color:#6a1b9a !important}.mdl-color-text--purple-900{color:#4a148c !important}.mdl-color--purple-900{background-color:#4a148c !important}.mdl-color-text--purple-A100{color:#ea80fc !important}.mdl-color--purple-A100{background-color:#ea80fc !important}.mdl-color-text--purple-A200{color:#e040fb !important}.mdl-color--purple-A200{background-color:#e040fb !important}.mdl-color-text--purple-A400{color:#d500f9 !important}.mdl-color--purple-A400{background-color:#d500f9 !important}.mdl-color-text--purple-A700{color:#a0f !important}.mdl-color--purple-A700{background-color:#a0f !important}.mdl-color-text--deep-purple{color:#673ab7 !important}.mdl-color--deep-purple{background-color:#673ab7 !important}.mdl-color-text--deep-purple-50{color:#ede7f6 !important}.mdl-color--deep-purple-50{background-color:#ede7f6 !important}.mdl-color-text--deep-purple-100{color:#d1c4e9 !important}.mdl-color--deep-purple-100{background-color:#d1c4e9 !important}.mdl-color-text--deep-purple-200{color:#b39ddb !important}.mdl-color--deep-purple-200{background-color:#b39ddb !important}.mdl-color-text--deep-purple-300{color:#9575cd !important}.mdl-color--deep-purple-300{background-color:#9575cd !important}.mdl-color-text--deep-purple-400{color:#7e57c2 !important}.mdl-color--deep-purple-400{background-color:#7e57c2 !important}.mdl-color-text--deep-purple-500{color:#673ab7 !important}.mdl-color--deep-purple-500{background-color:#673ab7 !important}.mdl-color-text--deep-purple-600{color:#5e35b1 !important}.mdl-color--deep-purple-600{background-color:#5e35b1 !important}.mdl-color-text--deep-purple-700{color:#512da8 !important}.mdl-color--deep-purple-700{background-color:#512da8 !important}.mdl-color-text--deep-purple-800{color:#4527a0 !important}.mdl-color--deep-purple-800{background-color:#4527a0 !important}.mdl-color-text--deep-purple-900{color:#311b92 !important}.mdl-color--deep-purple-900{background-color:#311b92 !important}.mdl-color-text--deep-purple-A100{color:#b388ff !important}.mdl-color--deep-purple-A100{background-color:#b388ff !important}.mdl-color-text--deep-purple-A200{color:#7c4dff !important}.mdl-color--deep-purple-A200{background-color:#7c4dff !important}.mdl-color-text--deep-purple-A400{color:#651fff !important}.mdl-color--deep-purple-A400{background-color:#651fff !important}.mdl-color-text--deep-purple-A700{color:#6200ea !important}.mdl-color--deep-purple-A700{background-color:#6200ea !important}.mdl-color-text--indigo{color:#3f51b5 !important}.mdl-color--indigo{background-color:#3f51b5 !important}.mdl-color-text--indigo-50{color:#e8eaf6 !important}.mdl-color--indigo-50{background-color:#e8eaf6 !important}.mdl-color-text--indigo-100{color:#c5cae9 !important}.mdl-color--indigo-100{background-color:#c5cae9 !important}.mdl-color-text--indigo-200{color:#9fa8da !important}.mdl-color--indigo-200{background-color:#9fa8da !important}.mdl-color-text--indigo-300{color:#7986cb !important}.mdl-color--indigo-300{background-color:#7986cb !important}.mdl-color-text--indigo-400{color:#5c6bc0 !important}.mdl-color--indigo-400{background-color:#5c6bc0 !important}.mdl-color-text--indigo-500{color:#3f51b5 !important}.mdl-color--indigo-500{background-color:#3f51b5 !important}.mdl-color-text--indigo-600{color:#3949ab !important}.mdl-color--indigo-600{background-color:#3949ab !important}.mdl-color-text--indigo-700{color:#303f9f !important}.mdl-color--indigo-700{background-color:#303f9f !important}.mdl-color-text--indigo-800{color:#283593 !important}.mdl-color--indigo-800{background-color:#283593 !important}.mdl-color-text--indigo-900{color:#1a237e !important}.mdl-color--indigo-900{background-color:#1a237e !important}.mdl-color-text--indigo-A100{color:#8c9eff !important}.mdl-color--indigo-A100{background-color:#8c9eff !important}.mdl-color-text--indigo-A200{color:#536dfe !important}.mdl-color--indigo-A200{background-color:#536dfe !important}.mdl-color-text--indigo-A400{color:#3d5afe !important}.mdl-color--indigo-A400{background-color:#3d5afe !important}.mdl-color-text--indigo-A700{color:#304ffe !important}.mdl-color--indigo-A700{background-color:#304ffe !important}.mdl-color-text--blue{color:#2196f3 !important}.mdl-color--blue{background-color:#2196f3 !important}.mdl-color-text--blue-50{color:#e3f2fd !important}.mdl-color--blue-50{background-color:#e3f2fd !important}.mdl-color-text--blue-100{color:#bbdefb !important}.mdl-color--blue-100{background-color:#bbdefb !important}.mdl-color-text--blue-200{color:#90caf9 !important}.mdl-color--blue-200{background-color:#90caf9 !important}.mdl-color-text--blue-300{color:#64b5f6 !important}.mdl-color--blue-300{background-color:#64b5f6 !important}.mdl-color-text--blue-400{color:#42a5f5 !important}.mdl-color--blue-400{background-color:#42a5f5 !important}.mdl-color-text--blue-500{color:#2196f3 !important}.mdl-color--blue-500{background-color:#2196f3 !important}.mdl-color-text--blue-600{color:#1e88e5 !important}.mdl-color--blue-600{background-color:#1e88e5 !important}.mdl-color-text--blue-700{color:#1976d2 !important}.mdl-color--blue-700{background-color:#1976d2 !important}.mdl-color-text--blue-800{color:#1565c0 !important}.mdl-color--blue-800{background-color:#1565c0 !important}.mdl-color-text--blue-900{color:#0d47a1 !important}.mdl-color--blue-900{background-color:#0d47a1 !important}.mdl-color-text--blue-A100{color:#82b1ff !important}.mdl-color--blue-A100{background-color:#82b1ff !important}.mdl-color-text--blue-A200{color:#448aff !important}.mdl-color--blue-A200{background-color:#448aff !important}.mdl-color-text--blue-A400{color:#2979ff !important}.mdl-color--blue-A400{background-color:#2979ff !important}.mdl-color-text--blue-A700{color:#2962ff !important}.mdl-color--blue-A700{background-color:#2962ff !important}.mdl-color-text--light-blue{color:#03a9f4 !important}.mdl-color--light-blue{background-color:#03a9f4 !important}.mdl-color-text--light-blue-50{color:#e1f5fe !important}.mdl-color--light-blue-50{background-color:#e1f5fe !important}.mdl-color-text--light-blue-100{color:#b3e5fc !important}.mdl-color--light-blue-100{background-color:#b3e5fc !important}.mdl-color-text--light-blue-200{color:#81d4fa !important}.mdl-color--light-blue-200{background-color:#81d4fa !important}.mdl-color-text--light-blue-300{color:#4fc3f7 !important}.mdl-color--light-blue-300{background-color:#4fc3f7 !important}.mdl-color-text--light-blue-400{color:#29b6f6 !important}.mdl-color--light-blue-400{background-color:#29b6f6 !important}.mdl-color-text--light-blue-500{color:#03a9f4 !important}.mdl-color--light-blue-500{background-color:#03a9f4 !important}.mdl-color-text--light-blue-600{color:#039be5 !important}.mdl-color--light-blue-600{background-color:#039be5 !important}.mdl-color-text--light-blue-700{color:#0288d1 !important}.mdl-color--light-blue-700{background-color:#0288d1 !important}.mdl-color-text--light-blue-800{color:#0277bd !important}.mdl-color--light-blue-800{background-color:#0277bd !important}.mdl-color-text--light-blue-900{color:#01579b !important}.mdl-color--light-blue-900{background-color:#01579b !important}.mdl-color-text--light-blue-A100{color:#80d8ff !important}.mdl-color--light-blue-A100{background-color:#80d8ff !important}.mdl-color-text--light-blue-A200{color:#40c4ff !important}.mdl-color--light-blue-A200{background-color:#40c4ff !important}.mdl-color-text--light-blue-A400{color:#00b0ff !important}.mdl-color--light-blue-A400{background-color:#00b0ff !important}.mdl-color-text--light-blue-A700{color:#0091ea !important}.mdl-color--light-blue-A700{background-color:#0091ea !important}.mdl-color-text--cyan{color:#00bcd4 !important}.mdl-color--cyan{background-color:#00bcd4 !important}.mdl-color-text--cyan-50{color:#e0f7fa !important}.mdl-color--cyan-50{background-color:#e0f7fa !important}.mdl-color-text--cyan-100{color:#b2ebf2 !important}.mdl-color--cyan-100{background-color:#b2ebf2 !important}.mdl-color-text--cyan-200{color:#80deea !important}.mdl-color--cyan-200{background-color:#80deea !important}.mdl-color-text--cyan-300{color:#4dd0e1 !important}.mdl-color--cyan-300{background-color:#4dd0e1 !important}.mdl-color-text--cyan-400{color:#26c6da !important}.mdl-color--cyan-400{background-color:#26c6da !important}.mdl-color-text--cyan-500{color:#00bcd4 !important}.mdl-color--cyan-500{background-color:#00bcd4 !important}.mdl-color-text--cyan-600{color:#00acc1 !important}.mdl-color--cyan-600{background-color:#00acc1 !important}.mdl-color-text--cyan-700{color:#0097a7 !important}.mdl-color--cyan-700{background-color:#0097a7 !important}.mdl-color-text--cyan-800{color:#00838f !important}.mdl-color--cyan-800{background-color:#00838f !important}.mdl-color-text--cyan-900{color:#006064 !important}.mdl-color--cyan-900{background-color:#006064 !important}.mdl-color-text--cyan-A100{color:#84ffff !important}.mdl-color--cyan-A100{background-color:#84ffff !important}.mdl-color-text--cyan-A200{color:#18ffff !important}.mdl-color--cyan-A200{background-color:#18ffff !important}.mdl-color-text--cyan-A400{color:#00e5ff !important}.mdl-color--cyan-A400{background-color:#00e5ff !important}.mdl-color-text--cyan-A700{color:#00b8d4 !important}.mdl-color--cyan-A700{background-color:#00b8d4 !important}.mdl-color-text--teal{color:#009688 !important}.mdl-color--teal{background-color:#009688 !important}.mdl-color-text--teal-50{color:#e0f2f1 !important}.mdl-color--teal-50{background-color:#e0f2f1 !important}.mdl-color-text--teal-100{color:#b2dfdb !important}.mdl-color--teal-100{background-color:#b2dfdb !important}.mdl-color-text--teal-200{color:#80cbc4 !important}.mdl-color--teal-200{background-color:#80cbc4 !important}.mdl-color-text--teal-300{color:#4db6ac !important}.mdl-color--teal-300{background-color:#4db6ac !important}.mdl-color-text--teal-400{color:#26a69a !important}.mdl-color--teal-400{background-color:#26a69a !important}.mdl-color-text--teal-500{color:#009688 !important}.mdl-color--teal-500{background-color:#009688 !important}.mdl-color-text--teal-600{color:#00897b !important}.mdl-color--teal-600{background-color:#00897b !important}.mdl-color-text--teal-700{color:#00796b !important}.mdl-color--teal-700{background-color:#00796b !important}.mdl-color-text--teal-800{color:#00695c !important}.mdl-color--teal-800{background-color:#00695c !important}.mdl-color-text--teal-900{color:#004d40 !important}.mdl-color--teal-900{background-color:#004d40 !important}.mdl-color-text--teal-A100{color:#a7ffeb !important}.mdl-color--teal-A100{background-color:#a7ffeb !important}.mdl-color-text--teal-A200{color:#64ffda !important}.mdl-color--teal-A200{background-color:#64ffda !important}.mdl-color-text--teal-A400{color:#1de9b6 !important}.mdl-color--teal-A400{background-color:#1de9b6 !important}.mdl-color-text--teal-A700{color:#00bfa5 !important}.mdl-color--teal-A700{background-color:#00bfa5 !important}.mdl-color-text--green{color:#4caf50 !important}.mdl-color--green{background-color:#4caf50 !important}.mdl-color-text--green-50{color:#e8f5e9 !important}.mdl-color--green-50{background-color:#e8f5e9 !important}.mdl-color-text--green-100{color:#c8e6c9 !important}.mdl-color--green-100{background-color:#c8e6c9 !important}.mdl-color-text--green-200{color:#a5d6a7 !important}.mdl-color--green-200{background-color:#a5d6a7 !important}.mdl-color-text--green-300{color:#81c784 !important}.mdl-color--green-300{background-color:#81c784 !important}.mdl-color-text--green-400{color:#66bb6a !important}.mdl-color--green-400{background-color:#66bb6a !important}.mdl-color-text--green-500{color:#4caf50 !important}.mdl-color--green-500{background-color:#4caf50 !important}.mdl-color-text--green-600{color:#43a047 !important}.mdl-color--green-600{background-color:#43a047 !important}.mdl-color-text--green-700{color:#388e3c !important}.mdl-color--green-700{background-color:#388e3c !important}.mdl-color-text--green-800{color:#2e7d32 !important}.mdl-color--green-800{background-color:#2e7d32 !important}.mdl-color-text--green-900{color:#1b5e20 !important}.mdl-color--green-900{background-color:#1b5e20 !important}.mdl-color-text--green-A100{color:#b9f6ca !important}.mdl-color--green-A100{background-color:#b9f6ca !important}.mdl-color-text--green-A200{color:#69f0ae !important}.mdl-color--green-A200{background-color:#69f0ae !important}.mdl-color-text--green-A400{color:#00e676 !important}.mdl-color--green-A400{background-color:#00e676 !important}.mdl-color-text--green-A700{color:#00c853 !important}.mdl-color--green-A700{background-color:#00c853 !important}.mdl-color-text--light-green{color:#8bc34a !important}.mdl-color--light-green{background-color:#8bc34a !important}.mdl-color-text--light-green-50{color:#f1f8e9 !important}.mdl-color--light-green-50{background-color:#f1f8e9 !important}.mdl-color-text--light-green-100{color:#dcedc8 !important}.mdl-color--light-green-100{background-color:#dcedc8 !important}.mdl-color-text--light-green-200{color:#c5e1a5 !important}.mdl-color--light-green-200{background-color:#c5e1a5 !important}.mdl-color-text--light-green-300{color:#aed581 !important}.mdl-color--light-green-300{background-color:#aed581 !important}.mdl-color-text--light-green-400{color:#9ccc65 !important}.mdl-color--light-green-400{background-color:#9ccc65 !important}.mdl-color-text--light-green-500{color:#8bc34a !important}.mdl-color--light-green-500{background-color:#8bc34a !important}.mdl-color-text--light-green-600{color:#7cb342 !important}.mdl-color--light-green-600{background-color:#7cb342 !important}.mdl-color-text--light-green-700{color:#689f38 !important}.mdl-color--light-green-700{background-color:#689f38 !important}.mdl-color-text--light-green-800{color:#558b2f !important}.mdl-color--light-green-800{background-color:#558b2f !important}.mdl-color-text--light-green-900{color:#33691e !important}.mdl-color--light-green-900{background-color:#33691e !important}.mdl-color-text--light-green-A100{color:#ccff90 !important}.mdl-color--light-green-A100{background-color:#ccff90 !important}.mdl-color-text--light-green-A200{color:#b2ff59 !important}.mdl-color--light-green-A200{background-color:#b2ff59 !important}.mdl-color-text--light-green-A400{color:#76ff03 !important}.mdl-color--light-green-A400{background-color:#76ff03 !important}.mdl-color-text--light-green-A700{color:#64dd17 !important}.mdl-color--light-green-A700{background-color:#64dd17 !important}.mdl-color-text--lime{color:#cddc39 !important}.mdl-color--lime{background-color:#cddc39 !important}.mdl-color-text--lime-50{color:#f9fbe7 !important}.mdl-color--lime-50{background-color:#f9fbe7 !important}.mdl-color-text--lime-100{color:#f0f4c3 !important}.mdl-color--lime-100{background-color:#f0f4c3 !important}.mdl-color-text--lime-200{color:#e6ee9c !important}.mdl-color--lime-200{background-color:#e6ee9c !important}.mdl-color-text--lime-300{color:#dce775 !important}.mdl-color--lime-300{background-color:#dce775 !important}.mdl-color-text--lime-400{color:#d4e157 !important}.mdl-color--lime-400{background-color:#d4e157 !important}.mdl-color-text--lime-500{color:#cddc39 !important}.mdl-color--lime-500{background-color:#cddc39 !important}.mdl-color-text--lime-600{color:#c0ca33 !important}.mdl-color--lime-600{background-color:#c0ca33 !important}.mdl-color-text--lime-700{color:#afb42b !important}.mdl-color--lime-700{background-color:#afb42b !important}.mdl-color-text--lime-800{color:#9e9d24 !important}.mdl-color--lime-800{background-color:#9e9d24 !important}.mdl-color-text--lime-900{color:#827717 !important}.mdl-color--lime-900{background-color:#827717 !important}.mdl-color-text--lime-A100{color:#f4ff81 !important}.mdl-color--lime-A100{background-color:#f4ff81 !important}.mdl-color-text--lime-A200{color:#eeff41 !important}.mdl-color--lime-A200{background-color:#eeff41 !important}.mdl-color-text--lime-A400{color:#c6ff00 !important}.mdl-color--lime-A400{background-color:#c6ff00 !important}.mdl-color-text--lime-A700{color:#aeea00 !important}.mdl-color--lime-A700{background-color:#aeea00 !important}.mdl-color-text--yellow{color:#ffeb3b !important}.mdl-color--yellow{background-color:#ffeb3b !important}.mdl-color-text--yellow-50{color:#fffde7 !important}.mdl-color--yellow-50{background-color:#fffde7 !important}.mdl-color-text--yellow-100{color:#fff9c4 !important}.mdl-color--yellow-100{background-color:#fff9c4 !important}.mdl-color-text--yellow-200{color:#fff59d !important}.mdl-color--yellow-200{background-color:#fff59d !important}.mdl-color-text--yellow-300{color:#fff176 !important}.mdl-color--yellow-300{background-color:#fff176 !important}.mdl-color-text--yellow-400{color:#ffee58 !important}.mdl-color--yellow-400{background-color:#ffee58 !important}.mdl-color-text--yellow-500{color:#ffeb3b !important}.mdl-color--yellow-500{background-color:#ffeb3b !important}.mdl-color-text--yellow-600{color:#fdd835 !important}.mdl-color--yellow-600{background-color:#fdd835 !important}.mdl-color-text--yellow-700{color:#fbc02d !important}.mdl-color--yellow-700{background-color:#fbc02d !important}.mdl-color-text--yellow-800{color:#f9a825 !important}.mdl-color--yellow-800{background-color:#f9a825 !important}.mdl-color-text--yellow-900{color:#f57f17 !important}.mdl-color--yellow-900{background-color:#f57f17 !important}.mdl-color-text--yellow-A100{color:#ffff8d !important}.mdl-color--yellow-A100{background-color:#ffff8d !important}.mdl-color-text--yellow-A200{color:#ff0 !important}.mdl-color--yellow-A200{background-color:#ff0 !important}.mdl-color-text--yellow-A400{color:#ffea00 !important}.mdl-color--yellow-A400{background-color:#ffea00 !important}.mdl-color-text--yellow-A700{color:#ffd600 !important}.mdl-color--yellow-A700{background-color:#ffd600 !important}.mdl-color-text--amber{color:#ffc107 !important}.mdl-color--amber{background-color:#ffc107 !important}.mdl-color-text--amber-50{color:#fff8e1 !important}.mdl-color--amber-50{background-color:#fff8e1 !important}.mdl-color-text--amber-100{color:#ffecb3 !important}.mdl-color--amber-100{background-color:#ffecb3 !important}.mdl-color-text--amber-200{color:#ffe082 !important}.mdl-color--amber-200{background-color:#ffe082 !important}.mdl-color-text--amber-300{color:#ffd54f !important}.mdl-color--amber-300{background-color:#ffd54f !important}.mdl-color-text--amber-400{color:#ffca28 !important}.mdl-color--amber-400{background-color:#ffca28 !important}.mdl-color-text--amber-500{color:#ffc107 !important}.mdl-color--amber-500{background-color:#ffc107 !important}.mdl-color-text--amber-600{color:#ffb300 !important}.mdl-color--amber-600{background-color:#ffb300 !important}.mdl-color-text--amber-700{color:#ffa000 !important}.mdl-color--amber-700{background-color:#ffa000 !important}.mdl-color-text--amber-800{color:#ff8f00 !important}.mdl-color--amber-800{background-color:#ff8f00 !important}.mdl-color-text--amber-900{color:#ff6f00 !important}.mdl-color--amber-900{background-color:#ff6f00 !important}.mdl-color-text--amber-A100{color:#ffe57f !important}.mdl-color--amber-A100{background-color:#ffe57f !important}.mdl-color-text--amber-A200{color:#ffd740 !important}.mdl-color--amber-A200{background-color:#ffd740 !important}.mdl-color-text--amber-A400{color:#ffc400 !important}.mdl-color--amber-A400{background-color:#ffc400 !important}.mdl-color-text--amber-A700{color:#ffab00 !important}.mdl-color--amber-A700{background-color:#ffab00 !important}.mdl-color-text--orange{color:#ff9800 !important}.mdl-color--orange{background-color:#ff9800 !important}.mdl-color-text--orange-50{color:#fff3e0 !important}.mdl-color--orange-50{background-color:#fff3e0 !important}.mdl-color-text--orange-100{color:#ffe0b2 !important}.mdl-color--orange-100{background-color:#ffe0b2 !important}.mdl-color-text--orange-200{color:#ffcc80 !important}.mdl-color--orange-200{background-color:#ffcc80 !important}.mdl-color-text--orange-300{color:#ffb74d !important}.mdl-color--orange-300{background-color:#ffb74d !important}.mdl-color-text--orange-400{color:#ffa726 !important}.mdl-color--orange-400{background-color:#ffa726 !important}.mdl-color-text--orange-500{color:#ff9800 !important}.mdl-color--orange-500{background-color:#ff9800 !important}.mdl-color-text--orange-600{color:#fb8c00 !important}.mdl-color--orange-600{background-color:#fb8c00 !important}.mdl-color-text--orange-700{color:#f57c00 !important}.mdl-color--orange-700{background-color:#f57c00 !important}.mdl-color-text--orange-800{color:#ef6c00 !important}.mdl-color--orange-800{background-color:#ef6c00 !important}.mdl-color-text--orange-900{color:#e65100 !important}.mdl-color--orange-900{background-color:#e65100 !important}.mdl-color-text--orange-A100{color:#ffd180 !important}.mdl-color--orange-A100{background-color:#ffd180 !important}.mdl-color-text--orange-A200{color:#ffab40 !important}.mdl-color--orange-A200{background-color:#ffab40 !important}.mdl-color-text--orange-A400{color:#ff9100 !important}.mdl-color--orange-A400{background-color:#ff9100 !important}.mdl-color-text--orange-A700{color:#ff6d00 !important}.mdl-color--orange-A700{background-color:#ff6d00 !important}.mdl-color-text--deep-orange{color:#ff5722 !important}.mdl-color--deep-orange{background-color:#ff5722 !important}.mdl-color-text--deep-orange-50{color:#fbe9e7 !important}.mdl-color--deep-orange-50{background-color:#fbe9e7 !important}.mdl-color-text--deep-orange-100{color:#ffccbc !important}.mdl-color--deep-orange-100{background-color:#ffccbc !important}.mdl-color-text--deep-orange-200{color:#ffab91 !important}.mdl-color--deep-orange-200{background-color:#ffab91 !important}.mdl-color-text--deep-orange-300{color:#ff8a65 !important}.mdl-color--deep-orange-300{background-color:#ff8a65 !important}.mdl-color-text--deep-orange-400{color:#ff7043 !important}.mdl-color--deep-orange-400{background-color:#ff7043 !important}.mdl-color-text--deep-orange-500{color:#ff5722 !important}.mdl-color--deep-orange-500{background-color:#ff5722 !important}.mdl-color-text--deep-orange-600{color:#f4511e !important}.mdl-color--deep-orange-600{background-color:#f4511e !important}.mdl-color-text--deep-orange-700{color:#e64a19 !important}.mdl-color--deep-orange-700{background-color:#e64a19 !important}.mdl-color-text--deep-orange-800{color:#d84315 !important}.mdl-color--deep-orange-800{background-color:#d84315 !important}.mdl-color-text--deep-orange-900{color:#bf360c !important}.mdl-color--deep-orange-900{background-color:#bf360c !important}.mdl-color-text--deep-orange-A100{color:#ff9e80 !important}.mdl-color--deep-orange-A100{background-color:#ff9e80 !important}.mdl-color-text--deep-orange-A200{color:#ff6e40 !important}.mdl-color--deep-orange-A200{background-color:#ff6e40 !important}.mdl-color-text--deep-orange-A400{color:#ff3d00 !important}.mdl-color--deep-orange-A400{background-color:#ff3d00 !important}.mdl-color-text--deep-orange-A700{color:#dd2c00 !important}.mdl-color--deep-orange-A700{background-color:#dd2c00 !important}.mdl-color-text--brown{color:#795548 !important}.mdl-color--brown{background-color:#795548 !important}.mdl-color-text--brown-50{color:#efebe9 !important}.mdl-color--brown-50{background-color:#efebe9 !important}.mdl-color-text--brown-100{color:#d7ccc8 !important}.mdl-color--brown-100{background-color:#d7ccc8 !important}.mdl-color-text--brown-200{color:#bcaaa4 !important}.mdl-color--brown-200{background-color:#bcaaa4 !important}.mdl-color-text--brown-300{color:#a1887f !important}.mdl-color--brown-300{background-color:#a1887f !important}.mdl-color-text--brown-400{color:#8d6e63 !important}.mdl-color--brown-400{background-color:#8d6e63 !important}.mdl-color-text--brown-500{color:#795548 !important}.mdl-color--brown-500{background-color:#795548 !important}.mdl-color-text--brown-600{color:#6d4c41 !important}.mdl-color--brown-600{background-color:#6d4c41 !important}.mdl-color-text--brown-700{color:#5d4037 !important}.mdl-color--brown-700{background-color:#5d4037 !important}.mdl-color-text--brown-800{color:#4e342e !important}.mdl-color--brown-800{background-color:#4e342e !important}.mdl-color-text--brown-900{color:#3e2723 !important}.mdl-color--brown-900{background-color:#3e2723 !important}.mdl-color-text--grey{color:#9e9e9e !important}.mdl-color--grey{background-color:#9e9e9e !important}.mdl-color-text--grey-50{color:#fafafa !important}.mdl-color--grey-50{background-color:#fafafa !important}.mdl-color-text--grey-100{color:#f5f5f5 !important}.mdl-color--grey-100{background-color:#f5f5f5 !important}.mdl-color-text--grey-200{color:#eee !important}.mdl-color--grey-200{background-color:#eee !important}.mdl-color-text--grey-300{color:#e0e0e0 !important}.mdl-color--grey-300{background-color:#e0e0e0 !important}.mdl-color-text--grey-400{color:#bdbdbd !important}.mdl-color--grey-400{background-color:#bdbdbd !important}.mdl-color-text--grey-500{color:#9e9e9e !important}.mdl-color--grey-500{background-color:#9e9e9e !important}.mdl-color-text--grey-600{color:#757575 !important}.mdl-color--grey-600{background-color:#757575 !important}.mdl-color-text--grey-700{color:#616161 !important}.mdl-color--grey-700{background-color:#616161 !important}.mdl-color-text--grey-800{color:#424242 !important}.mdl-color--grey-800{background-color:#424242 !important}.mdl-color-text--grey-900{color:#212121 !important}.mdl-color--grey-900{background-color:#212121 !important}.mdl-color-text--blue-grey{color:#607d8b !important}.mdl-color--blue-grey{background-color:#607d8b !important}.mdl-color-text--blue-grey-50{color:#eceff1 !important}.mdl-color--blue-grey-50{background-color:#eceff1 !important}.mdl-color-text--blue-grey-100{color:#cfd8dc !important}.mdl-color--blue-grey-100{background-color:#cfd8dc !important}.mdl-color-text--blue-grey-200{color:#b0bec5 !important}.mdl-color--blue-grey-200{background-color:#b0bec5 !important}.mdl-color-text--blue-grey-300{color:#90a4ae !important}.mdl-color--blue-grey-300{background-color:#90a4ae !important}.mdl-color-text--blue-grey-400{color:#78909c !important}.mdl-color--blue-grey-400{background-color:#78909c !important}.mdl-color-text--blue-grey-500{color:#607d8b !important}.mdl-color--blue-grey-500{background-color:#607d8b !important}.mdl-color-text--blue-grey-600{color:#546e7a !important}.mdl-color--blue-grey-600{background-color:#546e7a !important}.mdl-color-text--blue-grey-700{color:#455a64 !important}.mdl-color--blue-grey-700{background-color:#455a64 !important}.mdl-color-text--blue-grey-800{color:#37474f !important}.mdl-color--blue-grey-800{background-color:#37474f !important}.mdl-color-text--blue-grey-900{color:#263238 !important}.mdl-color--blue-grey-900{background-color:#263238 !important}.mdl-color--black{background-color:#000 !important}.mdl-color-text--black{color:#000 !important}.mdl-color--white{background-color:#fff !important}.mdl-color-text--white{color:#fff !important}.mdl-color--primary{background-color:rgb(158,158,158)!important}.mdl-color--primary-contrast{background-color:rgb(66,66,66)!important}.mdl-color--primary-dark{background-color:rgb(97,97,97)!important}.mdl-color--accent{background-color:rgb(255,110,64)!important}.mdl-color--accent-contrast{background-color:rgb(66,66,66)!important}.mdl-color-text--primary{color:rgb(158,158,158)!important}.mdl-color-text--primary-contrast{color:rgb(66,66,66)!important}.mdl-color-text--primary-dark{color:rgb(97,97,97)!important}.mdl-color-text--accent{color:rgb(255,110,64)!important}.mdl-color-text--accent-contrast{color:rgb(66,66,66)!important}.mdl-ripple{background:#000;border-radius:50%;height:50px;left:0;opacity:0;pointer-events:none;position:absolute;top:0;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:50px;overflow:hidden}.mdl-ripple.is-animating{-webkit-transition:-webkit-transform .3s cubic-bezier(0,0,.2,1),width .3s cubic-bezier(0,0,.2,1),height .3s cubic-bezier(0,0,.2,1),opacity .6s cubic-bezier(0,0,.2,1);transition:transform .3s cubic-bezier(0,0,.2,1),width .3s cubic-bezier(0,0,.2,1),height .3s cubic-bezier(0,0,.2,1),opacity .6s cubic-bezier(0,0,.2,1)}.mdl-ripple.is-visible{opacity:.3}.mdl-animation--default,.mdl-animation--fast-out-slow-in{-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-animation--linear-out-slow-in{-webkit-transition-timing-function:cubic-bezier(0,0,.2,1);transition-timing-function:cubic-bezier(0,0,.2,1)}.mdl-animation--fast-out-linear-in{-webkit-transition-timing-function:cubic-bezier(.4,0,1,1);transition-timing-function:cubic-bezier(.4,0,1,1)}.mdl-badge{position:relative;white-space:nowrap;margin-right:24px}.mdl-badge:not([data-badge]){margin-right:auto}.mdl-badge[data-badge]:after{content:attr(data-badge);display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-content:center;-ms-flex-line-pack:center;align-content:center;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;position:absolute;top:-11px;right:-24px;font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:600;font-size:12px;width:22px;height:22px;border-radius:50%;background:rgb(255,110,64);color:#fff}.mdl-button .mdl-badge[data-badge]:after{top:-10px;right:-5px}.mdl-badge.mdl-badge--no-background[data-badge]:after{color:rgb(255,110,64);background:rgba(255,255,255,.2);box-shadow:0 0 1px gray}.mdl-button{background:0 0;border:none;border-radius:2px;color:#000;position:relative;height:36px;min-width:64px;padding:0 8px;display:inline-block;font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;text-transform:uppercase;letter-spacing:0;overflow:hidden;will-change:box-shadow,transform;-webkit-transition:box-shadow .2s cubic-bezier(.4,0,1,1),background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1);transition:box-shadow .2s cubic-bezier(.4,0,1,1),background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1);outline:none;cursor:pointer;text-decoration:none;text-align:center;line-height:36px;vertical-align:middle}.mdl-button::-moz-focus-inner{border:0}.mdl-button:hover{background-color:rgba(158,158,158,.2)}.mdl-button:focus:not(:active){background-color:rgba(0,0,0,.12)}.mdl-button:active{background-color:rgba(158,158,158,.4)}.mdl-button.mdl-button--colored{color:rgb(158,158,158)}.mdl-button.mdl-button--colored:focus:not(:active){background-color:rgba(0,0,0,.12)}input.mdl-button[type="submit"]{-webkit-appearance:none}.mdl-button--raised{background:rgba(158,158,158,.2);box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-button--raised:active{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2);background-color:rgba(158,158,158,.4)}.mdl-button--raised:focus:not(:active){box-shadow:0 0 8px rgba(0,0,0,.18),0 8px 16px rgba(0,0,0,.36);background-color:rgba(158,158,158,.4)}.mdl-button--raised.mdl-button--colored{background:rgb(158,158,158);color:rgb(66,66,66)}.mdl-button--raised.mdl-button--colored:hover{background-color:rgb(158,158,158)}.mdl-button--raised.mdl-button--colored:active{background-color:rgb(158,158,158)}.mdl-button--raised.mdl-button--colored:focus:not(:active){background-color:rgb(158,158,158)}.mdl-button--raised.mdl-button--colored .mdl-ripple{background:rgb(66,66,66)}.mdl-button--fab{border-radius:50%;font-size:24px;height:56px;margin:auto;min-width:56px;width:56px;padding:0;overflow:hidden;background:rgba(158,158,158,.2);box-shadow:0 1px 1.5px 0 rgba(0,0,0,.12),0 1px 1px 0 rgba(0,0,0,.24);position:relative;line-height:normal}.mdl-button--fab .material-icons{position:absolute;top:50%;left:50%;-webkit-transform:translate(-12px,-12px);-ms-transform:translate(-12px,-12px);transform:translate(-12px,-12px);line-height:24px;width:24px}.mdl-button--fab.mdl-button--mini-fab{height:40px;min-width:40px;width:40px}.mdl-button--fab .mdl-button__ripple-container{border-radius:50%;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-button--fab:active{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2);background-color:rgba(158,158,158,.4)}.mdl-button--fab:focus:not(:active){box-shadow:0 0 8px rgba(0,0,0,.18),0 8px 16px rgba(0,0,0,.36);background-color:rgba(158,158,158,.4)}.mdl-button--fab.mdl-button--colored{background:rgb(255,110,64);color:rgb(66,66,66)}.mdl-button--fab.mdl-button--colored:hover{background-color:rgb(255,110,64)}.mdl-button--fab.mdl-button--colored:focus:not(:active){background-color:rgb(255,110,64)}.mdl-button--fab.mdl-button--colored:active{background-color:rgb(255,110,64)}.mdl-button--fab.mdl-button--colored .mdl-ripple{background:rgb(66,66,66)}.mdl-button--icon{border-radius:50%;font-size:24px;height:32px;margin-left:0;margin-right:0;min-width:32px;width:32px;padding:0;overflow:hidden;color:inherit;line-height:normal}.mdl-button--icon .material-icons{position:absolute;top:50%;left:50%;-webkit-transform:translate(-12px,-12px);-ms-transform:translate(-12px,-12px);transform:translate(-12px,-12px);line-height:24px;width:24px}.mdl-button--icon.mdl-button--mini-icon{height:24px;min-width:24px;width:24px}.mdl-button--icon.mdl-button--mini-icon .material-icons{top:0;left:0}.mdl-button--icon .mdl-button__ripple-container{border-radius:50%;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-button__ripple-container{display:block;height:100%;left:0;position:absolute;top:0;width:100%;z-index:0;overflow:hidden}.mdl-button[disabled] .mdl-button__ripple-container .mdl-ripple,.mdl-button.mdl-button--disabled .mdl-button__ripple-container .mdl-ripple{background-color:transparent}.mdl-button--primary.mdl-button--primary{color:rgb(158,158,158)}.mdl-button--primary.mdl-button--primary .mdl-ripple{background:rgb(66,66,66)}.mdl-button--primary.mdl-button--primary.mdl-button--raised,.mdl-button--primary.mdl-button--primary.mdl-button--fab{color:rgb(66,66,66);background-color:rgb(158,158,158)}.mdl-button--accent.mdl-button--accent{color:rgb(255,110,64)}.mdl-button--accent.mdl-button--accent .mdl-ripple{background:rgb(66,66,66)}.mdl-button--accent.mdl-button--accent.mdl-button--raised,.mdl-button--accent.mdl-button--accent.mdl-button--fab{color:rgb(66,66,66);background-color:rgb(255,110,64)}.mdl-button[disabled][disabled],.mdl-button.mdl-button--disabled.mdl-button--disabled{color:rgba(0,0,0,.26);cursor:auto;background-color:transparent}.mdl-button--fab[disabled][disabled],.mdl-button--fab.mdl-button--disabled.mdl-button--disabled,.mdl-button--raised[disabled][disabled],.mdl-button--raised.mdl-button--disabled.mdl-button--disabled{background-color:rgba(0,0,0,.12);color:rgba(0,0,0,.26);box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-button--colored[disabled][disabled],.mdl-button--colored.mdl-button--disabled.mdl-button--disabled{color:rgba(0,0,0,.26)}.mdl-button .material-icons{vertical-align:middle}.mdl-card{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;font-size:16px;font-weight:400;min-height:200px;overflow:hidden;width:330px;z-index:1;position:relative;background:#fff;border-radius:2px;box-sizing:border-box}.mdl-card__media{background-color:rgb(255,110,64);background-repeat:repeat;background-position:50% 50%;background-size:cover;background-origin:padding-box;background-attachment:scroll;box-sizing:border-box}.mdl-card__title{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;color:#000;display:block;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:stretch;-webkit-justify-content:stretch;-ms-flex-pack:stretch;justify-content:stretch;line-height:normal;padding:16px;-webkit-perspective-origin:165px 56px;perspective-origin:165px 56px;-webkit-transform-origin:165px 56px;-ms-transform-origin:165px 56px;transform-origin:165px 56px;box-sizing:border-box}.mdl-card__title.mdl-card--border{border-bottom:1px solid rgba(0,0,0,.1)}.mdl-card__title-text{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end;color:inherit;display:block;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;font-size:24px;font-weight:300;line-height:normal;overflow:hidden;-webkit-transform-origin:149px 48px;-ms-transform-origin:149px 48px;transform-origin:149px 48px;margin:0}.mdl-card__subtitle-text{font-size:14px;color:grey;margin:0}.mdl-card__supporting-text{color:rgba(0,0,0,.54);font-size:13px;line-height:18px;overflow:hidden;padding:16px;width:90%}.mdl-card__actions{font-size:16px;line-height:normal;width:100%;background-color:transparent;padding:8px;box-sizing:border-box}.mdl-card__actions.mdl-card--border{border-top:1px solid rgba(0,0,0,.1)}.mdl-card--expand{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.mdl-card__menu{position:absolute;right:16px;top:16px}.mdl-checkbox{position:relative;z-index:1;vertical-align:middle;display:inline-block;box-sizing:border-box;width:100%;height:24px;margin:0;padding:0}.mdl-checkbox.is-upgraded{padding-left:24px}.mdl-checkbox__input{line-height:24px}.mdl-checkbox.is-upgraded .mdl-checkbox__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-checkbox__box-outline{position:absolute;top:3px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;margin:0;cursor:pointer;overflow:hidden;border:2px solid rgba(0,0,0,.54);border-radius:2px;z-index:2}.mdl-checkbox.is-checked .mdl-checkbox__box-outline{border:2px solid rgb(158,158,158)}.mdl-checkbox.is-disabled .mdl-checkbox__box-outline{border:2px solid rgba(0,0,0,.26);cursor:auto}.mdl-checkbox__focus-helper{position:absolute;top:3px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;border-radius:50%;background-color:transparent}.mdl-checkbox.is-focused .mdl-checkbox__focus-helper{box-shadow:0 0 0 8px rgba(0,0,0,.1);background-color:rgba(0,0,0,.1)}.mdl-checkbox.is-focused.is-checked .mdl-checkbox__focus-helper{box-shadow:0 0 0 8px rgba(158,158,158,.26);background-color:rgba(158,158,158,.26)}.mdl-checkbox__tick-outline{position:absolute;top:0;left:0;height:100%;width:100%;-webkit-mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8ZGVmcz4KICAgIDxjbGlwUGF0aCBpZD0iY2xpcCI+CiAgICAgIDxwYXRoCiAgICAgICAgIGQ9Ik0gMCwwIDAsMSAxLDEgMSwwIDAsMCB6IE0gMC44NTM0Mzc1LDAuMTY3MTg3NSAwLjk1OTY4NzUsMC4yNzMxMjUgMC40MjkzNzUsMC44MDM0Mzc1IDAuMzIzMTI1LDAuOTA5Njg3NSAwLjIxNzE4NzUsMC44MDM0Mzc1IDAuMDQwMzEyNSwwLjYyNjg3NSAwLjE0NjU2MjUsMC41MjA2MjUgMC4zMjMxMjUsMC42OTc1IDAuODUzNDM3NSwwLjE2NzE4NzUgeiIKICAgICAgICAgc3R5bGU9ImZpbGw6I2ZmZmZmZjtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KICAgIDwvY2xpcFBhdGg+CiAgICA8bWFzayBpZD0ibWFzayIgbWFza1VuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgbWFza0NvbnRlbnRVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giPgogICAgICA8cGF0aAogICAgICAgICBkPSJNIDAsMCAwLDEgMSwxIDEsMCAwLDAgeiBNIDAuODUzNDM3NSwwLjE2NzE4NzUgMC45NTk2ODc1LDAuMjczMTI1IDAuNDI5Mzc1LDAuODAzNDM3NSAwLjMyMzEyNSwwLjkwOTY4NzUgMC4yMTcxODc1LDAuODAzNDM3NSAwLjA0MDMxMjUsMC42MjY4NzUgMC4xNDY1NjI1LDAuNTIwNjI1IDAuMzIzMTI1LDAuNjk3NSAwLjg1MzQzNzUsMC4xNjcxODc1IHoiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmUiIC8+CiAgICA8L21hc2s+CiAgPC9kZWZzPgogIDxyZWN0CiAgICAgd2lkdGg9IjEiCiAgICAgaGVpZ2h0PSIxIgogICAgIHg9IjAiCiAgICAgeT0iMCIKICAgICBjbGlwLXBhdGg9InVybCgjY2xpcCkiCiAgICAgc3R5bGU9ImZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KPC9zdmc+Cg==");mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8ZGVmcz4KICAgIDxjbGlwUGF0aCBpZD0iY2xpcCI+CiAgICAgIDxwYXRoCiAgICAgICAgIGQ9Ik0gMCwwIDAsMSAxLDEgMSwwIDAsMCB6IE0gMC44NTM0Mzc1LDAuMTY3MTg3NSAwLjk1OTY4NzUsMC4yNzMxMjUgMC40MjkzNzUsMC44MDM0Mzc1IDAuMzIzMTI1LDAuOTA5Njg3NSAwLjIxNzE4NzUsMC44MDM0Mzc1IDAuMDQwMzEyNSwwLjYyNjg3NSAwLjE0NjU2MjUsMC41MjA2MjUgMC4zMjMxMjUsMC42OTc1IDAuODUzNDM3NSwwLjE2NzE4NzUgeiIKICAgICAgICAgc3R5bGU9ImZpbGw6I2ZmZmZmZjtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KICAgIDwvY2xpcFBhdGg+CiAgICA8bWFzayBpZD0ibWFzayIgbWFza1VuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgbWFza0NvbnRlbnRVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giPgogICAgICA8cGF0aAogICAgICAgICBkPSJNIDAsMCAwLDEgMSwxIDEsMCAwLDAgeiBNIDAuODUzNDM3NSwwLjE2NzE4NzUgMC45NTk2ODc1LDAuMjczMTI1IDAuNDI5Mzc1LDAuODAzNDM3NSAwLjMyMzEyNSwwLjkwOTY4NzUgMC4yMTcxODc1LDAuODAzNDM3NSAwLjA0MDMxMjUsMC42MjY4NzUgMC4xNDY1NjI1LDAuNTIwNjI1IDAuMzIzMTI1LDAuNjk3NSAwLjg1MzQzNzUsMC4xNjcxODc1IHoiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmUiIC8+CiAgICA8L21hc2s+CiAgPC9kZWZzPgogIDxyZWN0CiAgICAgd2lkdGg9IjEiCiAgICAgaGVpZ2h0PSIxIgogICAgIHg9IjAiCiAgICAgeT0iMCIKICAgICBjbGlwLXBhdGg9InVybCgjY2xpcCkiCiAgICAgc3R5bGU9ImZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KPC9zdmc+Cg==");background:0 0;-webkit-transition-duration:.28s;transition-duration:.28s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:background;transition-property:background}.mdl-checkbox.is-checked .mdl-checkbox__tick-outline{background:rgb(158,158,158)url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8cGF0aAogICAgIGQ9Ik0gMC4wNDAzODA1OSwwLjYyNjc3NjcgMC4xNDY0NDY2MSwwLjUyMDcxMDY4IDAuNDI5Mjg5MzIsMC44MDM1NTMzOSAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IE0gMC4yMTcxNTcyOSwwLjgwMzU1MzM5IDAuODUzNTUzMzksMC4xNjcxNTcyOSAwLjk1OTYxOTQxLDAuMjczMjIzMyAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IgogICAgIGlkPSJyZWN0Mzc4MCIKICAgICBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lIiAvPgo8L3N2Zz4K")}.mdl-checkbox.is-checked.is-disabled .mdl-checkbox__tick-outline{background:rgba(0,0,0,.26)url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8cGF0aAogICAgIGQ9Ik0gMC4wNDAzODA1OSwwLjYyNjc3NjcgMC4xNDY0NDY2MSwwLjUyMDcxMDY4IDAuNDI5Mjg5MzIsMC44MDM1NTMzOSAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IE0gMC4yMTcxNTcyOSwwLjgwMzU1MzM5IDAuODUzNTUzMzksMC4xNjcxNTcyOSAwLjk1OTYxOTQxLDAuMjczMjIzMyAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IgogICAgIGlkPSJyZWN0Mzc4MCIKICAgICBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lIiAvPgo8L3N2Zz4K")}.mdl-checkbox__label{position:relative;cursor:pointer;font-size:16px;line-height:24px;margin:0}.mdl-checkbox.is-disabled .mdl-checkbox__label{color:rgba(0,0,0,.26);cursor:auto}.mdl-checkbox__ripple-container{position:absolute;z-index:2;top:-6px;left:-10px;box-sizing:border-box;width:36px;height:36px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-checkbox__ripple-container .mdl-ripple{background:rgb(158,158,158)}.mdl-checkbox.is-disabled .mdl-checkbox__ripple-container{cursor:auto}.mdl-checkbox.is-disabled .mdl-checkbox__ripple-container .mdl-ripple{background:0 0}.mdl-data-table{position:relative;border:1px solid rgba(0,0,0,.12);border-collapse:collapse;white-space:nowrap;font-size:13px;background-color:#fff}.mdl-data-table thead{padding-bottom:3px}.mdl-data-table thead .mdl-data-table__select{margin-top:0}.mdl-data-table tbody tr{position:relative;height:48px;-webkit-transition-duration:.28s;transition-duration:.28s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:background-color;transition-property:background-color}.mdl-data-table tbody tr.is-selected{background-color:#e0e0e0}.mdl-data-table tbody tr:hover{background-color:#eee}.mdl-data-table td{text-align:right}.mdl-data-table th{padding:0 18px 0 18px;text-align:right}.mdl-data-table td:first-of-type,.mdl-data-table th:first-of-type{padding-left:24px}.mdl-data-table td:last-of-type,.mdl-data-table th:last-of-type{padding-right:24px}.mdl-data-table td{position:relative;vertical-align:top;height:48px;border-top:1px solid rgba(0,0,0,.12);border-bottom:1px solid rgba(0,0,0,.12);padding:12px 18px 0;box-sizing:border-box}.mdl-data-table td .mdl-data-table__select{vertical-align:top;position:absolute;left:24px}.mdl-data-table th{position:relative;vertical-align:bottom;text-overflow:ellipsis;font-weight:700;line-height:24px;letter-spacing:0;height:48px;font-size:12px;color:rgba(0,0,0,.54);padding-bottom:8px;box-sizing:border-box}.mdl-data-table th .mdl-data-table__select{position:absolute;bottom:8px;left:24px}.mdl-data-table__select{width:16px}.mdl-data-table__cell--non-numeric.mdl-data-table__cell--non-numeric{text-align:left}.mdl-mega-footer{padding:16px 40px;color:#9e9e9e;background-color:#424242}.mdl-mega-footer--top-section:after,.mdl-mega-footer--middle-section:after,.mdl-mega-footer--bottom-section:after,.mdl-mega-footer__top-section:after,.mdl-mega-footer__middle-section:after,.mdl-mega-footer__bottom-section:after{content:'';display:block;clear:both}.mdl-mega-footer--left-section,.mdl-mega-footer__left-section,.mdl-mega-footer--right-section,.mdl-mega-footer__right-section{margin-bottom:16px}.mdl-mega-footer--right-section a,.mdl-mega-footer__right-section a{display:block;margin-bottom:16px;color:inherit;text-decoration:none}@media screen and (min-width:760px){.mdl-mega-footer--left-section,.mdl-mega-footer__left-section{float:left}.mdl-mega-footer--right-section,.mdl-mega-footer__right-section{float:right}.mdl-mega-footer--right-section a,.mdl-mega-footer__right-section a{display:inline-block;margin-left:16px;line-height:36px;vertical-align:middle}}.mdl-mega-footer--social-btn,.mdl-mega-footer__social-btn{width:36px;height:36px;padding:0;margin:0;background-color:#9e9e9e;border:none}.mdl-mega-footer--drop-down-section,.mdl-mega-footer__drop-down-section{display:block;position:relative}@media screen and (min-width:760px){.mdl-mega-footer--drop-down-section,.mdl-mega-footer__drop-down-section{width:33%}.mdl-mega-footer--drop-down-section:nth-child(1),.mdl-mega-footer--drop-down-section:nth-child(2),.mdl-mega-footer__drop-down-section:nth-child(1),.mdl-mega-footer__drop-down-section:nth-child(2){float:left}.mdl-mega-footer--drop-down-section:nth-child(3),.mdl-mega-footer__drop-down-section:nth-child(3){float:right}.mdl-mega-footer--drop-down-section:nth-child(3):after,.mdl-mega-footer__drop-down-section:nth-child(3):after{clear:right}.mdl-mega-footer--drop-down-section:nth-child(4),.mdl-mega-footer__drop-down-section:nth-child(4){clear:right;float:right}.mdl-mega-footer--middle-section:after,.mdl-mega-footer__middle-section:after{content:'';display:block;clear:both}.mdl-mega-footer--bottom-section,.mdl-mega-footer__bottom-section{padding-top:0}}@media screen and (min-width:1024px){.mdl-mega-footer--drop-down-section,.mdl-mega-footer--drop-down-section:nth-child(3),.mdl-mega-footer--drop-down-section:nth-child(4),.mdl-mega-footer__drop-down-section,.mdl-mega-footer__drop-down-section:nth-child(3),.mdl-mega-footer__drop-down-section:nth-child(4){width:24%;float:left}}.mdl-mega-footer--heading-checkbox,.mdl-mega-footer__heading-checkbox{position:absolute;width:100%;height:55.8px;padding:32px;margin:-16px 0 0;cursor:pointer;z-index:1;opacity:0}.mdl-mega-footer--heading-checkbox~.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox~.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox~.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox~.mdl-mega-footer__heading:after{font-family:'Material Icons';content:'\E5CE'}.mdl-mega-footer--heading-checkbox:checked~ul,.mdl-mega-footer__heading-checkbox:checked~ul{display:none}.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer__heading:after{font-family:'Material Icons';content:'\E5CF'}.mdl-mega-footer--heading,.mdl-mega-footer__heading{position:relative;width:100%;padding-right:39.8px;margin-bottom:16px;box-sizing:border-box;font-size:14px;line-height:23.8px;font-weight:500;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;color:#e0e0e0}.mdl-mega-footer--heading:after,.mdl-mega-footer__heading:after{content:'';position:absolute;top:0;right:0;display:block;width:23.8px;height:23.8px;background-size:cover}.mdl-mega-footer--link-list,.mdl-mega-footer__link-list{list-style:none;padding:0;margin:0 0 32px}.mdl-mega-footer--link-list:after,.mdl-mega-footer__link-list:after{clear:both;display:block;content:''}.mdl-mega-footer--link-list li,.mdl-mega-footer__link-list li{font-size:14px;font-weight:400;letter-spacing:0;line-height:20px}.mdl-mega-footer--link-list a,.mdl-mega-footer__link-list a{color:inherit;text-decoration:none;white-space:nowrap}@media screen and (min-width:760px){.mdl-mega-footer--heading-checkbox,.mdl-mega-footer__heading-checkbox{display:none}.mdl-mega-footer--heading-checkbox~.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox~.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox~.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox~.mdl-mega-footer__heading:after{background-image:none}.mdl-mega-footer--heading-checkbox:checked~ul,.mdl-mega-footer__heading-checkbox:checked~ul{display:block}.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer__heading:after{content:''}}.mdl-mega-footer--bottom-section,.mdl-mega-footer__bottom-section{padding-top:16px;margin-bottom:16px}.mdl-logo{margin-bottom:16px;color:#fff}.mdl-mega-footer--bottom-section .mdl-mega-footer--link-list li,.mdl-mega-footer__bottom-section .mdl-mega-footer__link-list li{float:left;margin-bottom:0;margin-right:16px}@media screen and (min-width:760px){.mdl-logo{float:left;margin-bottom:0;margin-right:16px}}.mdl-mini-footer{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:32px 16px;color:#9e9e9e;background-color:#424242}.mdl-mini-footer:after{content:'';display:block}.mdl-mini-footer .mdl-logo{line-height:36px}.mdl-mini-footer--link-list,.mdl-mini-footer__link-list{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap;list-style:none;margin:0;padding:0}.mdl-mini-footer--link-list li,.mdl-mini-footer__link-list li{margin-bottom:0;margin-right:16px}@media screen and (min-width:760px){.mdl-mini-footer--link-list li,.mdl-mini-footer__link-list li{line-height:36px}}.mdl-mini-footer--link-list a,.mdl-mini-footer__link-list a{color:inherit;text-decoration:none;white-space:nowrap}.mdl-mini-footer--left-section,.mdl-mini-footer__left-section{display:inline-block;-webkit-box-ordinal-group:1;-webkit-order:0;-ms-flex-order:0;order:0}.mdl-mini-footer--right-section,.mdl-mini-footer__right-section{display:inline-block;-webkit-box-ordinal-group:2;-webkit-order:1;-ms-flex-order:1;order:1}.mdl-mini-footer--social-btn,.mdl-mini-footer__social-btn{width:36px;height:36px;padding:0;margin:0;background-color:#9e9e9e;border:none}.mdl-icon-toggle{position:relative;z-index:1;vertical-align:middle;display:inline-block;height:32px;margin:0;padding:0}.mdl-icon-toggle__input{line-height:32px}.mdl-icon-toggle.is-upgraded .mdl-icon-toggle__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-icon-toggle__label{display:inline-block;position:relative;cursor:pointer;height:32px;width:32px;min-width:32px;color:#616161;border-radius:50%;padding:0;margin-left:0;margin-right:0;text-align:center;background-color:transparent;will-change:background-color;-webkit-transition:background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1);transition:background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1)}.mdl-icon-toggle__label.material-icons{line-height:32px;font-size:24px}.mdl-icon-toggle.is-checked .mdl-icon-toggle__label{color:rgb(158,158,158)}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__label{color:rgba(0,0,0,.26);cursor:auto;-webkit-transition:none;transition:none}.mdl-icon-toggle.is-focused .mdl-icon-toggle__label{background-color:rgba(0,0,0,.12)}.mdl-icon-toggle.is-focused.is-checked .mdl-icon-toggle__label{background-color:rgba(158,158,158,.26)}.mdl-icon-toggle__ripple-container{position:absolute;z-index:2;top:-2px;left:-2px;box-sizing:border-box;width:36px;height:36px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-icon-toggle__ripple-container .mdl-ripple{background:#616161}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__ripple-container{cursor:auto}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__ripple-container .mdl-ripple{background:0 0}.mdl-menu__container{display:block;margin:0;padding:0;border:none;position:absolute;overflow:visible;height:0;width:0;visibility:hidden;z-index:-1}.mdl-menu__container.is-visible,.mdl-menu__container.is-animating{z-index:999;visibility:visible}.mdl-menu__outline{display:block;background:#fff;margin:0;padding:0;border:none;border-radius:2px;position:absolute;top:0;left:0;overflow:hidden;opacity:0;-webkit-transform:scale(0);-ms-transform:scale(0);transform:scale(0);-webkit-transform-origin:0 0;-ms-transform-origin:0 0;transform-origin:0 0;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);will-change:transform;-webkit-transition:-webkit-transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1);transition:transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1);z-index:-1}.mdl-menu__container.is-visible .mdl-menu__outline{opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1);z-index:999}.mdl-menu__outline.mdl-menu--bottom-right{-webkit-transform-origin:100% 0;-ms-transform-origin:100% 0;transform-origin:100% 0}.mdl-menu__outline.mdl-menu--top-left{-webkit-transform-origin:0 100%;-ms-transform-origin:0 100%;transform-origin:0 100%}.mdl-menu__outline.mdl-menu--top-right{-webkit-transform-origin:100% 100%;-ms-transform-origin:100% 100%;transform-origin:100% 100%}.mdl-menu{position:absolute;list-style:none;top:0;left:0;height:auto;width:auto;min-width:124px;padding:8px 0;margin:0;opacity:0;clip:rect(0 0 0 0);z-index:-1}.mdl-menu__container.is-visible .mdl-menu{opacity:1;z-index:999}.mdl-menu.is-animating{-webkit-transition:opacity .2s cubic-bezier(.4,0,.2,1),clip .3s cubic-bezier(.4,0,.2,1);transition:opacity .2s cubic-bezier(.4,0,.2,1),clip .3s cubic-bezier(.4,0,.2,1)}.mdl-menu.mdl-menu--bottom-right{left:auto;right:0}.mdl-menu.mdl-menu--top-left{top:auto;bottom:0}.mdl-menu.mdl-menu--top-right{top:auto;left:auto;bottom:0;right:0}.mdl-menu.mdl-menu--unaligned{top:auto;left:auto}.mdl-menu__item{display:block;border:none;color:rgba(0,0,0,.87);background-color:transparent;text-align:left;margin:0;padding:0 16px;outline-color:#bdbdbd;position:relative;overflow:hidden;font-size:14px;font-weight:400;letter-spacing:0;text-decoration:none;cursor:pointer;height:48px;line-height:48px;white-space:nowrap;opacity:0;-webkit-transition:opacity .2s cubic-bezier(.4,0,.2,1);transition:opacity .2s cubic-bezier(.4,0,.2,1);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-menu__container.is-visible .mdl-menu__item{opacity:1}.mdl-menu__item::-moz-focus-inner{border:0}.mdl-menu__item[disabled]{color:#bdbdbd;background-color:transparent;cursor:auto}.mdl-menu__item[disabled]:hover{background-color:transparent}.mdl-menu__item[disabled]:focus{background-color:transparent}.mdl-menu__item[disabled] .mdl-ripple{background:0 0}.mdl-menu__item:hover{background-color:#eee}.mdl-menu__item:focus{outline:none;background-color:#eee}.mdl-menu__item:active{background-color:#e0e0e0}.mdl-menu__item--ripple-container{display:block;height:100%;left:0;position:absolute;top:0;width:100%;z-index:0;overflow:hidden}.mdl-progress{display:block;position:relative;height:4px;width:500px}.mdl-progress>.bar{display:block;position:absolute;top:0;bottom:0;width:0%;-webkit-transition:width .2s cubic-bezier(.4,0,.2,1);transition:width .2s cubic-bezier(.4,0,.2,1)}.mdl-progress>.progressbar{background-color:rgb(158,158,158);z-index:1;left:0}.mdl-progress>.bufferbar{background-image:-webkit-linear-gradient(left,rgba(66,66,66,.7),rgba(66,66,66,.7)),-webkit-linear-gradient(left,rgb(158,158,158),rgb(158,158,158));background-image:linear-gradient(to right,rgba(66,66,66,.7),rgba(66,66,66,.7)),linear-gradient(to right,rgb(158,158,158),rgb(158,158,158));z-index:0;left:0}.mdl-progress>.auxbar{right:0}@supports (-webkit-appearance:none){.mdl-progress:not(.mdl-progress__indeterminate):not(.mdl-progress__indeterminate)>.auxbar{background-image:-webkit-linear-gradient(left,rgba(66,66,66,.7),rgba(66,66,66,.7)),-webkit-linear-gradient(left,rgb(158,158,158),rgb(158,158,158));background-image:linear-gradient(to right,rgba(66,66,66,.7),rgba(66,66,66,.7)),linear-gradient(to right,rgb(158,158,158),rgb(158,158,158));-webkit-mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjxzdmcgd2lkdGg9IjEyIiBoZWlnaHQ9IjQiIHZpZXdQb3J0PSIwIDAgMTIgNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxlbGxpcHNlIGN4PSIyIiBjeT0iMiIgcng9IjIiIHJ5PSIyIj4KICAgIDxhbmltYXRlIGF0dHJpYnV0ZU5hbWU9ImN4IiBmcm9tPSIyIiB0bz0iLTEwIiBkdXI9IjAuNnMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIiAvPgogIDwvZWxsaXBzZT4KICA8ZWxsaXBzZSBjeD0iMTQiIGN5PSIyIiByeD0iMiIgcnk9IjIiIGNsYXNzPSJsb2FkZXIiPgogICAgPGFuaW1hdGUgYXR0cmlidXRlTmFtZT0iY3giIGZyb209IjE0IiB0bz0iMiIgZHVyPSIwLjZzIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIgLz4KICA8L2VsbGlwc2U+Cjwvc3ZnPgo=");mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjxzdmcgd2lkdGg9IjEyIiBoZWlnaHQ9IjQiIHZpZXdQb3J0PSIwIDAgMTIgNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxlbGxpcHNlIGN4PSIyIiBjeT0iMiIgcng9IjIiIHJ5PSIyIj4KICAgIDxhbmltYXRlIGF0dHJpYnV0ZU5hbWU9ImN4IiBmcm9tPSIyIiB0bz0iLTEwIiBkdXI9IjAuNnMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIiAvPgogIDwvZWxsaXBzZT4KICA8ZWxsaXBzZSBjeD0iMTQiIGN5PSIyIiByeD0iMiIgcnk9IjIiIGNsYXNzPSJsb2FkZXIiPgogICAgPGFuaW1hdGUgYXR0cmlidXRlTmFtZT0iY3giIGZyb209IjE0IiB0bz0iMiIgZHVyPSIwLjZzIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIgLz4KICA8L2VsbGlwc2U+Cjwvc3ZnPgo=")}}.mdl-progress:not(.mdl-progress__indeterminate)>.auxbar{background-image:-webkit-linear-gradient(left,rgba(66,66,66,.9),rgba(66,66,66,.9)),-webkit-linear-gradient(left,rgb(158,158,158),rgb(158,158,158));background-image:linear-gradient(to right,rgba(66,66,66,.9),rgba(66,66,66,.9)),linear-gradient(to right,rgb(158,158,158),rgb(158,158,158))}.mdl-progress.mdl-progress__indeterminate>.bar1{-webkit-animation-name:indeterminate1;animation-name:indeterminate1}.mdl-progress.mdl-progress__indeterminate>.bar1,.mdl-progress.mdl-progress__indeterminate>.bar3{background-color:rgb(158,158,158);-webkit-animation-duration:2s;animation-duration:2s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-timing-function:linear;animation-timing-function:linear}.mdl-progress.mdl-progress__indeterminate>.bar3{background-image:none;-webkit-animation-name:indeterminate2;animation-name:indeterminate2}@-webkit-keyframes indeterminate1{0%{left:0%;width:0%}50%{left:25%;width:75%}75%{left:100%;width:0%}}@keyframes indeterminate1{0%{left:0%;width:0%}50%{left:25%;width:75%}75%{left:100%;width:0%}}@-webkit-keyframes indeterminate2{0%,50%{left:0%;width:0%}75%{left:0%;width:25%}100%{left:100%;width:0%}}@keyframes indeterminate2{0%,50%{left:0%;width:0%}75%{left:0%;width:25%}100%{left:100%;width:0%}}.mdl-navigation{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;box-sizing:border-box}.mdl-navigation__link{color:#424242;text-decoration:none;font-weight:500;font-size:13px;margin:0}.mdl-layout{width:100%;height:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;overflow-y:auto;overflow-x:hidden;position:relative;-webkit-overflow-scrolling:touch}.mdl-layout.is-small-screen .mdl-layout--large-screen-only{display:none}.mdl-layout:not(.is-small-screen) .mdl-layout--small-screen-only{display:none}.mdl-layout__container{position:absolute;width:100%;height:100%}.mdl-layout-title{display:block;position:relative;font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:20px;line-height:1;letter-spacing:.02em;font-weight:400;box-sizing:border-box}.mdl-layout-spacer{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.mdl-layout__drawer{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;width:240px;height:100%;max-height:100%;position:absolute;top:0;left:0;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);box-sizing:border-box;border-right:1px solid #e0e0e0;background:#fafafa;-webkit-transform:translateX(-250px);-ms-transform:translateX(-250px);transform:translateX(-250px);-webkit-transform-style:preserve-3d;transform-style:preserve-3d;will-change:transform;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:-webkit-transform;transition-property:transform;color:#424242;overflow:visible;overflow-y:auto;z-index:5}.mdl-layout__drawer.is-visible{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}.mdl-layout__drawer>*{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0}.mdl-layout__drawer>.mdl-layout-title{line-height:64px;padding-left:40px}@media screen and (max-width:1024px){.mdl-layout__drawer>.mdl-layout-title{line-height:56px;padding-left:16px}}.mdl-layout__drawer .mdl-navigation{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:stretch;-webkit-align-items:stretch;-ms-flex-align:stretch;align-items:stretch;padding-top:16px}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link{display:block;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;padding:16px 40px;margin:0;color:#757575}@media screen and (max-width:1024px){.mdl-layout__drawer .mdl-navigation .mdl-navigation__link{padding:16px}}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link:hover{background-color:#e0e0e0}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link--current{background-color:#000;color:rgb(158,158,158)}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__drawer{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}}.mdl-layout__drawer-button{display:block;position:absolute;height:48px;width:48px;border:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;overflow:hidden;text-align:center;cursor:pointer;font-size:26px;line-height:50px;font-family:Helvetica,Arial,sans-serif;margin:10px 12px;top:0;left:0;color:rgb(66,66,66);z-index:4}.mdl-layout__header .mdl-layout__drawer-button{position:absolute;color:rgb(66,66,66);background-color:inherit}@media screen and (max-width:1024px){.mdl-layout__header .mdl-layout__drawer-button{margin:4px}}@media screen and (max-width:1024px){.mdl-layout__drawer-button{margin:4px;color:rgba(0,0,0,.5)}}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__drawer-button{display:none}}.mdl-layout__header{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-box-pack:start;-webkit-justify-content:flex-start;-ms-flex-pack:start;justify-content:flex-start;box-sizing:border-box;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;width:100%;margin:0;padding:0;border:none;min-height:64px;max-height:1000px;z-index:3;background-color:rgb(158,158,158);color:rgb(66,66,66);box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:max-height,box-shadow;transition-property:max-height,box-shadow}@media screen and (max-width:1024px){.mdl-layout__header{min-height:56px}}.mdl-layout--fixed-drawer.is-upgraded:not(.is-small-screen)>.mdl-layout__header{margin-left:240px;width:calc(100% - 240px)}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__header .mdl-layout__header-row{padding-left:40px}}.mdl-layout__header>.mdl-layout-icon{position:absolute;left:40px;top:16px;height:32px;width:32px;overflow:hidden;z-index:3;display:block}@media screen and (max-width:1024px){.mdl-layout__header>.mdl-layout-icon{left:16px;top:12px}}.mdl-layout.has-drawer .mdl-layout__header>.mdl-layout-icon{display:none}.mdl-layout__header.is-compact{max-height:64px}@media screen and (max-width:1024px){.mdl-layout__header.is-compact{max-height:56px}}.mdl-layout__header.is-compact.has-tabs{height:112px}@media screen and (max-width:1024px){.mdl-layout__header.is-compact.has-tabs{min-height:104px}}@media screen and (max-width:1024px){.mdl-layout__header{display:none}.mdl-layout--fixed-header>.mdl-layout__header{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}}.mdl-layout__header--transparent.mdl-layout__header--transparent{background-color:transparent;box-shadow:none}.mdl-layout__header--seamed,.mdl-layout__header--scroll{box-shadow:none}.mdl-layout__header--waterfall{box-shadow:none;overflow:hidden}.mdl-layout__header--waterfall.is-casting-shadow{box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-layout__header-row{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;box-sizing:border-box;-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:64px;margin:0;padding:0 40px 0 80px}@media screen and (max-width:1024px){.mdl-layout__header-row{height:56px;padding:0 16px 0 72px}}.mdl-layout__header-row>*{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0}.mdl-layout__header--scroll .mdl-layout__header-row{width:100%}.mdl-layout__header-row .mdl-navigation{margin:0;padding:0;height:64px;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}@media screen and (max-width:1024px){.mdl-layout__header-row .mdl-navigation{height:56px}}.mdl-layout__header-row .mdl-navigation__link{display:block;color:rgb(66,66,66);line-height:64px;padding:0 24px}@media screen and (max-width:1024px){.mdl-layout__header-row .mdl-navigation__link{line-height:56px;padding:0 16px}}.mdl-layout__obfuscator{background-color:transparent;position:absolute;top:0;left:0;height:100%;width:100%;z-index:4;visibility:hidden;-webkit-transition-property:background-color;transition-property:background-color;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-layout__drawer.is-visible~.mdl-layout__obfuscator{background-color:rgba(0,0,0,.5);visibility:visible}.mdl-layout__content{-ms-flex:0 1 auto;display:inline-block;overflow-y:auto;overflow-x:hidden;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;z-index:1;-webkit-overflow-scrolling:touch}.mdl-layout--fixed-drawer>.mdl-layout__content{margin-left:240px}.mdl-layout__container.has-scrolling-header .mdl-layout__content{overflow:visible}@media screen and (max-width:1024px){.mdl-layout--fixed-drawer>.mdl-layout__content{margin-left:0}.mdl-layout__container.has-scrolling-header .mdl-layout__content{overflow-y:auto;overflow-x:hidden}}.mdl-layout__tab-bar{height:96px;margin:0;width:calc(100% - 112px);padding:0 0 0 56px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;background-color:rgb(158,158,158);overflow-y:hidden;overflow-x:scroll}.mdl-layout__tab-bar::-webkit-scrollbar{display:none}@media screen and (max-width:1024px){.mdl-layout__tab-bar{width:calc(100% - 60px);padding:0 0 0 60px}}.mdl-layout--fixed-tabs .mdl-layout__tab-bar{padding:0;overflow:hidden;width:100%}.mdl-layout__tab-bar-container{position:relative;height:48px;width:100%;border:none;margin:0;z-index:2;-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;overflow:hidden}.mdl-layout__container>.mdl-layout__tab-bar-container{position:absolute;top:0;left:0}.mdl-layout__tab-bar-button{display:inline-block;position:absolute;top:0;height:48px;width:56px;z-index:4;text-align:center;background-color:rgb(158,158,158);color:transparent;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}@media screen and (max-width:1024px){.mdl-layout__tab-bar-button{display:none;width:60px}}.mdl-layout--fixed-tabs .mdl-layout__tab-bar-button{display:none}.mdl-layout__tab-bar-button .material-icons{line-height:48px}.mdl-layout__tab-bar-button.is-active{color:rgb(66,66,66)}.mdl-layout__tab-bar-left-button{left:0}.mdl-layout__tab-bar-right-button{right:0}.mdl-layout__tab{margin:0;border:none;padding:0 24px;float:left;position:relative;display:block;-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;text-decoration:none;height:48px;line-height:48px;text-align:center;font-weight:500;font-size:14px;text-transform:uppercase;color:rgba(66,66,66,.6);overflow:hidden}@media screen and (max-width:1024px){.mdl-layout__tab{padding:0 12px}}.mdl-layout--fixed-tabs .mdl-layout__tab{float:none;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;padding:0}.mdl-layout.is-upgraded .mdl-layout__tab.is-active{color:rgb(66,66,66)}.mdl-layout.is-upgraded .mdl-layout__tab.is-active::after{height:2px;width:100%;display:block;content:" ";bottom:0;left:0;position:absolute;background:rgb(255,110,64);-webkit-animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;-webkit-transition:all 1s cubic-bezier(.4,0,1,1);transition:all 1s cubic-bezier(.4,0,1,1)}.mdl-layout__tab .mdl-layout__tab-ripple-container{display:block;position:absolute;height:100%;width:100%;left:0;top:0;z-index:1;overflow:hidden}.mdl-layout__tab .mdl-layout__tab-ripple-container .mdl-ripple{background-color:rgb(66,66,66)}.mdl-layout__tab-panel{display:block}.mdl-layout.is-upgraded .mdl-layout__tab-panel{display:none}.mdl-layout.is-upgraded .mdl-layout__tab-panel.is-active{display:block}.mdl-radio{position:relative;font-size:16px;line-height:24px;display:inline-block;box-sizing:border-box;margin:0;padding-left:0}.mdl-radio.is-upgraded{padding-left:24px}.mdl-radio__button{line-height:24px}.mdl-radio.is-upgraded .mdl-radio__button{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-radio__outer-circle{position:absolute;top:4px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;margin:0;cursor:pointer;border:2px solid rgba(0,0,0,.54);border-radius:50%;z-index:2}.mdl-radio.is-checked .mdl-radio__outer-circle{border:2px solid rgb(158,158,158)}.mdl-radio.is-disabled .mdl-radio__outer-circle{border:2px solid rgba(0,0,0,.26);cursor:auto}.mdl-radio__inner-circle{position:absolute;z-index:1;margin:0;top:8px;left:4px;box-sizing:border-box;width:8px;height:8px;cursor:pointer;-webkit-transition-duration:.28s;transition-duration:.28s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:-webkit-transform;transition-property:transform;-webkit-transform:scale3d(0,0,0);transform:scale3d(0,0,0);border-radius:50%;background:rgb(158,158,158)}.mdl-radio.is-checked .mdl-radio__inner-circle{-webkit-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}.mdl-radio.is-disabled .mdl-radio__inner-circle{background:rgba(0,0,0,.26);cursor:auto}.mdl-radio.is-focused .mdl-radio__inner-circle{box-shadow:0 0 0 10px rgba(0,0,0,.1)}.mdl-radio__label{cursor:pointer}.mdl-radio.is-disabled .mdl-radio__label{color:rgba(0,0,0,.26);cursor:auto}.mdl-radio__ripple-container{position:absolute;z-index:2;top:-9px;left:-13px;box-sizing:border-box;width:42px;height:42px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-radio__ripple-container .mdl-ripple{background:rgb(158,158,158)}.mdl-radio.is-disabled .mdl-radio__ripple-container{cursor:auto}.mdl-radio.is-disabled .mdl-radio__ripple-container .mdl-ripple{background:0 0}_:-ms-input-placeholder,:root .mdl-slider.mdl-slider.is-upgraded{-ms-appearance:none;height:32px;margin:0}.mdl-slider{width:calc(100% - 40px);margin:0 20px}.mdl-slider.is-upgraded{-webkit-appearance:none;-moz-appearance:none;appearance:none;height:2px;background:0 0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;outline:0;padding:0;color:rgb(158,158,158);-webkit-align-self:center;-ms-flex-item-align:center;align-self:center;z-index:1;cursor:pointer}.mdl-slider.is-upgraded::-moz-focus-outer{border:0}.mdl-slider.is-upgraded::-ms-tooltip{display:none}.mdl-slider.is-upgraded::-webkit-slider-runnable-track{background:0 0}.mdl-slider.is-upgraded::-moz-range-track{background:0 0;border:none}.mdl-slider.is-upgraded::-ms-track{background:0 0;color:transparent;height:2px;width:100%;border:none}.mdl-slider.is-upgraded::-ms-fill-lower{padding:0;background:linear-gradient(to right,transparent,transparent 16px,rgb(158,158,158)16px,rgb(158,158,158)0)}.mdl-slider.is-upgraded::-ms-fill-upper{padding:0;background:linear-gradient(to left,transparent,transparent 16px,rgba(0,0,0,.26)16px,rgba(0,0,0,.26)0)}.mdl-slider.is-upgraded::-webkit-slider-thumb{-webkit-appearance:none;width:12px;height:12px;box-sizing:border-box;border-radius:50%;background:rgb(158,158,158);border:none;-webkit-transition:-webkit-transform .18s cubic-bezier(.4,0,.2,1),border .18s cubic-bezier(.4,0,.2,1),box-shadow .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1);transition:transform .18s cubic-bezier(.4,0,.2,1),border .18s cubic-bezier(.4,0,.2,1),box-shadow .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1)}.mdl-slider.is-upgraded::-moz-range-thumb{-moz-appearance:none;width:12px;height:12px;box-sizing:border-box;border-radius:50%;background-image:none;background:rgb(158,158,158);border:none}.mdl-slider.is-upgraded:focus:not(:active)::-webkit-slider-thumb{box-shadow:0 0 0 10px rgba(158,158,158,.26)}.mdl-slider.is-upgraded:focus:not(:active)::-moz-range-thumb{box-shadow:0 0 0 10px rgba(158,158,158,.26)}.mdl-slider.is-upgraded:active::-webkit-slider-thumb{background-image:none;background:rgb(158,158,158);-webkit-transform:scale(1.5);transform:scale(1.5)}.mdl-slider.is-upgraded:active::-moz-range-thumb{background-image:none;background:rgb(158,158,158);transform:scale(1.5)}.mdl-slider.is-upgraded::-ms-thumb{width:32px;height:32px;border:none;border-radius:50%;background:rgb(158,158,158);-ms-transform:scale(.375);transform:scale(.375);transition:transform .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1)}.mdl-slider.is-upgraded:focus:not(:active)::-ms-thumb{background:radial-gradient(circle closest-side,rgb(158,158,158)0%,rgb(158,158,158)37.5%,rgba(158,158,158,.26)37.5%,rgba(158,158,158,.26)100%);-ms-transform:scale(1);transform:scale(1)}.mdl-slider.is-upgraded:active::-ms-thumb{background:rgb(158,158,158);-ms-transform:scale(.5625);transform:scale(.5625)}.mdl-slider.is-upgraded.is-lowest-value::-webkit-slider-thumb{border:2px solid rgba(0,0,0,.26);background:0 0}.mdl-slider.is-upgraded.is-lowest-value::-moz-range-thumb{border:2px solid rgba(0,0,0,.26);background:0 0}.mdl-slider.is-upgraded.is-lowest-value~.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-webkit-slider-thumb{box-shadow:0 0 0 10px rgba(0,0,0,.12);background:rgba(0,0,0,.12)}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-moz-range-thumb{box-shadow:0 0 0 10px rgba(0,0,0,.12);background:rgba(0,0,0,.12)}.mdl-slider.is-upgraded.is-lowest-value:active::-webkit-slider-thumb{border:1.6px solid rgba(0,0,0,.26);-webkit-transform:scale(1.5);transform:scale(1.5)}.mdl-slider.is-upgraded.is-lowest-value:active~.mdl-slider__background-flex>.mdl-slider__background-upper{left:9px}.mdl-slider.is-upgraded.is-lowest-value:active::-moz-range-thumb{border:1.5px solid rgba(0,0,0,.26);transform:scale(1.5)}.mdl-slider.is-upgraded.is-lowest-value::-ms-thumb{background:radial-gradient(circle closest-side,transparent 0%,transparent 66.67%,rgba(0,0,0,.26)66.67%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-ms-thumb{background:radial-gradient(circle closest-side,rgba(0,0,0,.12)0%,rgba(0,0,0,.12)25%,rgba(0,0,0,.26)25%,rgba(0,0,0,.26)37.5%,rgba(0,0,0,.12)37.5%,rgba(0,0,0,.12)100%);-ms-transform:scale(1);transform:scale(1)}.mdl-slider.is-upgraded.is-lowest-value:active::-ms-thumb{-ms-transform:scale(.5625);transform:scale(.5625);background:radial-gradient(circle closest-side,transparent 0%,transparent 77.78%,rgba(0,0,0,.26)77.78%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded.is-lowest-value::-ms-fill-lower{background:0 0}.mdl-slider.is-upgraded.is-lowest-value::-ms-fill-upper{margin-left:6px}.mdl-slider.is-upgraded.is-lowest-value:active::-ms-fill-upper{margin-left:9px}.mdl-slider.is-upgraded:disabled:focus::-webkit-slider-thumb,.mdl-slider.is-upgraded:disabled:active::-webkit-slider-thumb,.mdl-slider.is-upgraded:disabled::-webkit-slider-thumb{-webkit-transform:scale(.667);transform:scale(.667);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded:disabled:focus::-moz-range-thumb,.mdl-slider.is-upgraded:disabled:active::-moz-range-thumb,.mdl-slider.is-upgraded:disabled::-moz-range-thumb{transform:scale(.667);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded:disabled~.mdl-slider__background-flex>.mdl-slider__background-lower{background-color:rgba(0,0,0,.26);left:-6px}.mdl-slider.is-upgraded:disabled~.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-webkit-slider-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-webkit-slider-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-webkit-slider-thumb{border:3px solid rgba(0,0,0,.26);background:0 0;-webkit-transform:scale(.667);transform:scale(.667)}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-moz-range-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-moz-range-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-moz-range-thumb{border:3px solid rgba(0,0,0,.26);background:0 0;transform:scale(.667)}.mdl-slider.is-upgraded.is-lowest-value:disabled:active~.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded:disabled:focus::-ms-thumb,.mdl-slider.is-upgraded:disabled:active::-ms-thumb,.mdl-slider.is-upgraded:disabled::-ms-thumb{-ms-transform:scale(.25);transform:scale(.25);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-ms-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-ms-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-ms-thumb{-ms-transform:scale(.25);transform:scale(.25);background:radial-gradient(circle closest-side,transparent 0%,transparent 50%,rgba(0,0,0,.26)50%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded:disabled::-ms-fill-lower{margin-right:6px;background:linear-gradient(to right,transparent,transparent 25px,rgba(0,0,0,.26)25px,rgba(0,0,0,.26)0)}.mdl-slider.is-upgraded:disabled::-ms-fill-upper{margin-left:6px}.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-ms-fill-upper{margin-left:6px}.mdl-slider__ie-container{height:18px;overflow:visible;border:none;margin:none;padding:none}.mdl-slider__container{height:18px;position:relative;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row}.mdl-slider__container,.mdl-slider__background-flex{background:0 0;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.mdl-slider__background-flex{position:absolute;height:2px;width:calc(100% - 52px);top:50%;left:0;margin:0 26px;overflow:hidden;border:0;padding:0;-webkit-transform:translate(0,-1px);-ms-transform:translate(0,-1px);transform:translate(0,-1px)}.mdl-slider__background-lower{background:rgb(158,158,158)}.mdl-slider__background-lower,.mdl-slider__background-upper{-webkit-box-flex:0;-webkit-flex:0;-ms-flex:0;flex:0;position:relative;border:0;padding:0}.mdl-slider__background-upper{background:rgba(0,0,0,.26);-webkit-transition:left .18s cubic-bezier(.4,0,.2,1);transition:left .18s cubic-bezier(.4,0,.2,1)}.mdl-spinner{display:inline-block;position:relative;width:28px;height:28px}.mdl-spinner:not(.is-upgraded).is-active:after{content:"Loading..."}.mdl-spinner.is-upgraded.is-active{-webkit-animation:mdl-spinner__container-rotate 1568.23529412ms linear infinite;animation:mdl-spinner__container-rotate 1568.23529412ms linear infinite}@-webkit-keyframes mdl-spinner__container-rotate{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes mdl-spinner__container-rotate{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.mdl-spinner__layer{position:absolute;width:100%;height:100%;opacity:0}.mdl-spinner__layer-1{border-color:#42a5f5}.mdl-spinner--single-color .mdl-spinner__layer-1{border-color:rgb(158,158,158)}.mdl-spinner.is-active .mdl-spinner__layer-1{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-1-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-1-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-2{border-color:#f44336}.mdl-spinner--single-color .mdl-spinner__layer-2{border-color:rgb(158,158,158)}.mdl-spinner.is-active .mdl-spinner__layer-2{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-2-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-2-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-3{border-color:#fdd835}.mdl-spinner--single-color .mdl-spinner__layer-3{border-color:rgb(158,158,158)}.mdl-spinner.is-active .mdl-spinner__layer-3{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-3-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-3-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-4{border-color:#4caf50}.mdl-spinner--single-color .mdl-spinner__layer-4{border-color:rgb(158,158,158)}.mdl-spinner.is-active .mdl-spinner__layer-4{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-4-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-4-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}@-webkit-keyframes mdl-spinner__fill-unfill-rotate{12.5%{-webkit-transform:rotate(135deg);transform:rotate(135deg)}25%{-webkit-transform:rotate(270deg);transform:rotate(270deg)}37.5%{-webkit-transform:rotate(405deg);transform:rotate(405deg)}50%{-webkit-transform:rotate(540deg);transform:rotate(540deg)}62.5%{-webkit-transform:rotate(675deg);transform:rotate(675deg)}75%{-webkit-transform:rotate(810deg);transform:rotate(810deg)}87.5%{-webkit-transform:rotate(945deg);transform:rotate(945deg)}to{-webkit-transform:rotate(1080deg);transform:rotate(1080deg)}}@keyframes mdl-spinner__fill-unfill-rotate{12.5%{-webkit-transform:rotate(135deg);transform:rotate(135deg)}25%{-webkit-transform:rotate(270deg);transform:rotate(270deg)}37.5%{-webkit-transform:rotate(405deg);transform:rotate(405deg)}50%{-webkit-transform:rotate(540deg);transform:rotate(540deg)}62.5%{-webkit-transform:rotate(675deg);transform:rotate(675deg)}75%{-webkit-transform:rotate(810deg);transform:rotate(810deg)}87.5%{-webkit-transform:rotate(945deg);transform:rotate(945deg)}to{-webkit-transform:rotate(1080deg);transform:rotate(1080deg)}}@-webkit-keyframes mdl-spinner__layer-1-fade-in-out{from,25%{opacity:.99}26%,89%{opacity:0}90%,100%{opacity:.99}}@keyframes mdl-spinner__layer-1-fade-in-out{from,25%{opacity:.99}26%,89%{opacity:0}90%,100%{opacity:.99}}@-webkit-keyframes mdl-spinner__layer-2-fade-in-out{from,15%{opacity:0}25%,50%{opacity:.99}51%{opacity:0}}@keyframes mdl-spinner__layer-2-fade-in-out{from,15%{opacity:0}25%,50%{opacity:.99}51%{opacity:0}}@-webkit-keyframes mdl-spinner__layer-3-fade-in-out{from,40%{opacity:0}50%,75%{opacity:.99}76%{opacity:0}}@keyframes mdl-spinner__layer-3-fade-in-out{from,40%{opacity:0}50%,75%{opacity:.99}76%{opacity:0}}@-webkit-keyframes mdl-spinner__layer-4-fade-in-out{from,65%{opacity:0}75%,90%{opacity:.99}100%{opacity:0}}@keyframes mdl-spinner__layer-4-fade-in-out{from,65%{opacity:0}75%,90%{opacity:.99}100%{opacity:0}}.mdl-spinner__gap-patch{position:absolute;box-sizing:border-box;top:0;left:45%;width:10%;height:100%;overflow:hidden;border-color:inherit}.mdl-spinner__gap-patch .mdl-spinner__circle{width:1000%;left:-450%}.mdl-spinner__circle-clipper{display:inline-block;position:relative;width:50%;height:100%;overflow:hidden;border-color:inherit}.mdl-spinner__circle-clipper .mdl-spinner__circle{width:200%}.mdl-spinner__circle{box-sizing:border-box;height:100%;border-width:3px;border-style:solid;border-color:inherit;border-bottom-color:transparent!important;border-radius:50%;-webkit-animation:none;animation:none;position:absolute;top:0;right:0;bottom:0;left:0}.mdl-spinner__left .mdl-spinner__circle{border-right-color:transparent!important;-webkit-transform:rotate(129deg);-ms-transform:rotate(129deg);transform:rotate(129deg)}.mdl-spinner.is-active .mdl-spinner__left .mdl-spinner__circle{-webkit-animation:mdl-spinner__left-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__left-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__right .mdl-spinner__circle{left:-100%;border-left-color:transparent!important;-webkit-transform:rotate(-129deg);-ms-transform:rotate(-129deg);transform:rotate(-129deg)}.mdl-spinner.is-active .mdl-spinner__right .mdl-spinner__circle{-webkit-animation:mdl-spinner__right-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__right-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both}@-webkit-keyframes mdl-spinner__left-spin{from{-webkit-transform:rotate(130deg);transform:rotate(130deg)}50%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(130deg);transform:rotate(130deg)}}@keyframes mdl-spinner__left-spin{from{-webkit-transform:rotate(130deg);transform:rotate(130deg)}50%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(130deg);transform:rotate(130deg)}}@-webkit-keyframes mdl-spinner__right-spin{from{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}50%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}to{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}}@keyframes mdl-spinner__right-spin{from{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}50%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}to{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}}.mdl-switch{position:relative;z-index:1;vertical-align:middle;display:inline-block;box-sizing:border-box;width:100%;height:24px;margin:0;padding:0;overflow:visible;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-switch.is-upgraded{padding-left:28px}.mdl-switch__input{line-height:24px}.mdl-switch.is-upgraded .mdl-switch__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-switch__track{background:rgba(0,0,0,.26);position:absolute;left:0;top:5px;height:14px;width:36px;border-radius:14px;cursor:pointer}.mdl-switch.is-checked .mdl-switch__track{background:rgba(158,158,158,.5)}.mdl-switch.is-disabled .mdl-switch__track{background:rgba(0,0,0,.12);cursor:auto}.mdl-switch__thumb{background:#fafafa;position:absolute;left:0;top:2px;height:20px;width:20px;border-radius:50%;cursor:pointer;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);-webkit-transition-duration:.28s;transition-duration:.28s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:left;transition-property:left}.mdl-switch.is-checked .mdl-switch__thumb{background:rgb(158,158,158);left:16px;box-shadow:0 3px 4px 0 rgba(0,0,0,.14),0 3px 3px -2px rgba(0,0,0,.2),0 1px 8px 0 rgba(0,0,0,.12)}.mdl-switch.is-disabled .mdl-switch__thumb{background:#bdbdbd;cursor:auto}.mdl-switch__focus-helper{position:absolute;top:50%;left:50%;-webkit-transform:translate(-4px,-4px);-ms-transform:translate(-4px,-4px);transform:translate(-4px,-4px);display:inline-block;box-sizing:border-box;width:8px;height:8px;border-radius:50%;background-color:transparent}.mdl-switch.is-focused .mdl-switch__focus-helper{box-shadow:0 0 0 20px rgba(0,0,0,.1);background-color:rgba(0,0,0,.1)}.mdl-switch.is-focused.is-checked .mdl-switch__focus-helper{box-shadow:0 0 0 20px rgba(158,158,158,.26);background-color:rgba(158,158,158,.26)}.mdl-switch__label{position:relative;cursor:pointer;font-size:16px;line-height:24px;margin:0;left:24px}.mdl-switch.is-disabled .mdl-switch__label{color:#bdbdbd;cursor:auto}.mdl-switch__ripple-container{position:absolute;z-index:2;top:-12px;left:-14px;box-sizing:border-box;width:48px;height:48px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000);-webkit-transition-duration:.4s;transition-duration:.4s;-webkit-transition-timing-function:step-end;transition-timing-function:step-end;-webkit-transition-property:left;transition-property:left}.mdl-switch__ripple-container .mdl-ripple{background:rgb(158,158,158)}.mdl-switch.is-disabled .mdl-switch__ripple-container{cursor:auto}.mdl-switch.is-disabled .mdl-switch__ripple-container .mdl-ripple{background:0 0}.mdl-switch.is-checked .mdl-switch__ripple-container{cursor:auto;left:2px}.mdl-tabs{display:block;width:100%}.mdl-tabs__tab-bar{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-content:space-between;-ms-flex-line-pack:justify;align-content:space-between;-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;height:48px;padding:0;margin:0;border-bottom:1px solid #e0e0e0}.mdl-tabs__tab{margin:0;border:none;padding:0 24px;float:left;position:relative;display:block;color:red;text-decoration:none;height:48px;line-height:48px;text-align:center;font-weight:500;font-size:14px;text-transform:uppercase;color:rgba(0,0,0,.54);overflow:hidden}.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active{color:rgba(0,0,0,.87)}.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active:after{height:2px;width:100%;display:block;content:" ";bottom:0;left:0;position:absolute;background:rgb(158,158,158);-webkit-animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;-webkit-transition:all 1s cubic-bezier(.4,0,1,1);transition:all 1s cubic-bezier(.4,0,1,1)}.mdl-tabs__tab .mdl-tabs__ripple-container{display:block;position:absolute;height:100%;width:100%;left:0;top:0;z-index:1;overflow:hidden}.mdl-tabs__tab .mdl-tabs__ripple-container .mdl-ripple{background:rgb(158,158,158)}.mdl-tabs__panel{display:block}.mdl-tabs.is-upgraded .mdl-tabs__panel{display:none}.mdl-tabs.is-upgraded .mdl-tabs__panel.is-active{display:block}@-webkit-keyframes border-expand{0%{opacity:0;width:0}100%{opacity:1;width:100%}}@keyframes border-expand{0%{opacity:0;width:0}100%{opacity:1;width:100%}}.mdl-textfield{position:relative;font-size:16px;display:inline-block;box-sizing:border-box;width:300px;max-width:100%;margin:0;padding:20px 0}.mdl-textfield .mdl-button{position:absolute;bottom:20px}.mdl-textfield--align-right{text-align:right}.mdl-textfield--full-width{width:100%}.mdl-textfield--expandable{min-width:32px;width:auto;min-height:32px}.mdl-textfield__input{border:none;border-bottom:1px solid rgba(0,0,0,.12);display:block;font-size:16px;margin:0;padding:4px 0;width:100%;background:0 0;text-align:left;color:inherit}.mdl-textfield.is-focused .mdl-textfield__input{outline:none}.mdl-textfield.is-invalid .mdl-textfield__input{border-color:#de3226;box-shadow:none}.mdl-textfield.is-disabled .mdl-textfield__input{background-color:transparent;border-bottom:1px dotted rgba(0,0,0,.12);color:rgba(0,0,0,.26)}.mdl-textfield textarea.mdl-textfield__input{display:block}.mdl-textfield__label{bottom:0;color:rgba(0,0,0,.26);font-size:16px;left:0;right:0;pointer-events:none;position:absolute;display:block;top:24px;width:100%;overflow:hidden;white-space:nowrap;text-align:left}.mdl-textfield.is-dirty .mdl-textfield__label{visibility:hidden}.mdl-textfield--floating-label .mdl-textfield__label{-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-textfield.is-disabled.is-disabled .mdl-textfield__label{color:rgba(0,0,0,.26)}.mdl-textfield--floating-label.is-focused .mdl-textfield__label,.mdl-textfield--floating-label.is-dirty .mdl-textfield__label{color:rgb(158,158,158);font-size:12px;top:4px;visibility:visible}.mdl-textfield--floating-label.is-focused .mdl-textfield__expandable-holder .mdl-textfield__label,.mdl-textfield--floating-label.is-dirty .mdl-textfield__expandable-holder .mdl-textfield__label{top:-16px}.mdl-textfield--floating-label.is-invalid .mdl-textfield__label{color:#de3226;font-size:12px}.mdl-textfield__label:after{background-color:rgb(158,158,158);bottom:20px;content:'';height:2px;left:45%;position:absolute;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);visibility:hidden;width:10px}.mdl-textfield.is-focused .mdl-textfield__label:after{left:0;visibility:visible;width:100%}.mdl-textfield.is-invalid .mdl-textfield__label:after{background-color:#de3226}.mdl-textfield__error{color:#de3226;position:absolute;font-size:12px;margin-top:3px;visibility:hidden;display:block}.mdl-textfield.is-invalid .mdl-textfield__error{visibility:visible}.mdl-textfield__expandable-holder{display:inline-block;position:relative;margin-left:32px;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);display:inline-block;max-width:.1px}.mdl-textfield.is-focused .mdl-textfield__expandable-holder,.mdl-textfield.is-dirty .mdl-textfield__expandable-holder{max-width:600px}.mdl-textfield__expandable-holder .mdl-textfield__label:after{bottom:0}.mdl-tooltip{-webkit-transform:scale(0);-ms-transform:scale(0);transform:scale(0);-webkit-transform-origin:top center;-ms-transform-origin:top center;transform-origin:top center;will-change:transform;z-index:999;background:rgba(97,97,97,.9);border-radius:2px;color:#fff;display:inline-block;font-size:10px;font-weight:500;line-height:14px;max-width:170px;position:fixed;top:-500px;left:-500px;padding:8px;text-align:center}.mdl-tooltip.is-active{-webkit-animation:pulse 200ms cubic-bezier(0,0,.2,1)forwards;animation:pulse 200ms cubic-bezier(0,0,.2,1)forwards}.mdl-tooltip--large{line-height:14px;font-size:14px;padding:16px}@-webkit-keyframes pulse{0%{-webkit-transform:scale(0);transform:scale(0);opacity:0}50%{-webkit-transform:scale(.99);transform:scale(.99)}100%{-webkit-transform:scale(1);transform:scale(1);opacity:1;visibility:visible}}@keyframes pulse{0%{-webkit-transform:scale(0);transform:scale(0);opacity:0}50%{-webkit-transform:scale(.99);transform:scale(.99)}100%{-webkit-transform:scale(1);transform:scale(1);opacity:1;visibility:visible}}.mdl-shadow--2dp{box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-shadow--3dp{box-shadow:0 3px 4px 0 rgba(0,0,0,.14),0 3px 3px -2px rgba(0,0,0,.2),0 1px 8px 0 rgba(0,0,0,.12)}.mdl-shadow--4dp{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2)}.mdl-shadow--6dp{box-shadow:0 6px 10px 0 rgba(0,0,0,.14),0 1px 18px 0 rgba(0,0,0,.12),0 3px 5px -1px rgba(0,0,0,.2)}.mdl-shadow--8dp{box-shadow:0 8px 10px 1px rgba(0,0,0,.14),0 3px 14px 2px rgba(0,0,0,.12),0 5px 5px -3px rgba(0,0,0,.2)}.mdl-shadow--16dp{box-shadow:0 16px 24px 2px rgba(0,0,0,.14),0 6px 30px 5px rgba(0,0,0,.12),0 8px 10px -5px rgba(0,0,0,.2)}.mdl-grid{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;margin:0 auto;-webkit-box-align:stretch;-webkit-align-items:stretch;-ms-flex-align:stretch;align-items:stretch}.mdl-grid.mdl-grid--no-spacing{padding:0}.mdl-cell{box-sizing:border-box}.mdl-cell--top{-webkit-align-self:flex-start;-ms-flex-item-align:start;align-self:flex-start}.mdl-cell--middle{-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.mdl-cell--bottom{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end}.mdl-cell--stretch{-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch}.mdl-grid.mdl-grid--no-spacing>.mdl-cell{margin:0}@media (max-width:479px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:100%}.mdl-cell--hide-phone{display:none!important}.mdl-cell--1-col,.mdl-cell--1-col-phone.mdl-cell--1-col-phone{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-phone.mdl-cell--1-col-phone{width:25%}.mdl-cell--2-col,.mdl-cell--2-col-phone.mdl-cell--2-col-phone{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-phone.mdl-cell--2-col-phone{width:50%}.mdl-cell--3-col,.mdl-cell--3-col-phone.mdl-cell--3-col-phone{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-phone.mdl-cell--3-col-phone{width:75%}.mdl-cell--4-col,.mdl-cell--4-col-phone.mdl-cell--4-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-phone.mdl-cell--4-col-phone{width:100%}.mdl-cell--5-col,.mdl-cell--5-col-phone.mdl-cell--5-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-phone.mdl-cell--5-col-phone{width:100%}.mdl-cell--6-col,.mdl-cell--6-col-phone.mdl-cell--6-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-phone.mdl-cell--6-col-phone{width:100%}.mdl-cell--7-col,.mdl-cell--7-col-phone.mdl-cell--7-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-phone.mdl-cell--7-col-phone{width:100%}.mdl-cell--8-col,.mdl-cell--8-col-phone.mdl-cell--8-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-phone.mdl-cell--8-col-phone{width:100%}.mdl-cell--9-col,.mdl-cell--9-col-phone.mdl-cell--9-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-phone.mdl-cell--9-col-phone{width:100%}.mdl-cell--10-col,.mdl-cell--10-col-phone.mdl-cell--10-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-phone.mdl-cell--10-col-phone{width:100%}.mdl-cell--11-col,.mdl-cell--11-col-phone.mdl-cell--11-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-phone.mdl-cell--11-col-phone{width:100%}.mdl-cell--12-col,.mdl-cell--12-col-phone.mdl-cell--12-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-phone.mdl-cell--12-col-phone{width:100%}}@media (min-width:480px) and (max-width:839px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:50%}.mdl-cell--hide-tablet{display:none!important}.mdl-cell--1-col,.mdl-cell--1-col-tablet.mdl-cell--1-col-tablet{width:calc(12.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-tablet.mdl-cell--1-col-tablet{width:12.5%}.mdl-cell--2-col,.mdl-cell--2-col-tablet.mdl-cell--2-col-tablet{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-tablet.mdl-cell--2-col-tablet{width:25%}.mdl-cell--3-col,.mdl-cell--3-col-tablet.mdl-cell--3-col-tablet{width:calc(37.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-tablet.mdl-cell--3-col-tablet{width:37.5%}.mdl-cell--4-col,.mdl-cell--4-col-tablet.mdl-cell--4-col-tablet{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-tablet.mdl-cell--4-col-tablet{width:50%}.mdl-cell--5-col,.mdl-cell--5-col-tablet.mdl-cell--5-col-tablet{width:calc(62.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-tablet.mdl-cell--5-col-tablet{width:62.5%}.mdl-cell--6-col,.mdl-cell--6-col-tablet.mdl-cell--6-col-tablet{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-tablet.mdl-cell--6-col-tablet{width:75%}.mdl-cell--7-col,.mdl-cell--7-col-tablet.mdl-cell--7-col-tablet{width:calc(87.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-tablet.mdl-cell--7-col-tablet{width:87.5%}.mdl-cell--8-col,.mdl-cell--8-col-tablet.mdl-cell--8-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-tablet.mdl-cell--8-col-tablet{width:100%}.mdl-cell--9-col,.mdl-cell--9-col-tablet.mdl-cell--9-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-tablet.mdl-cell--9-col-tablet{width:100%}.mdl-cell--10-col,.mdl-cell--10-col-tablet.mdl-cell--10-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-tablet.mdl-cell--10-col-tablet{width:100%}.mdl-cell--11-col,.mdl-cell--11-col-tablet.mdl-cell--11-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-tablet.mdl-cell--11-col-tablet{width:100%}.mdl-cell--12-col,.mdl-cell--12-col-tablet.mdl-cell--12-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-tablet.mdl-cell--12-col-tablet{width:100%}}@media (min-width:840px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(33.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:33.3333333333%}.mdl-cell--hide-desktop{display:none!important}.mdl-cell--1-col,.mdl-cell--1-col-desktop.mdl-cell--1-col-desktop{width:calc(8.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-desktop.mdl-cell--1-col-desktop{width:8.3333333333%}.mdl-cell--2-col,.mdl-cell--2-col-desktop.mdl-cell--2-col-desktop{width:calc(16.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-desktop.mdl-cell--2-col-desktop{width:16.6666666667%}.mdl-cell--3-col,.mdl-cell--3-col-desktop.mdl-cell--3-col-desktop{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-desktop.mdl-cell--3-col-desktop{width:25%}.mdl-cell--4-col,.mdl-cell--4-col-desktop.mdl-cell--4-col-desktop{width:calc(33.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-desktop.mdl-cell--4-col-desktop{width:33.3333333333%}.mdl-cell--5-col,.mdl-cell--5-col-desktop.mdl-cell--5-col-desktop{width:calc(41.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-desktop.mdl-cell--5-col-desktop{width:41.6666666667%}.mdl-cell--6-col,.mdl-cell--6-col-desktop.mdl-cell--6-col-desktop{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-desktop.mdl-cell--6-col-desktop{width:50%}.mdl-cell--7-col,.mdl-cell--7-col-desktop.mdl-cell--7-col-desktop{width:calc(58.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-desktop.mdl-cell--7-col-desktop{width:58.3333333333%}.mdl-cell--8-col,.mdl-cell--8-col-desktop.mdl-cell--8-col-desktop{width:calc(66.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-desktop.mdl-cell--8-col-desktop{width:66.6666666667%}.mdl-cell--9-col,.mdl-cell--9-col-desktop.mdl-cell--9-col-desktop{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-desktop.mdl-cell--9-col-desktop{width:75%}.mdl-cell--10-col,.mdl-cell--10-col-desktop.mdl-cell--10-col-desktop{width:calc(83.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-desktop.mdl-cell--10-col-desktop{width:83.3333333333%}.mdl-cell--11-col,.mdl-cell--11-col-desktop.mdl-cell--11-col-desktop{width:calc(91.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-desktop.mdl-cell--11-col-desktop{width:91.6666666667%}.mdl-cell--12-col,.mdl-cell--12-col-desktop.mdl-cell--12-col-desktop{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-desktop.mdl-cell--12-col-desktop{width:100%}}body{margin:0}.styleguide-demo h1{margin:48px 24px 0}.styleguide-demo h1:after{content:'';display:block;width:100%;border-bottom:1px solid rgba(0,0,0,.5);margin-top:24px}.styleguide-demo{opacity:0;-webkit-transition:opacity .6s ease;transition:opacity .6s ease}.styleguide-masthead{height:256px;background:#212121;padding:115px 16px 0}.styleguide-container{position:relative;max-width:960px;width:100%}.styleguide-title{color:#fff;bottom:auto;position:relative;font-size:56px;font-weight:300;line-height:1;letter-spacing:-.02em}.styleguide-title:after{border-bottom:0}.styleguide-title span{font-weight:300}.mdl-styleguide .mdl-layout__drawer .mdl-navigation__link{padding:10px 24px}.demosLoaded .styleguide-demo{opacity:1}iframe{display:block;width:100%;border:none}iframe.heightSet{overflow:hidden}.demo-wrapper{margin:24px}.demo-wrapper iframe{border:1px solid rgba(0,0,0,.5)}
\ No newline at end of file
diff --git a/themes/material/material.min.js b/themes/material/material.min.js
new file mode 100644
index 000000000..fbab3af48
--- /dev/null
+++ b/themes/material/material.min.js
@@ -0,0 +1,10 @@
+/**
+ * material-design-lite - Material Design Components in CSS, JS and HTML
+ * @version v1.0.5
+ * @license Apache-2.0
+ * @copyright 2015 Google, Inc.
+ * @link https://github.com/google/material-design-lite
+ */
+!function(){"use strict";function e(e,t){if(e){if(t.element_.classList.contains(t.CssClasses_.MDL_JS_RIPPLE_EFFECT)){var s=document.createElement("span");s.classList.add(t.CssClasses_.MDL_RIPPLE_CONTAINER),s.classList.add(t.CssClasses_.MDL_JS_RIPPLE_EFFECT);var i=document.createElement("span");i.classList.add(t.CssClasses_.MDL_RIPPLE),s.appendChild(i),e.appendChild(s)}e.addEventListener("click",function(s){s.preventDefault();var i=e.href.split("#")[1],n=t.element_.querySelector("#"+i);t.resetTabState_(),t.resetPanelState_(),e.classList.add(t.CssClasses_.ACTIVE_CLASS),n.classList.add(t.CssClasses_.ACTIVE_CLASS)})}}function t(e,t,s,i){if(e){if(i.tabBar_.classList.contains(i.CssClasses_.JS_RIPPLE_EFFECT)){var n=document.createElement("span");n.classList.add(i.CssClasses_.RIPPLE_CONTAINER),n.classList.add(i.CssClasses_.JS_RIPPLE_EFFECT);var a=document.createElement("span");a.classList.add(i.CssClasses_.RIPPLE),n.appendChild(a),e.appendChild(n)}e.addEventListener("click",function(n){n.preventDefault();var a=e.href.split("#")[1],l=i.content_.querySelector("#"+a);i.resetTabState_(t),i.resetPanelState_(s),e.classList.add(i.CssClasses_.IS_ACTIVE),l.classList.add(i.CssClasses_.IS_ACTIVE)})}}var s={upgradeDom:function(e,t){},upgradeElement:function(e,t){},upgradeElements:function(e){},upgradeAllRegistered:function(){},registerUpgradedCallback:function(e,t){},register:function(e){},downgradeElements:function(e){}};s=function(){function e(e,t){for(var s=0;s<c.length;s++)if(c[s].className===e)return"undefined"!=typeof t&&(c[s]=t),c[s];return!1}function t(e){var t=e.getAttribute("data-upgraded");return null===t?[""]:t.split(",")}function s(e,s){var i=t(e);return-1!==i.indexOf(s)}function i(t,s){if("undefined"==typeof t&&"undefined"==typeof s)for(var a=0;a<c.length;a++)i(c[a].className,c[a].cssClass);else{var l=t;if("undefined"==typeof s){var o=e(l);o&&(s=o.cssClass)}for(var r=document.querySelectorAll("."+s),d=0;d<r.length;d++)n(r[d],l)}}function n(i,n){if(!("object"==typeof i&&i instanceof Element))throw new Error("Invalid argument provided to upgrade MDL element.");var a=t(i),l=[];if(n)s(i,n)||l.push(e(n));else{var o=i.classList;c.forEach(function(e){o.contains(e.cssClass)&&-1===l.indexOf(e)&&!s(i,e.className)&&l.push(e)})}for(var r,d=0,_=l.length;_>d;d++){if(r=l[d],!r)throw new Error("Unable to find a registered component for the given class.");a.push(r.className),i.setAttribute("data-upgraded",a.join(","));var h=new r.classConstructor(i);h[C]=r,p.push(h);for(var u=0,m=r.callbacks.length;m>u;u++)r.callbacks[u](i);r.widget&&(i[r.className]=h);var E=document.createEvent("Events");E.initEvent("mdl-componentupgraded",!0,!0),i.dispatchEvent(E)}}function a(e){Array.isArray(e)||(e="function"==typeof e.item?Array.prototype.slice.call(e):[e]);for(var t,s=0,i=e.length;i>s;s++)t=e[s],t instanceof HTMLElement&&(n(t),t.children.length>0&&a(t.children))}function l(t){var s="undefined"==typeof t.widget&&"undefined"==typeof t.widget,i=!0;s||(i=t.widget||t.widget);var n={classConstructor:t.constructor||t.constructor,className:t.classAsString||t.classAsString,cssClass:t.cssClass||t.cssClass,widget:i,callbacks:[]};if(c.forEach(function(e){if(e.cssClass===n.cssClass)throw new Error("The provided cssClass has already been registered: "+e.cssClass);if(e.className===n.className)throw new Error("The provided className has already been registered")}),t.constructor.prototype.hasOwnProperty(C))throw new Error("MDL component classes must not have "+C+" defined as a property.");var a=e(t.classAsString,n);a||c.push(n)}function o(t,s){var i=e(t);i&&i.callbacks.push(s)}function r(){for(var e=0;e<c.length;e++)i(c[e].className)}function d(e){for(var t=0;t<p.length;t++){var s=p[t];if(s.element_===e)return s}}function _(e){if(e&&e[C].classConstructor.prototype.hasOwnProperty(u)){e[u]();var t=p.indexOf(e);p.splice(t,1);var s=e.element_.getAttribute("data-upgraded").split(","),i=s.indexOf(e[C].classAsString);s.splice(i,1),e.element_.setAttribute("data-upgraded",s.join(","));var n=document.createEvent("Events");n.initEvent("mdl-componentdowngraded",!0,!0),e.element_.dispatchEvent(n)}}function h(e){var t=function(e){_(d(e))};if(e instanceof Array||e instanceof NodeList)for(var s=0;s<e.length;s++)t(e[s]);else{if(!(e instanceof Node))throw new Error("Invalid argument provided to downgrade MDL nodes.");t(e)}}var c=[],p=[],u="mdlDowngrade_",C="mdlComponentConfigInternal_";return{upgradeDom:i,upgradeElement:n,upgradeElements:a,upgradeAllRegistered:r,registerUpgradedCallback:o,register:l,downgradeElements:h}}(),s.ComponentConfigPublic,s.ComponentConfig,s.Component,s.upgradeDom=s.upgradeDom,s.upgradeElement=s.upgradeElement,s.upgradeElements=s.upgradeElements,s.upgradeAllRegistered=s.upgradeAllRegistered,s.registerUpgradedCallback=s.registerUpgradedCallback,s.register=s.register,s.downgradeElements=s.downgradeElements,window.componentHandler=s,window.componentHandler=s,window.addEventListener("load",function(){"classList"in document.createElement("div")&&"querySelector"in document&&"addEventListener"in window&&Array.prototype.forEach?(document.documentElement.classList.add("mdl-js"),s.upgradeAllRegistered()):(s.upgradeElement=function(){},s.register=function(){})}),Date.now||(Date.now=function(){return(new Date).getTime()},Date.now=Date.now);for(var i=["webkit","moz"],n=0;n<i.length&&!window.requestAnimationFrame;++n){var a=i[n];window.requestAnimationFrame=window[a+"RequestAnimationFrame"],window.cancelAnimationFrame=window[a+"CancelAnimationFrame"]||window[a+"CancelRequestAnimationFrame"],window.requestAnimationFrame=window.requestAnimationFrame,window.cancelAnimationFrame=window.cancelAnimationFrame}if(/iP(ad|hone|od).*OS 6/.test(window.navigator.userAgent)||!window.requestAnimationFrame||!window.cancelAnimationFrame){var l=0;window.requestAnimationFrame=function(e){var t=Date.now(),s=Math.max(l+16,t);return setTimeout(function(){e(l=s)},s-t)},window.cancelAnimationFrame=clearTimeout,window.requestAnimationFrame=window.requestAnimationFrame,window.cancelAnimationFrame=window.cancelAnimationFrame}var o=function(e){this.element_=e,this.init()};window.MaterialButton=o,o.prototype.Constant_={},o.prototype.CssClasses_={RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_CONTAINER:"mdl-button__ripple-container",RIPPLE:"mdl-ripple"},o.prototype.blurHandler_=function(e){e&&this.element_.blur()},o.prototype.disable=function(){this.element_.disabled=!0},o.prototype.disable=o.prototype.disable,o.prototype.enable=function(){this.element_.disabled=!1},o.prototype.enable=o.prototype.enable,o.prototype.init=function(){if(this.element_){if(this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT)){var e=document.createElement("span");e.classList.add(this.CssClasses_.RIPPLE_CONTAINER),this.rippleElement_=document.createElement("span"),this.rippleElement_.classList.add(this.CssClasses_.RIPPLE),e.appendChild(this.rippleElement_),this.boundRippleBlurHandler=this.blurHandler_.bind(this),this.rippleElement_.addEventListener("mouseup",this.boundRippleBlurHandler),this.element_.appendChild(e)}this.boundButtonBlurHandler=this.blurHandler_.bind(this),this.element_.addEventListener("mouseup",this.boundButtonBlurHandler),this.element_.addEventListener("mouseleave",this.boundButtonBlurHandler)}},o.prototype.mdlDowngrade_=function(){this.rippleElement_&&this.rippleElement_.removeEventListener("mouseup",this.boundRippleBlurHandler),this.element_.removeEventListener("mouseup",this.boundButtonBlurHandler),this.element_.removeEventListener("mouseleave",this.boundButtonBlurHandler)},s.register({constructor:o,classAsString:"MaterialButton",cssClass:"mdl-js-button",widget:!0});var r=function(e){this.element_=e,this.init()};window.MaterialCheckbox=r,r.prototype.Constant_={TINY_TIMEOUT:.001},r.prototype.CssClasses_={INPUT:"mdl-checkbox__input",BOX_OUTLINE:"mdl-checkbox__box-outline",FOCUS_HELPER:"mdl-checkbox__focus-helper",TICK_OUTLINE:"mdl-checkbox__tick-outline",RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE_CONTAINER:"mdl-checkbox__ripple-container",RIPPLE_CENTER:"mdl-ripple--center",RIPPLE:"mdl-ripple",IS_FOCUSED:"is-focused",IS_DISABLED:"is-disabled",IS_CHECKED:"is-checked",IS_UPGRADED:"is-upgraded"},r.prototype.onChange_=function(e){this.updateClasses_()},r.prototype.onFocus_=function(e){this.element_.classList.add(this.CssClasses_.IS_FOCUSED)},r.prototype.onBlur_=function(e){this.element_.classList.remove(this.CssClasses_.IS_FOCUSED)},r.prototype.onMouseUp_=function(e){this.blur_()},r.prototype.updateClasses_=function(){this.checkDisabled(),this.checkToggleState()},r.prototype.blur_=function(){window.setTimeout(function(){this.inputElement_.blur()}.bind(this),this.Constant_.TINY_TIMEOUT)},r.prototype.checkToggleState=function(){this.inputElement_.checked?this.element_.classList.add(this.CssClasses_.IS_CHECKED):this.element_.classList.remove(this.CssClasses_.IS_CHECKED)},r.prototype.checkToggleState=r.prototype.checkToggleState,r.prototype.checkDisabled=function(){this.inputElement_.disabled?this.element_.classList.add(this.CssClasses_.IS_DISABLED):this.element_.classList.remove(this.CssClasses_.IS_DISABLED)},r.prototype.checkDisabled=r.prototype.checkDisabled,r.prototype.disable=function(){this.inputElement_.disabled=!0,this.updateClasses_()},r.prototype.disable=r.prototype.disable,r.prototype.enable=function(){this.inputElement_.disabled=!1,this.updateClasses_()},r.prototype.enable=r.prototype.enable,r.prototype.check=function(){this.inputElement_.checked=!0,this.updateClasses_()},r.prototype.check=r.prototype.check,r.prototype.uncheck=function(){this.inputElement_.checked=!1,this.updateClasses_()},r.prototype.uncheck=r.prototype.uncheck,r.prototype.init=function(){if(this.element_){this.inputElement_=this.element_.querySelector("."+this.CssClasses_.INPUT);var e=document.createElement("span");e.classList.add(this.CssClasses_.BOX_OUTLINE);var t=document.createElement("span");t.classList.add(this.CssClasses_.FOCUS_HELPER);var s=document.createElement("span");if(s.classList.add(this.CssClasses_.TICK_OUTLINE),e.appendChild(s),this.element_.appendChild(t),this.element_.appendChild(e),this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT)){this.element_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS),this.rippleContainerElement_=document.createElement("span"),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CONTAINER),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_EFFECT),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CENTER),this.boundRippleMouseUp=this.onMouseUp_.bind(this),this.rippleContainerElement_.addEventListener("mouseup",this.boundRippleMouseUp);var i=document.createElement("span");i.classList.add(this.CssClasses_.RIPPLE),this.rippleContainerElement_.appendChild(i),this.element_.appendChild(this.rippleContainerElement_)}this.boundInputOnChange=this.onChange_.bind(this),this.boundInputOnFocus=this.onFocus_.bind(this),this.boundInputOnBlur=this.onBlur_.bind(this),this.boundElementMouseUp=this.onMouseUp_.bind(this),this.inputElement_.addEventListener("change",this.boundInputOnChange),this.inputElement_.addEventListener("focus",this.boundInputOnFocus),this.inputElement_.addEventListener("blur",this.boundInputOnBlur),this.element_.addEventListener("mouseup",this.boundElementMouseUp),this.updateClasses_(),this.element_.classList.add(this.CssClasses_.IS_UPGRADED)}},r.prototype.mdlDowngrade_=function(){this.rippleContainerElement_&&this.rippleContainerElement_.removeEventListener("mouseup",this.boundRippleMouseUp),this.inputElement_.removeEventListener("change",this.boundInputOnChange),this.inputElement_.removeEventListener("focus",this.boundInputOnFocus),this.inputElement_.removeEventListener("blur",this.boundInputOnBlur),this.element_.removeEventListener("mouseup",this.boundElementMouseUp)},s.register({constructor:r,classAsString:"MaterialCheckbox",cssClass:"mdl-js-checkbox",widget:!0});var d=function(e){this.element_=e,this.init()};window.MaterialIconToggle=d,d.prototype.Constant_={TINY_TIMEOUT:.001},d.prototype.CssClasses_={INPUT:"mdl-icon-toggle__input",JS_RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE_CONTAINER:"mdl-icon-toggle__ripple-container",RIPPLE_CENTER:"mdl-ripple--center",RIPPLE:"mdl-ripple",IS_FOCUSED:"is-focused",IS_DISABLED:"is-disabled",IS_CHECKED:"is-checked"},d.prototype.onChange_=function(e){this.updateClasses_()},d.prototype.onFocus_=function(e){this.element_.classList.add(this.CssClasses_.IS_FOCUSED)},d.prototype.onBlur_=function(e){this.element_.classList.remove(this.CssClasses_.IS_FOCUSED)},d.prototype.onMouseUp_=function(e){this.blur_()},d.prototype.updateClasses_=function(){this.checkDisabled(),this.checkToggleState()},d.prototype.blur_=function(){window.setTimeout(function(){this.inputElement_.blur()}.bind(this),this.Constant_.TINY_TIMEOUT)},d.prototype.checkToggleState=function(){this.inputElement_.checked?this.element_.classList.add(this.CssClasses_.IS_CHECKED):this.element_.classList.remove(this.CssClasses_.IS_CHECKED)},d.prototype.checkToggleState=d.prototype.checkToggleState,d.prototype.checkDisabled=function(){this.inputElement_.disabled?this.element_.classList.add(this.CssClasses_.IS_DISABLED):this.element_.classList.remove(this.CssClasses_.IS_DISABLED)},d.prototype.checkDisabled=d.prototype.checkDisabled,d.prototype.disable=function(){this.inputElement_.disabled=!0,this.updateClasses_()},d.prototype.disable=d.prototype.disable,d.prototype.enable=function(){this.inputElement_.disabled=!1,this.updateClasses_()},d.prototype.enable=d.prototype.enable,d.prototype.check=function(){this.inputElement_.checked=!0,this.updateClasses_()},d.prototype.check=d.prototype.check,d.prototype.uncheck=function(){this.inputElement_.checked=!1,this.updateClasses_()},d.prototype.uncheck=d.prototype.uncheck,d.prototype.init=function(){if(this.element_){if(this.inputElement_=this.element_.querySelector("."+this.CssClasses_.INPUT),this.element_.classList.contains(this.CssClasses_.JS_RIPPLE_EFFECT)){this.element_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS),this.rippleContainerElement_=document.createElement("span"),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CONTAINER),this.rippleContainerElement_.classList.add(this.CssClasses_.JS_RIPPLE_EFFECT),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CENTER),this.boundRippleMouseUp=this.onMouseUp_.bind(this),this.rippleContainerElement_.addEventListener("mouseup",this.boundRippleMouseUp);var e=document.createElement("span");e.classList.add(this.CssClasses_.RIPPLE),this.rippleContainerElement_.appendChild(e),this.element_.appendChild(this.rippleContainerElement_)}this.boundInputOnChange=this.onChange_.bind(this),this.boundInputOnFocus=this.onFocus_.bind(this),this.boundInputOnBlur=this.onBlur_.bind(this),this.boundElementOnMouseUp=this.onMouseUp_.bind(this),this.inputElement_.addEventListener("change",this.boundInputOnChange),this.inputElement_.addEventListener("focus",this.boundInputOnFocus),this.inputElement_.addEventListener("blur",this.boundInputOnBlur),this.element_.addEventListener("mouseup",this.boundElementOnMouseUp),this.updateClasses_(),this.element_.classList.add("is-upgraded")}},d.prototype.mdlDowngrade_=function(){this.rippleContainerElement_&&this.rippleContainerElement_.removeEventListener("mouseup",this.boundRippleMouseUp),this.inputElement_.removeEventListener("change",this.boundInputOnChange),this.inputElement_.removeEventListener("focus",this.boundInputOnFocus),this.inputElement_.removeEventListener("blur",this.boundInputOnBlur),this.element_.removeEventListener("mouseup",this.boundElementOnMouseUp)},s.register({constructor:d,classAsString:"MaterialIconToggle",cssClass:"mdl-js-icon-toggle",widget:!0});var _=function(e){this.element_=e,this.init()};window.MaterialMenu=_,_.prototype.Constant_={TRANSITION_DURATION_SECONDS:.3,TRANSITION_DURATION_FRACTION:.8,CLOSE_TIMEOUT:150},_.prototype.Keycodes_={ENTER:13,ESCAPE:27,SPACE:32,UP_ARROW:38,DOWN_ARROW:40},_.prototype.CssClasses_={CONTAINER:"mdl-menu__container",OUTLINE:"mdl-menu__outline",ITEM:"mdl-menu__item",ITEM_RIPPLE_CONTAINER:"mdl-menu__item-ripple-container",RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE:"mdl-ripple",IS_UPGRADED:"is-upgraded",IS_VISIBLE:"is-visible",IS_ANIMATING:"is-animating",BOTTOM_LEFT:"mdl-menu--bottom-left",BOTTOM_RIGHT:"mdl-menu--bottom-right",TOP_LEFT:"mdl-menu--top-left",TOP_RIGHT:"mdl-menu--top-right",UNALIGNED:"mdl-menu--unaligned"},_.prototype.init=function(){if(this.element_){var e=document.createElement("div");e.classList.add(this.CssClasses_.CONTAINER),this.element_.parentElement.insertBefore(e,this.element_),this.element_.parentElement.removeChild(this.element_),e.appendChild(this.element_),this.container_=e;var t=document.createElement("div");t.classList.add(this.CssClasses_.OUTLINE),this.outline_=t,e.insertBefore(t,this.element_);var s=this.element_.getAttribute("for"),i=null;s&&(i=document.getElementById(s),i&&(this.forElement_=i,i.addEventListener("click",this.handleForClick_.bind(this)),i.addEventListener("keydown",this.handleForKeyboardEvent_.bind(this))));var n=this.element_.querySelectorAll("."+this.CssClasses_.ITEM);this.boundItemKeydown=this.handleItemKeyboardEvent_.bind(this),this.boundItemClick=this.handleItemClick_.bind(this);for(var a=0;a<n.length;a++)n[a].addEventListener("click",this.boundItemClick),n[a].tabIndex="-1",n[a].addEventListener("keydown",this.boundItemKeydown);if(this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT))for(this.element_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS),a=0;a<n.length;a++){var l=n[a],o=document.createElement("span");o.classList.add(this.CssClasses_.ITEM_RIPPLE_CONTAINER);var r=document.createElement("span");r.classList.add(this.CssClasses_.RIPPLE),o.appendChild(r),l.appendChild(o),l.classList.add(this.CssClasses_.RIPPLE_EFFECT)}this.element_.classList.contains(this.CssClasses_.BOTTOM_LEFT)&&this.outline_.classList.add(this.CssClasses_.BOTTOM_LEFT),this.element_.classList.contains(this.CssClasses_.BOTTOM_RIGHT)&&this.outline_.classList.add(this.CssClasses_.BOTTOM_RIGHT),this.element_.classList.contains(this.CssClasses_.TOP_LEFT)&&this.outline_.classList.add(this.CssClasses_.TOP_LEFT),this.element_.classList.contains(this.CssClasses_.TOP_RIGHT)&&this.outline_.classList.add(this.CssClasses_.TOP_RIGHT),this.element_.classList.contains(this.CssClasses_.UNALIGNED)&&this.outline_.classList.add(this.CssClasses_.UNALIGNED),e.classList.add(this.CssClasses_.IS_UPGRADED)}},_.prototype.handleForClick_=function(e){if(this.element_&&this.forElement_){var t=this.forElement_.getBoundingClientRect(),s=this.forElement_.parentElement.getBoundingClientRect();this.element_.classList.contains(this.CssClasses_.UNALIGNED)||(this.element_.classList.contains(this.CssClasses_.BOTTOM_RIGHT)?(this.container_.style.right=s.right-t.right+"px",this.container_.style.top=this.forElement_.offsetTop+this.forElement_.offsetHeight+"px"):this.element_.classList.contains(this.CssClasses_.TOP_LEFT)?(this.container_.style.left=this.forElement_.offsetLeft+"px",this.container_.style.bottom=s.bottom-t.top+"px"):this.element_.classList.contains(this.CssClasses_.TOP_RIGHT)?(this.container_.style.right=s.right-t.right+"px",this.container_.style.bottom=s.bottom-t.top+"px"):(this.container_.style.left=this.forElement_.offsetLeft+"px",this.container_.style.top=this.forElement_.offsetTop+this.forElement_.offsetHeight+"px"))}this.toggle(e)},_.prototype.handleForKeyboardEvent_=function(e){if(this.element_&&this.container_&&this.forElement_){var t=this.element_.querySelectorAll("."+this.CssClasses_.ITEM+":not([disabled])");t&&t.length>0&&this.container_.classList.contains(this.CssClasses_.IS_VISIBLE)&&(e.keyCode===this.Keycodes_.UP_ARROW?(e.preventDefault(),t[t.length-1].focus()):e.keyCode===this.Keycodes_.DOWN_ARROW&&(e.preventDefault(),t[0].focus()))}},_.prototype.handleItemKeyboardEvent_=function(e){if(this.element_&&this.container_){var t=this.element_.querySelectorAll("."+this.CssClasses_.ITEM+":not([disabled])");if(t&&t.length>0&&this.container_.classList.contains(this.CssClasses_.IS_VISIBLE)){var s=Array.prototype.slice.call(t).indexOf(e.target);if(e.keyCode===this.Keycodes_.UP_ARROW)e.preventDefault(),s>0?t[s-1].focus():t[t.length-1].focus();else if(e.keyCode===this.Keycodes_.DOWN_ARROW)e.preventDefault(),t.length>s+1?t[s+1].focus():t[0].focus();else if(e.keyCode===this.Keycodes_.SPACE||e.keyCode===this.Keycodes_.ENTER){e.preventDefault();var i=new MouseEvent("mousedown");e.target.dispatchEvent(i),i=new MouseEvent("mouseup"),e.target.dispatchEvent(i),e.target.click()}else e.keyCode===this.Keycodes_.ESCAPE&&(e.preventDefault(),this.hide())}}},_.prototype.handleItemClick_=function(e){null!==e.target.getAttribute("disabled")?e.stopPropagation():(this.closing_=!0,window.setTimeout(function(e){this.hide(),this.closing_=!1}.bind(this),this.Constant_.CLOSE_TIMEOUT))},_.prototype.applyClip_=function(e,t){this.element_.classList.contains(this.CssClasses_.UNALIGNED)?this.element_.style.clip="":this.element_.classList.contains(this.CssClasses_.BOTTOM_RIGHT)?this.element_.style.clip="rect(0 "+t+"px 0 "+t+"px)":this.element_.classList.contains(this.CssClasses_.TOP_LEFT)?this.element_.style.clip="rect("+e+"px 0 "+e+"px 0)":this.element_.classList.contains(this.CssClasses_.TOP_RIGHT)?this.element_.style.clip="rect("+e+"px "+t+"px "+e+"px "+t+"px)":this.element_.style.clip=""},_.prototype.addAnimationEndListener_=function(){var e=function(){this.element_.removeEventListener("transitionend",e),this.element_.removeEventListener("webkitTransitionEnd",e),this.element_.classList.remove(this.CssClasses_.IS_ANIMATING)}.bind(this);this.element_.addEventListener("transitionend",e),this.element_.addEventListener("webkitTransitionEnd",e)},_.prototype.show=function(e){if(this.element_&&this.container_&&this.outline_){var t=this.element_.getBoundingClientRect().height,s=this.element_.getBoundingClientRect().width;this.container_.style.width=s+"px",this.container_.style.height=t+"px",this.outline_.style.width=s+"px",this.outline_.style.height=t+"px";for(var i=this.Constant_.TRANSITION_DURATION_SECONDS*this.Constant_.TRANSITION_DURATION_FRACTION,n=this.element_.querySelectorAll("."+this.CssClasses_.ITEM),a=0;a<n.length;a++){var l=null;l=this.element_.classList.contains(this.CssClasses_.TOP_LEFT)||this.element_.classList.contains(this.CssClasses_.TOP_RIGHT)?(t-n[a].offsetTop-n[a].offsetHeight)/t*i+"s":n[a].offsetTop/t*i+"s",n[a].style.transitionDelay=l}this.applyClip_(t,s),window.requestAnimationFrame(function(){this.element_.classList.add(this.CssClasses_.IS_ANIMATING),this.element_.style.clip="rect(0 "+s+"px "+t+"px 0)",this.container_.classList.add(this.CssClasses_.IS_VISIBLE)}.bind(this)),this.addAnimationEndListener_();var o=function(t){t===e||this.closing_||(document.removeEventListener("click",o),this.hide())}.bind(this);document.addEventListener("click",o)}},_.prototype.show=_.prototype.show,_.prototype.hide=function(){if(this.element_&&this.container_&&this.outline_){for(var e=this.element_.querySelectorAll("."+this.CssClasses_.ITEM),t=0;t<e.length;t++)e[t].style.transitionDelay=null;var s=this.element_.getBoundingClientRect().height,i=this.element_.getBoundingClientRect().width;this.element_.classList.add(this.CssClasses_.IS_ANIMATING),this.applyClip_(s,i),this.container_.classList.remove(this.CssClasses_.IS_VISIBLE),this.addAnimationEndListener_()}},_.prototype.hide=_.prototype.hide,_.prototype.toggle=function(e){this.container_.classList.contains(this.CssClasses_.IS_VISIBLE)?this.hide():this.show(e)},_.prototype.toggle=_.prototype.toggle,_.prototype.mdlDowngrade_=function(){for(var e=this.element_.querySelectorAll("."+this.CssClasses_.ITEM),t=0;t<e.length;t++)e[t].removeEventListener("click",this.boundItemClick),e[t].removeEventListener("keydown",this.boundItemKeydown)},s.register({constructor:_,classAsString:"MaterialMenu",cssClass:"mdl-js-menu",widget:!0});var h=function(e){this.element_=e,this.init()};window.MaterialProgress=h,h.prototype.Constant_={},h.prototype.CssClasses_={INDETERMINATE_CLASS:"mdl-progress__indeterminate"},h.prototype.setProgress=function(e){this.element_.classList.contains(this.CssClasses_.INDETERMINATE_CLASS)||(this.progressbar_.style.width=e+"%")},h.prototype.setProgress=h.prototype.setProgress,h.prototype.setBuffer=function(e){this.bufferbar_.style.width=e+"%",this.auxbar_.style.width=100-e+"%"},h.prototype.setBuffer=h.prototype.setBuffer,h.prototype.init=function(){if(this.element_){var e=document.createElement("div");e.className="progressbar bar bar1",this.element_.appendChild(e),this.progressbar_=e,e=document.createElement("div"),e.className="bufferbar bar bar2",this.element_.appendChild(e),this.bufferbar_=e,e=document.createElement("div"),e.className="auxbar bar bar3",this.element_.appendChild(e),this.auxbar_=e,this.progressbar_.style.width="0%",this.bufferbar_.style.width="100%",this.auxbar_.style.width="0%",this.element_.classList.add("is-upgraded")}},h.prototype.mdlDowngrade_=function(){for(;this.element_.firstChild;)this.element_.removeChild(this.element_.firstChild)},s.register({constructor:h,classAsString:"MaterialProgress",cssClass:"mdl-js-progress",widget:!0});var c=function(e){this.element_=e,this.init()};window.MaterialRadio=c,c.prototype.Constant_={TINY_TIMEOUT:.001},c.prototype.CssClasses_={IS_FOCUSED:"is-focused",IS_DISABLED:"is-disabled",IS_CHECKED:"is-checked",IS_UPGRADED:"is-upgraded",JS_RADIO:"mdl-js-radio",RADIO_BTN:"mdl-radio__button",RADIO_OUTER_CIRCLE:"mdl-radio__outer-circle",RADIO_INNER_CIRCLE:"mdl-radio__inner-circle",RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE_CONTAINER:"mdl-radio__ripple-container",RIPPLE_CENTER:"mdl-ripple--center",RIPPLE:"mdl-ripple"},c.prototype.onChange_=function(e){for(var t=document.getElementsByClassName(this.CssClasses_.JS_RADIO),s=0;s<t.length;s++){var i=t[s].querySelector("."+this.CssClasses_.RADIO_BTN);i.getAttribute("name")===this.btnElement_.getAttribute("name")&&t[s].MaterialRadio.updateClasses_()}},c.prototype.onFocus_=function(e){this.element_.classList.add(this.CssClasses_.IS_FOCUSED)},c.prototype.onBlur_=function(e){this.element_.classList.remove(this.CssClasses_.IS_FOCUSED)},c.prototype.onMouseup_=function(e){this.blur_()},c.prototype.updateClasses_=function(){this.checkDisabled(),this.checkToggleState()},c.prototype.blur_=function(){window.setTimeout(function(){this.btnElement_.blur()}.bind(this),this.Constant_.TINY_TIMEOUT)},c.prototype.checkDisabled=function(){this.btnElement_.disabled?this.element_.classList.add(this.CssClasses_.IS_DISABLED):this.element_.classList.remove(this.CssClasses_.IS_DISABLED)},c.prototype.checkDisabled=c.prototype.checkDisabled,c.prototype.checkToggleState=function(){this.btnElement_.checked?this.element_.classList.add(this.CssClasses_.IS_CHECKED):this.element_.classList.remove(this.CssClasses_.IS_CHECKED)},c.prototype.checkToggleState=c.prototype.checkToggleState,c.prototype.disable=function(){this.btnElement_.disabled=!0,this.updateClasses_()},c.prototype.disable=c.prototype.disable,c.prototype.enable=function(){this.btnElement_.disabled=!1,this.updateClasses_()},c.prototype.enable=c.prototype.enable,c.prototype.check=function(){this.btnElement_.checked=!0,this.updateClasses_()},c.prototype.check=c.prototype.check,c.prototype.uncheck=function(){this.btnElement_.checked=!1,this.updateClasses_()},c.prototype.uncheck=c.prototype.uncheck,c.prototype.init=function(){if(this.element_){this.btnElement_=this.element_.querySelector("."+this.CssClasses_.RADIO_BTN);var e=document.createElement("span");e.classList.add(this.CssClasses_.RADIO_OUTER_CIRCLE);var t=document.createElement("span");t.classList.add(this.CssClasses_.RADIO_INNER_CIRCLE),this.element_.appendChild(e),this.element_.appendChild(t);var s;if(this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT)){this.element_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS),s=document.createElement("span"),s.classList.add(this.CssClasses_.RIPPLE_CONTAINER),s.classList.add(this.CssClasses_.RIPPLE_EFFECT),s.classList.add(this.CssClasses_.RIPPLE_CENTER),s.addEventListener("mouseup",this.onMouseup_.bind(this));var i=document.createElement("span");i.classList.add(this.CssClasses_.RIPPLE),s.appendChild(i),this.element_.appendChild(s)}this.btnElement_.addEventListener("change",this.onChange_.bind(this)),this.btnElement_.addEventListener("focus",this.onFocus_.bind(this)),this.btnElement_.addEventListener("blur",this.onBlur_.bind(this)),this.element_.addEventListener("mouseup",this.onMouseup_.bind(this)),this.updateClasses_(),this.element_.classList.add(this.CssClasses_.IS_UPGRADED)}},s.register({constructor:c,classAsString:"MaterialRadio",cssClass:"mdl-js-radio",widget:!0});var p=function(e){this.element_=e,this.isIE_=window.navigator.msPointerEnabled,this.init()};window.MaterialSlider=p,p.prototype.Constant_={},p.prototype.CssClasses_={IE_CONTAINER:"mdl-slider__ie-container",SLIDER_CONTAINER:"mdl-slider__container",BACKGROUND_FLEX:"mdl-slider__background-flex",BACKGROUND_LOWER:"mdl-slider__background-lower",BACKGROUND_UPPER:"mdl-slider__background-upper",IS_LOWEST_VALUE:"is-lowest-value",IS_UPGRADED:"is-upgraded"},p.prototype.onInput_=function(e){this.updateValueStyles_()},p.prototype.onChange_=function(e){this.updateValueStyles_()},p.prototype.onMouseUp_=function(e){e.target.blur()},p.prototype.onContainerMouseDown_=function(e){if(e.target===this.element_.parentElement){e.preventDefault();var t=new MouseEvent("mousedown",{target:e.target,buttons:e.buttons,clientX:e.clientX,clientY:this.element_.getBoundingClientRect().y});this.element_.dispatchEvent(t)}},p.prototype.updateValueStyles_=function(){var e=(this.element_.value-this.element_.min)/(this.element_.max-this.element_.min);0===e?this.element_.classList.add(this.CssClasses_.IS_LOWEST_VALUE):this.element_.classList.remove(this.CssClasses_.IS_LOWEST_VALUE),this.isIE_||(this.backgroundLower_.style.flex=e,this.backgroundLower_.style.webkitFlex=e,this.backgroundUpper_.style.flex=1-e,this.backgroundUpper_.style.webkitFlex=1-e)},p.prototype.disable=function(){this.element_.disabled=!0},p.prototype.disable=p.prototype.disable,p.prototype.enable=function(){this.element_.disabled=!1},p.prototype.enable=p.prototype.enable,p.prototype.change=function(e){"undefined"!=typeof e&&(this.element_.value=e),this.updateValueStyles_()},p.prototype.change=p.prototype.change,p.prototype.init=function(){if(this.element_){if(this.isIE_){var e=document.createElement("div");e.classList.add(this.CssClasses_.IE_CONTAINER),this.element_.parentElement.insertBefore(e,this.element_),this.element_.parentElement.removeChild(this.element_),e.appendChild(this.element_)}else{var t=document.createElement("div");t.classList.add(this.CssClasses_.SLIDER_CONTAINER),this.element_.parentElement.insertBefore(t,this.element_),this.element_.parentElement.removeChild(this.element_),t.appendChild(this.element_);var s=document.createElement("div");s.classList.add(this.CssClasses_.BACKGROUND_FLEX),t.appendChild(s),this.backgroundLower_=document.createElement("div"),this.backgroundLower_.classList.add(this.CssClasses_.BACKGROUND_LOWER),s.appendChild(this.backgroundLower_),this.backgroundUpper_=document.createElement("div"),this.backgroundUpper_.classList.add(this.CssClasses_.BACKGROUND_UPPER),s.appendChild(this.backgroundUpper_)}this.boundInputHandler=this.onInput_.bind(this),this.boundChangeHandler=this.onChange_.bind(this),this.boundMouseUpHandler=this.onMouseUp_.bind(this),this.boundContainerMouseDownHandler=this.onContainerMouseDown_.bind(this),this.element_.addEventListener("input",this.boundInputHandler),this.element_.addEventListener("change",this.boundChangeHandler),this.element_.addEventListener("mouseup",this.boundMouseUpHandler),this.element_.parentElement.addEventListener("mousedown",this.boundContainerMouseDownHandler),
+this.updateValueStyles_(),this.element_.classList.add(this.CssClasses_.IS_UPGRADED)}},p.prototype.mdlDowngrade_=function(){this.element_.removeEventListener("input",this.boundInputHandler),this.element_.removeEventListener("change",this.boundChangeHandler),this.element_.removeEventListener("mouseup",this.boundMouseUpHandler),this.element_.parentElement.removeEventListener("mousedown",this.boundContainerMouseDownHandler)},s.register({constructor:p,classAsString:"MaterialSlider",cssClass:"mdl-js-slider",widget:!0});var u=function(e){this.element_=e,this.init()};window.MaterialSpinner=u,u.prototype.Constant_={MDL_SPINNER_LAYER_COUNT:4},u.prototype.CssClasses_={MDL_SPINNER_LAYER:"mdl-spinner__layer",MDL_SPINNER_CIRCLE_CLIPPER:"mdl-spinner__circle-clipper",MDL_SPINNER_CIRCLE:"mdl-spinner__circle",MDL_SPINNER_GAP_PATCH:"mdl-spinner__gap-patch",MDL_SPINNER_LEFT:"mdl-spinner__left",MDL_SPINNER_RIGHT:"mdl-spinner__right"},u.prototype.createLayer=function(e){var t=document.createElement("div");t.classList.add(this.CssClasses_.MDL_SPINNER_LAYER),t.classList.add(this.CssClasses_.MDL_SPINNER_LAYER+"-"+e);var s=document.createElement("div");s.classList.add(this.CssClasses_.MDL_SPINNER_CIRCLE_CLIPPER),s.classList.add(this.CssClasses_.MDL_SPINNER_LEFT);var i=document.createElement("div");i.classList.add(this.CssClasses_.MDL_SPINNER_GAP_PATCH);var n=document.createElement("div");n.classList.add(this.CssClasses_.MDL_SPINNER_CIRCLE_CLIPPER),n.classList.add(this.CssClasses_.MDL_SPINNER_RIGHT);for(var a=[s,i,n],l=0;l<a.length;l++){var o=document.createElement("div");o.classList.add(this.CssClasses_.MDL_SPINNER_CIRCLE),a[l].appendChild(o)}t.appendChild(s),t.appendChild(i),t.appendChild(n),this.element_.appendChild(t)},u.prototype.createLayer=u.prototype.createLayer,u.prototype.stop=function(){this.element_.classList.remove("is-active")},u.prototype.stop=u.prototype.stop,u.prototype.start=function(){this.element_.classList.add("is-active")},u.prototype.start=u.prototype.start,u.prototype.init=function(){if(this.element_){for(var e=1;e<=this.Constant_.MDL_SPINNER_LAYER_COUNT;e++)this.createLayer(e);this.element_.classList.add("is-upgraded")}},s.register({constructor:u,classAsString:"MaterialSpinner",cssClass:"mdl-js-spinner",widget:!0});var C=function(e){this.element_=e,this.init()};window.MaterialSwitch=C,C.prototype.Constant_={TINY_TIMEOUT:.001},C.prototype.CssClasses_={INPUT:"mdl-switch__input",TRACK:"mdl-switch__track",THUMB:"mdl-switch__thumb",FOCUS_HELPER:"mdl-switch__focus-helper",RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE_CONTAINER:"mdl-switch__ripple-container",RIPPLE_CENTER:"mdl-ripple--center",RIPPLE:"mdl-ripple",IS_FOCUSED:"is-focused",IS_DISABLED:"is-disabled",IS_CHECKED:"is-checked"},C.prototype.onChange_=function(e){this.updateClasses_()},C.prototype.onFocus_=function(e){this.element_.classList.add(this.CssClasses_.IS_FOCUSED)},C.prototype.onBlur_=function(e){this.element_.classList.remove(this.CssClasses_.IS_FOCUSED)},C.prototype.onMouseUp_=function(e){this.blur_()},C.prototype.updateClasses_=function(){this.checkDisabled(),this.checkToggleState()},C.prototype.blur_=function(){window.setTimeout(function(){this.inputElement_.blur()}.bind(this),this.Constant_.TINY_TIMEOUT)},C.prototype.checkDisabled=function(){this.inputElement_.disabled?this.element_.classList.add(this.CssClasses_.IS_DISABLED):this.element_.classList.remove(this.CssClasses_.IS_DISABLED)},C.prototype.checkDisabled=C.prototype.checkDisabled,C.prototype.checkToggleState=function(){this.inputElement_.checked?this.element_.classList.add(this.CssClasses_.IS_CHECKED):this.element_.classList.remove(this.CssClasses_.IS_CHECKED)},C.prototype.checkToggleState=C.prototype.checkToggleState,C.prototype.disable=function(){this.inputElement_.disabled=!0,this.updateClasses_()},C.prototype.disable=C.prototype.disable,C.prototype.enable=function(){this.inputElement_.disabled=!1,this.updateClasses_()},C.prototype.enable=C.prototype.enable,C.prototype.on=function(){this.inputElement_.checked=!0,this.updateClasses_()},C.prototype.on=C.prototype.on,C.prototype.off=function(){this.inputElement_.checked=!1,this.updateClasses_()},C.prototype.off=C.prototype.off,C.prototype.init=function(){if(this.element_){this.inputElement_=this.element_.querySelector("."+this.CssClasses_.INPUT);var e=document.createElement("div");e.classList.add(this.CssClasses_.TRACK);var t=document.createElement("div");t.classList.add(this.CssClasses_.THUMB);var s=document.createElement("span");if(s.classList.add(this.CssClasses_.FOCUS_HELPER),t.appendChild(s),this.element_.appendChild(e),this.element_.appendChild(t),this.boundMouseUpHandler=this.onMouseUp_.bind(this),this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT)){this.element_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS),this.rippleContainerElement_=document.createElement("span"),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CONTAINER),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_EFFECT),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CENTER),this.rippleContainerElement_.addEventListener("mouseup",this.boundMouseUpHandler);var i=document.createElement("span");i.classList.add(this.CssClasses_.RIPPLE),this.rippleContainerElement_.appendChild(i),this.element_.appendChild(this.rippleContainerElement_)}this.boundChangeHandler=this.onChange_.bind(this),this.boundFocusHandler=this.onFocus_.bind(this),this.boundBlurHandler=this.onBlur_.bind(this),this.inputElement_.addEventListener("change",this.boundChangeHandler),this.inputElement_.addEventListener("focus",this.boundFocusHandler),this.inputElement_.addEventListener("blur",this.boundBlurHandler),this.element_.addEventListener("mouseup",this.boundMouseUpHandler),this.updateClasses_(),this.element_.classList.add("is-upgraded")}},C.prototype.mdlDowngrade_=function(){this.rippleContainerElement_&&this.rippleContainerElement_.removeEventListener("mouseup",this.boundMouseUpHandler),this.inputElement_.removeEventListener("change",this.boundChangeHandler),this.inputElement_.removeEventListener("focus",this.boundFocusHandler),this.inputElement_.removeEventListener("blur",this.boundBlurHandler),this.element_.removeEventListener("mouseup",this.boundMouseUpHandler)},s.register({constructor:C,classAsString:"MaterialSwitch",cssClass:"mdl-js-switch",widget:!0});var m=function(e){this.element_=e,this.init()};window.MaterialTabs=m,m.prototype.Constant_={},m.prototype.CssClasses_={TAB_CLASS:"mdl-tabs__tab",PANEL_CLASS:"mdl-tabs__panel",ACTIVE_CLASS:"is-active",UPGRADED_CLASS:"is-upgraded",MDL_JS_RIPPLE_EFFECT:"mdl-js-ripple-effect",MDL_RIPPLE_CONTAINER:"mdl-tabs__ripple-container",MDL_RIPPLE:"mdl-ripple",MDL_JS_RIPPLE_EFFECT_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events"},m.prototype.initTabs_=function(){this.element_.classList.contains(this.CssClasses_.MDL_JS_RIPPLE_EFFECT)&&this.element_.classList.add(this.CssClasses_.MDL_JS_RIPPLE_EFFECT_IGNORE_EVENTS),this.tabs_=this.element_.querySelectorAll("."+this.CssClasses_.TAB_CLASS),this.panels_=this.element_.querySelectorAll("."+this.CssClasses_.PANEL_CLASS);for(var t=0;t<this.tabs_.length;t++)new e(this.tabs_[t],this);this.element_.classList.add(this.CssClasses_.UPGRADED_CLASS)},m.prototype.resetTabState_=function(){for(var e=0;e<this.tabs_.length;e++)this.tabs_[e].classList.remove(this.CssClasses_.ACTIVE_CLASS)},m.prototype.resetPanelState_=function(){for(var e=0;e<this.panels_.length;e++)this.panels_[e].classList.remove(this.CssClasses_.ACTIVE_CLASS)},m.prototype.init=function(){this.element_&&this.initTabs_()},s.register({constructor:m,classAsString:"MaterialTabs",cssClass:"mdl-js-tabs"});var E=function(e){this.element_=e,this.maxRows=this.Constant_.NO_MAX_ROWS,this.init()};window.MaterialTextfield=E,E.prototype.Constant_={NO_MAX_ROWS:-1,MAX_ROWS_ATTRIBUTE:"maxrows"},E.prototype.CssClasses_={LABEL:"mdl-textfield__label",INPUT:"mdl-textfield__input",IS_DIRTY:"is-dirty",IS_FOCUSED:"is-focused",IS_DISABLED:"is-disabled",IS_INVALID:"is-invalid",IS_UPGRADED:"is-upgraded"},E.prototype.onKeyDown_=function(e){var t=e.target.value.split("\n").length;13===e.keyCode&&t>=this.maxRows&&e.preventDefault()},E.prototype.onFocus_=function(e){this.element_.classList.add(this.CssClasses_.IS_FOCUSED)},E.prototype.onBlur_=function(e){this.element_.classList.remove(this.CssClasses_.IS_FOCUSED)},E.prototype.updateClasses_=function(){this.checkDisabled(),this.checkValidity(),this.checkDirty()},E.prototype.checkDisabled=function(){this.input_.disabled?this.element_.classList.add(this.CssClasses_.IS_DISABLED):this.element_.classList.remove(this.CssClasses_.IS_DISABLED)},E.prototype.checkDisabled=E.prototype.checkDisabled,E.prototype.checkValidity=function(){this.input_.validity.valid?this.element_.classList.remove(this.CssClasses_.IS_INVALID):this.element_.classList.add(this.CssClasses_.IS_INVALID)},E.prototype.checkValidity=E.prototype.checkValidity,E.prototype.checkDirty=function(){this.input_.value&&this.input_.value.length>0?this.element_.classList.add(this.CssClasses_.IS_DIRTY):this.element_.classList.remove(this.CssClasses_.IS_DIRTY)},E.prototype.checkDirty=E.prototype.checkDirty,E.prototype.disable=function(){this.input_.disabled=!0,this.updateClasses_()},E.prototype.disable=E.prototype.disable,E.prototype.enable=function(){this.input_.disabled=!1,this.updateClasses_()},E.prototype.enable=E.prototype.enable,E.prototype.change=function(e){e?this.input_.value=e:this.input_.value="",this.updateClasses_()},E.prototype.change=E.prototype.change,E.prototype.init=function(){this.element_&&(this.label_=this.element_.querySelector("."+this.CssClasses_.LABEL),this.input_=this.element_.querySelector("."+this.CssClasses_.INPUT),this.input_&&(this.input_.hasAttribute(this.Constant_.MAX_ROWS_ATTRIBUTE)&&(this.maxRows=parseInt(this.input_.getAttribute(this.Constant_.MAX_ROWS_ATTRIBUTE),10),isNaN(this.maxRows)&&(this.maxRows=this.Constant_.NO_MAX_ROWS)),this.boundUpdateClassesHandler=this.updateClasses_.bind(this),this.boundFocusHandler=this.onFocus_.bind(this),this.boundBlurHandler=this.onBlur_.bind(this),this.input_.addEventListener("input",this.boundUpdateClassesHandler),this.input_.addEventListener("focus",this.boundFocusHandler),this.input_.addEventListener("blur",this.boundBlurHandler),this.maxRows!==this.Constant_.NO_MAX_ROWS&&(this.boundKeyDownHandler=this.onKeyDown_.bind(this),this.input_.addEventListener("keydown",this.boundKeyDownHandler)),this.updateClasses_(),this.element_.classList.add(this.CssClasses_.IS_UPGRADED)))},E.prototype.mdlDowngrade_=function(){this.input_.removeEventListener("input",this.boundUpdateClassesHandler),this.input_.removeEventListener("focus",this.boundFocusHandler),this.input_.removeEventListener("blur",this.boundBlurHandler),this.boundKeyDownHandler&&this.input_.removeEventListener("keydown",this.boundKeyDownHandler)},s.register({constructor:E,classAsString:"MaterialTextfield",cssClass:"mdl-js-textfield",widget:!0});var L=function(e){this.element_=e,this.init()};window.MaterialTooltip=L,L.prototype.Constant_={},L.prototype.CssClasses_={IS_ACTIVE:"is-active"},L.prototype.handleMouseEnter_=function(e){e.stopPropagation();var t=e.target.getBoundingClientRect(),s=t.left+t.width/2,i=-1*(this.element_.offsetWidth/2);0>s+i?(this.element_.style.left=0,this.element_.style.marginLeft=0):(this.element_.style.left=s+"px",this.element_.style.marginLeft=i+"px"),this.element_.style.top=t.top+t.height+10+"px",this.element_.classList.add(this.CssClasses_.IS_ACTIVE),window.addEventListener("scroll",this.boundMouseLeaveHandler,!1),window.addEventListener("touchmove",this.boundMouseLeaveHandler,!1)},L.prototype.handleMouseLeave_=function(e){e.stopPropagation(),this.element_.classList.remove(this.CssClasses_.IS_ACTIVE),window.removeEventListener("scroll",this.boundMouseLeaveHandler),window.removeEventListener("touchmove",this.boundMouseLeaveHandler,!1)},L.prototype.init=function(){if(this.element_){var e=this.element_.getAttribute("for");e&&(this.forElement_=document.getElementById(e)),this.forElement_&&(this.forElement_.getAttribute("tabindex")||this.forElement_.setAttribute("tabindex","0"),this.boundMouseEnterHandler=this.handleMouseEnter_.bind(this),this.boundMouseLeaveHandler=this.handleMouseLeave_.bind(this),this.forElement_.addEventListener("mouseenter",this.boundMouseEnterHandler,!1),this.forElement_.addEventListener("click",this.boundMouseEnterHandler,!1),this.forElement_.addEventListener("blur",this.boundMouseLeaveHandler),this.forElement_.addEventListener("touchstart",this.boundMouseEnterHandler,!1),this.forElement_.addEventListener("mouseleave",this.boundMouseLeaveHandler))}},L.prototype.mdlDowngrade_=function(){this.forElement_&&(this.forElement_.removeEventListener("mouseenter",this.boundMouseEnterHandler,!1),this.forElement_.removeEventListener("click",this.boundMouseEnterHandler,!1),this.forElement_.removeEventListener("touchstart",this.boundMouseEnterHandler,!1),this.forElement_.removeEventListener("mouseleave",this.boundMouseLeaveHandler))},s.register({constructor:L,classAsString:"MaterialTooltip",cssClass:"mdl-tooltip"});var I=function(e){this.element_=e,this.init()};window.MaterialLayout=I,I.prototype.Constant_={MAX_WIDTH:"(max-width: 1024px)",TAB_SCROLL_PIXELS:100,MENU_ICON:"menu",CHEVRON_LEFT:"chevron_left",CHEVRON_RIGHT:"chevron_right"},I.prototype.Mode_={STANDARD:0,SEAMED:1,WATERFALL:2,SCROLL:3},I.prototype.CssClasses_={CONTAINER:"mdl-layout__container",HEADER:"mdl-layout__header",DRAWER:"mdl-layout__drawer",CONTENT:"mdl-layout__content",DRAWER_BTN:"mdl-layout__drawer-button",ICON:"material-icons",JS_RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_CONTAINER:"mdl-layout__tab-ripple-container",RIPPLE:"mdl-ripple",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",HEADER_SEAMED:"mdl-layout__header--seamed",HEADER_WATERFALL:"mdl-layout__header--waterfall",HEADER_SCROLL:"mdl-layout__header--scroll",FIXED_HEADER:"mdl-layout--fixed-header",OBFUSCATOR:"mdl-layout__obfuscator",TAB_BAR:"mdl-layout__tab-bar",TAB_CONTAINER:"mdl-layout__tab-bar-container",TAB:"mdl-layout__tab",TAB_BAR_BUTTON:"mdl-layout__tab-bar-button",TAB_BAR_LEFT_BUTTON:"mdl-layout__tab-bar-left-button",TAB_BAR_RIGHT_BUTTON:"mdl-layout__tab-bar-right-button",PANEL:"mdl-layout__tab-panel",HAS_DRAWER:"has-drawer",HAS_TABS:"has-tabs",HAS_SCROLLING_HEADER:"has-scrolling-header",CASTING_SHADOW:"is-casting-shadow",IS_COMPACT:"is-compact",IS_SMALL_SCREEN:"is-small-screen",IS_DRAWER_OPEN:"is-visible",IS_ACTIVE:"is-active",IS_UPGRADED:"is-upgraded",IS_ANIMATING:"is-animating",ON_LARGE_SCREEN:"mdl-layout--large-screen-only",ON_SMALL_SCREEN:"mdl-layout--small-screen-only"},I.prototype.contentScrollHandler_=function(){this.header_.classList.contains(this.CssClasses_.IS_ANIMATING)||(this.content_.scrollTop>0&&!this.header_.classList.contains(this.CssClasses_.IS_COMPACT)?(this.header_.classList.add(this.CssClasses_.CASTING_SHADOW),this.header_.classList.add(this.CssClasses_.IS_COMPACT),this.header_.classList.add(this.CssClasses_.IS_ANIMATING)):this.content_.scrollTop<=0&&this.header_.classList.contains(this.CssClasses_.IS_COMPACT)&&(this.header_.classList.remove(this.CssClasses_.CASTING_SHADOW),this.header_.classList.remove(this.CssClasses_.IS_COMPACT),this.header_.classList.add(this.CssClasses_.IS_ANIMATING)))},I.prototype.screenSizeHandler_=function(){this.screenSizeMediaQuery_.matches?this.element_.classList.add(this.CssClasses_.IS_SMALL_SCREEN):(this.element_.classList.remove(this.CssClasses_.IS_SMALL_SCREEN),this.drawer_&&this.drawer_.classList.remove(this.CssClasses_.IS_DRAWER_OPEN))},I.prototype.drawerToggleHandler_=function(){this.drawer_.classList.toggle(this.CssClasses_.IS_DRAWER_OPEN)},I.prototype.headerTransitionEndHandler_=function(){this.header_.classList.remove(this.CssClasses_.IS_ANIMATING)},I.prototype.headerClickHandler_=function(){this.header_.classList.contains(this.CssClasses_.IS_COMPACT)&&(this.header_.classList.remove(this.CssClasses_.IS_COMPACT),this.header_.classList.add(this.CssClasses_.IS_ANIMATING))},I.prototype.resetTabState_=function(e){for(var t=0;t<e.length;t++)e[t].classList.remove(this.CssClasses_.IS_ACTIVE)},I.prototype.resetPanelState_=function(e){for(var t=0;t<e.length;t++)e[t].classList.remove(this.CssClasses_.IS_ACTIVE)},I.prototype.init=function(){if(this.element_){var e=document.createElement("div");e.classList.add(this.CssClasses_.CONTAINER),this.element_.parentElement.insertBefore(e,this.element_),this.element_.parentElement.removeChild(this.element_),e.appendChild(this.element_);for(var s=this.element_.childNodes,i=0;i<s.length;i++){var n=s[i];n.classList&&n.classList.contains(this.CssClasses_.HEADER)&&(this.header_=n),n.classList&&n.classList.contains(this.CssClasses_.DRAWER)&&(this.drawer_=n),n.classList&&n.classList.contains(this.CssClasses_.CONTENT)&&(this.content_=n)}this.header_&&(this.tabBar_=this.header_.querySelector("."+this.CssClasses_.TAB_BAR));var a=this.Mode_.STANDARD;this.screenSizeMediaQuery_=window.matchMedia(this.Constant_.MAX_WIDTH),this.screenSizeMediaQuery_.addListener(this.screenSizeHandler_.bind(this)),this.screenSizeHandler_(),this.header_&&(this.header_.classList.contains(this.CssClasses_.HEADER_SEAMED)?a=this.Mode_.SEAMED:this.header_.classList.contains(this.CssClasses_.HEADER_WATERFALL)?(a=this.Mode_.WATERFALL,this.header_.addEventListener("transitionend",this.headerTransitionEndHandler_.bind(this)),this.header_.addEventListener("click",this.headerClickHandler_.bind(this))):this.header_.classList.contains(this.CssClasses_.HEADER_SCROLL)&&(a=this.Mode_.SCROLL,e.classList.add(this.CssClasses_.HAS_SCROLLING_HEADER)),a===this.Mode_.STANDARD?(this.header_.classList.add(this.CssClasses_.CASTING_SHADOW),this.tabBar_&&this.tabBar_.classList.add(this.CssClasses_.CASTING_SHADOW)):a===this.Mode_.SEAMED||a===this.Mode_.SCROLL?(this.header_.classList.remove(this.CssClasses_.CASTING_SHADOW),this.tabBar_&&this.tabBar_.classList.remove(this.CssClasses_.CASTING_SHADOW)):a===this.Mode_.WATERFALL&&(this.content_.addEventListener("scroll",this.contentScrollHandler_.bind(this)),this.contentScrollHandler_()));var l=function(e){e.preventDefault()};if(this.drawer_){var o=this.element_.querySelector("."+this.CssClasses_.DRAWER_BTN);if("undefined"==typeof o||null===o){o=document.createElement("div"),o.classList.add(this.CssClasses_.DRAWER_BTN);var r=document.createElement("i");r.classList.add(this.CssClasses_.ICON),r.textContent=this.Constant_.MENU_ICON,o.appendChild(r)}this.drawer_.classList.contains(this.CssClasses_.ON_LARGE_SCREEN)?o.classList.add(this.CssClasses_.ON_LARGE_SCREEN):this.drawer_.classList.contains(this.CssClasses_.ON_SMALL_SCREEN)&&o.classList.add(this.CssClasses_.ON_SMALL_SCREEN),o.addEventListener("click",this.drawerToggleHandler_.bind(this)),this.element_.classList.add(this.CssClasses_.HAS_DRAWER),this.drawer_.addEventListener("mousewheel",l),this.element_.classList.contains(this.CssClasses_.FIXED_HEADER)?this.header_.insertBefore(o,this.header_.firstChild):this.element_.insertBefore(o,this.content_);var d=document.createElement("div");d.classList.add(this.CssClasses_.OBFUSCATOR),this.element_.appendChild(d),d.addEventListener("click",this.drawerToggleHandler_.bind(this)),d.addEventListener("mousewheel",l)}if(this.header_&&this.tabBar_){this.element_.classList.add(this.CssClasses_.HAS_TABS);var _=document.createElement("div");_.classList.add(this.CssClasses_.TAB_CONTAINER),this.header_.insertBefore(_,this.tabBar_),this.header_.removeChild(this.tabBar_);var h=document.createElement("div");h.classList.add(this.CssClasses_.TAB_BAR_BUTTON),h.classList.add(this.CssClasses_.TAB_BAR_LEFT_BUTTON);var c=document.createElement("i");c.classList.add(this.CssClasses_.ICON),c.textContent=this.Constant_.CHEVRON_LEFT,h.appendChild(c),h.addEventListener("click",function(){this.tabBar_.scrollLeft-=this.Constant_.TAB_SCROLL_PIXELS}.bind(this));var p=document.createElement("div");p.classList.add(this.CssClasses_.TAB_BAR_BUTTON),p.classList.add(this.CssClasses_.TAB_BAR_RIGHT_BUTTON);var u=document.createElement("i");u.classList.add(this.CssClasses_.ICON),u.textContent=this.Constant_.CHEVRON_RIGHT,p.appendChild(u),p.addEventListener("click",function(){this.tabBar_.scrollLeft+=this.Constant_.TAB_SCROLL_PIXELS}.bind(this)),_.appendChild(h),_.appendChild(this.tabBar_),_.appendChild(p);var C=function(){this.tabBar_.scrollLeft>0?h.classList.add(this.CssClasses_.IS_ACTIVE):h.classList.remove(this.CssClasses_.IS_ACTIVE),this.tabBar_.scrollLeft<this.tabBar_.scrollWidth-this.tabBar_.offsetWidth?p.classList.add(this.CssClasses_.IS_ACTIVE):p.classList.remove(this.CssClasses_.IS_ACTIVE)}.bind(this);this.tabBar_.addEventListener("scroll",C),C(),this.tabBar_.classList.contains(this.CssClasses_.JS_RIPPLE_EFFECT)&&this.tabBar_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS);for(var m=this.tabBar_.querySelectorAll("."+this.CssClasses_.TAB),E=this.content_.querySelectorAll("."+this.CssClasses_.PANEL),L=0;L<m.length;L++)new t(m[L],m,E,this)}this.element_.classList.add(this.CssClasses_.IS_UPGRADED)}},s.register({constructor:I,classAsString:"MaterialLayout",cssClass:"mdl-js-layout"});var f=function(e){this.element_=e,this.init()};window.MaterialDataTable=f,f.prototype.Constant_={},f.prototype.CssClasses_={DATA_TABLE:"mdl-data-table",SELECTABLE:"mdl-data-table--selectable",IS_SELECTED:"is-selected",IS_UPGRADED:"is-upgraded"},f.prototype.selectRow_=function(e,t,s){return t?function(){e.checked?t.classList.add(this.CssClasses_.IS_SELECTED):t.classList.remove(this.CssClasses_.IS_SELECTED)}.bind(this):s?function(){var t,i;if(e.checked)for(t=0;t<s.length;t++)i=s[t].querySelector("td").querySelector(".mdl-checkbox"),i.MaterialCheckbox.check(),s[t].classList.add(this.CssClasses_.IS_SELECTED);else for(t=0;t<s.length;t++)i=s[t].querySelector("td").querySelector(".mdl-checkbox"),i.MaterialCheckbox.uncheck(),s[t].classList.remove(this.CssClasses_.IS_SELECTED)}.bind(this):void 0},f.prototype.createCheckbox_=function(e,t){var i=document.createElement("label");i.classList.add("mdl-checkbox"),i.classList.add("mdl-js-checkbox"),i.classList.add("mdl-js-ripple-effect"),i.classList.add("mdl-data-table__select");var n=document.createElement("input");return n.type="checkbox",n.classList.add("mdl-checkbox__input"),e?n.addEventListener("change",this.selectRow_(n,e)):t&&n.addEventListener("change",this.selectRow_(n,null,t)),i.appendChild(n),s.upgradeElement(i,"MaterialCheckbox"),i},f.prototype.init=function(){if(this.element_){var e=this.element_.querySelector("th"),t=this.element_.querySelector("tbody").querySelectorAll("tr");if(this.element_.classList.contains(this.CssClasses_.SELECTABLE)){var s=document.createElement("th"),i=this.createCheckbox_(null,t);s.appendChild(i),e.parentElement.insertBefore(s,e);for(var n=0;n<t.length;n++){var a=t[n].querySelector("td");if(a){var l=document.createElement("td"),o=this.createCheckbox_(t[n]);l.appendChild(o),t[n].insertBefore(l,a)}}}this.element_.classList.add(this.CssClasses_.IS_UPGRADED)}},s.register({constructor:f,classAsString:"MaterialDataTable",cssClass:"mdl-js-data-table"});var b=function(e){this.element_=e,this.init()};window.MaterialRipple=b,b.prototype.Constant_={INITIAL_SCALE:"scale(0.0001, 0.0001)",INITIAL_SIZE:"1px",INITIAL_OPACITY:"0.4",FINAL_OPACITY:"0",FINAL_SCALE:""},b.prototype.CssClasses_={RIPPLE_CENTER:"mdl-ripple--center",RIPPLE_EFFECT_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE:"mdl-ripple",IS_ANIMATING:"is-animating",IS_VISIBLE:"is-visible"},b.prototype.downHandler_=function(e){if(!this.rippleElement_.style.width&&!this.rippleElement_.style.height){var t=this.element_.getBoundingClientRect();this.boundHeight=t.height,this.boundWidth=t.width,this.rippleSize_=2*Math.sqrt(t.width*t.width+t.height*t.height)+2,this.rippleElement_.style.width=this.rippleSize_+"px",this.rippleElement_.style.height=this.rippleSize_+"px"}if(this.rippleElement_.classList.add(this.CssClasses_.IS_VISIBLE),"mousedown"===e.type&&this.ignoringMouseDown_)this.ignoringMouseDown_=!1;else{"touchstart"===e.type&&(this.ignoringMouseDown_=!0);var s=this.getFrameCount();if(s>0)return;this.setFrameCount(1);var i,n,a=e.currentTarget.getBoundingClientRect();if(0===e.clientX&&0===e.clientY)i=Math.round(a.width/2),n=Math.round(a.height/2);else{var l=e.clientX?e.clientX:e.touches[0].clientX,o=e.clientY?e.clientY:e.touches[0].clientY;i=Math.round(l-a.left),n=Math.round(o-a.top)}this.setRippleXY(i,n),this.setRippleStyles(!0),window.requestAnimationFrame(this.animFrameHandler.bind(this))}},b.prototype.upHandler_=function(e){e&&2!==e.detail&&this.rippleElement_.classList.remove(this.CssClasses_.IS_VISIBLE),window.setTimeout(function(){this.rippleElement_.classList.remove(this.CssClasses_.IS_VISIBLE)}.bind(this),0)},b.prototype.init=function(){if(this.element_){var e=this.element_.classList.contains(this.CssClasses_.RIPPLE_CENTER);this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT_IGNORE_EVENTS)||(this.rippleElement_=this.element_.querySelector("."+this.CssClasses_.RIPPLE),this.frameCount_=0,this.rippleSize_=0,this.x_=0,this.y_=0,this.ignoringMouseDown_=!1,this.boundDownHandler=this.downHandler_.bind(this),this.element_.addEventListener("mousedown",this.boundDownHandler),this.element_.addEventListener("touchstart",this.boundDownHandler),this.boundUpHandler=this.upHandler_.bind(this),this.element_.addEventListener("mouseup",this.boundUpHandler),this.element_.addEventListener("mouseleave",this.boundUpHandler),this.element_.addEventListener("touchend",this.boundUpHandler),this.element_.addEventListener("blur",this.boundUpHandler),this.getFrameCount=function(){return this.frameCount_},this.setFrameCount=function(e){this.frameCount_=e},this.getRippleElement=function(){return this.rippleElement_},this.setRippleXY=function(e,t){this.x_=e,this.y_=t},this.setRippleStyles=function(t){if(null!==this.rippleElement_){var s,i,n,a="translate("+this.x_+"px, "+this.y_+"px)";t?(i=this.Constant_.INITIAL_SCALE,n=this.Constant_.INITIAL_SIZE):(i=this.Constant_.FINAL_SCALE,n=this.rippleSize_+"px",e&&(a="translate("+this.boundWidth/2+"px, "+this.boundHeight/2+"px)")),s="translate(-50%, -50%) "+a+i,this.rippleElement_.style.webkitTransform=s,this.rippleElement_.style.msTransform=s,this.rippleElement_.style.transform=s,t?this.rippleElement_.classList.remove(this.CssClasses_.IS_ANIMATING):this.rippleElement_.classList.add(this.CssClasses_.IS_ANIMATING)}},this.animFrameHandler=function(){this.frameCount_-->0?window.requestAnimationFrame(this.animFrameHandler.bind(this)):this.setRippleStyles(!1)})}},b.prototype.mdlDowngrade_=function(){this.element_.removeEventListener("mousedown",this.boundDownHandler),this.element_.removeEventListener("touchstart",this.boundDownHandler),this.element_.removeEventListener("mouseup",this.boundUpHandler),this.element_.removeEventListener("mouseleave",this.boundUpHandler),this.element_.removeEventListener("touchend",this.boundUpHandler),this.element_.removeEventListener("blur",this.boundUpHandler)},s.register({constructor:b,classAsString:"MaterialRipple",cssClass:"mdl-js-ripple-effect",widget:!1})}();
+//# sourceMappingURL=material.min.js.map
diff --git a/themes/material/script.js b/themes/material/script.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/themes/material/script0.js b/themes/material/script0.js
new file mode 100644
index 000000000..1fd32cd83
--- /dev/null
+++ b/themes/material/script0.js
@@ -0,0 +1,95 @@
+$(function(){
+  $( "#layout-top" ).click(function() {
+    leftAddFullSize("top");
+  });
+
+  $( "#layout-right" ).click(function() {
+    leftAddSideSize("right");
+  });
+
+  $( "#layout-bottom" ).click(function() {
+    leftAddFullSize("bottom");
+  });
+
+  $( "#layout-left" ).click(function() {
+    leftAddSideSize("left");
+  });
+
+  function leftAddSideSize(layout_type){
+    $("#left-block").removeClass (function (index, css) {
+        return (css.match (/(^|\s)mdl-cell--\S+/g) || []).join(' ');
+    }).addClass("mdl-cell--4-col mdl-cell--8-col-tablet mdl-cell--4-col-phone");
+
+    $(".left-blocks").removeClass (function (index, css) {
+        return (css.match (/(^|\s)mdl-cell--\S+/g) || []).join(' ');
+    }).addClass("mdl-cell--12-col mdl-cell--4-col-tablet");
+
+    $("#main-block").removeClass (function (index, css) {
+        return (css.match (/(^|\s)mdl-cell--\S+/g) || []).join(' ');
+    }).addClass("mdl-cell--8-col mdl-cell--8-col-tablet");
+
+    if(layout_type == "right"){
+      $("#left-block").appendTo("#main-grid")
+    } else {
+      $("#left-block").prependTo("#main-grid")
+    }
+  	$.cookie("ui-layout-type", layout_type, {path: '/', expires: 365});
+    zoom("width");
+  }
+
+  function leftAddFullSize(layout_type){
+    $("#left-block").removeClass (function (index, css) {
+        return (css.match (/(^|\s)mdl-cell--\S+/g) || []).join(' ');
+    }).addClass("mdl-cell--12-col");
+
+    $(".left-blocks").removeClass (function (index, css) {
+        return (css.match (/(^|\s)mdl-cell--\S+/g) || []).join(' ');
+    }).addClass("mdl-cell--4-col");
+
+    $("#main-block").removeClass (function (index, css) {
+        return (css.match (/(^|\s)mdl-cell--\S+/g) || []).join(' ');
+    }).addClass("mdl-cell--12-col");
+
+    if(layout_type == "bottom"){
+      $("#left-block").appendTo("#main-grid")
+    } else {
+      $("#left-block").prependTo("#main-grid")
+    }
+  	$.cookie("ui-layout-type", layout_type, {path: '/', expires: 365});
+    zoom("width");
+  }
+  current_layout = $.cookie("layout-type");
+  if (current_layout != null) {
+    if(current_layout =="top" || current_layout == "bottom"){
+      leftAddFullSize(current_layout);
+    } else {
+      leftAddSideSize(current_layout);
+    }
+  }
+  $('#main-block, #left-block').show();
+});
+
+
+function zoom(zoom_type) {
+	var img = $('.shm-main-image');
+	if(zoom_type == "full") {
+		img.css('max-width', img.data('width') + 'px');
+		img.css('max-height', img.data('height') + 'px');
+	}
+	if(zoom_type == "width") {
+		img.css('max-width', ($( "#main-block" ).width()) + 'px');
+		img.css('max-height', img.data('height') + 'px');
+	}
+	if(zoom_type == "height") {
+		img.css('max-width', img.data('width') + 'px');
+		img.css('max-height', (window.innerHeight * 0.95) + 'px');
+	}
+	if(zoom_type == "both") {
+		img.css('max-width', '95%');
+		img.css('max-height', (window.innerHeight * 0.95) + 'px');
+	}
+
+	$(".shm-zoomer").val(zoom_type);
+
+	$.cookie("ui-image-zoom", zoom_type, {path: '/', expires: 365});
+}
diff --git a/themes/material/style.css b/themes/material/style.css
new file mode 100644
index 000000000..d3aa59d74
--- /dev/null
+++ b/themes/material/style.css
@@ -0,0 +1,3 @@
+.nav-card{
+  min-height: 3em;
+}
diff --git a/themes/material/themelet.class.php b/themes/material/themelet.class.php
new file mode 100644
index 000000000..77c927c32
--- /dev/null
+++ b/themes/material/themelet.class.php
@@ -0,0 +1,3 @@
+<?php
+class Themelet extends BaseThemelet {}
+
diff --git a/themes/material/upload.theme.php b/themes/material/upload.theme.php
new file mode 100644
index 000000000..871706a8e
--- /dev/null
+++ b/themes/material/upload.theme.php
@@ -0,0 +1,11 @@
+<?php
+
+class CustomUploadTheme extends UploadTheme {
+	// public function display_block(Page $page) {
+	// 	$page->add_block(new Block("Upload", $this->build_upload_block(), "left", 20));
+	// }
+  //
+	// public function display_full(Page $page) {
+	// 	$page->add_block(new Block("Upload", "Disk nearly full, uploads disabled", "left", 20));
+	// }
+}
diff --git a/themes/material/user.theme.php b/themes/material/user.theme.php
new file mode 100644
index 000000000..ab4018018
--- /dev/null
+++ b/themes/material/user.theme.php
@@ -0,0 +1,29 @@
+<?php
+
+class CustomUserPageTheme extends UserPageTheme {
+	public function display_user_block(Page $page, User $user, $parts) {
+		$h_name = html_escape($user->name);
+		$html = " | ";
+		foreach($parts as $part) {
+			$html .= "<a href='{$part["link"]}'>{$part["name"]}</a> | ";
+		}
+		$page->add_block(new Block("Logged in as $h_name", $html, "drawer", 90));
+	}
+
+	public function display_login_block(Page $page) {
+		global $config;
+		$html = "
+			<form action='".make_link("user_admin/login")."' method='POST'>
+			<table summary='Login Form' align='center'>
+			<tr><td width='70'>Name</td><td width='70'><input type='text' name='user'></td></tr>
+			<tr><td>Password</td><td><input type='password' name='pass'></td></tr>
+			<tr><td colspan='2'><input type='submit' name='gobu' value='Log In'></td></tr>
+			</table>
+			</form>
+		";
+		if($config->get_bool("login_signup_enabled")) {
+			$html .= "<small><a href='".make_link("user_admin/create")."'>Create Account</a></small>";
+		}
+		$page->add_block(new Block("Login", $html, "head", 90));
+	}
+}
diff --git a/themes/material/view.theme.php b/themes/material/view.theme.php
new file mode 100644
index 000000000..8b243e6a9
--- /dev/null
+++ b/themes/material/view.theme.php
@@ -0,0 +1,82 @@
+<?php
+
+class CustomViewImageTheme extends ViewImageTheme {
+
+
+	/*
+	 * Build a page showing $image and some info about it
+	 */
+	public function display_page(Image $image, $editor_parts) {
+		global $page;
+
+		$h_metatags = str_replace(" ", ", ", html_escape($image->get_tag_list()));
+
+		$page->set_title("Image {$image->id}: ".html_escape($image->get_tag_list()));
+		$page->add_html_header("<meta name=\"keywords\" content=\"$h_metatags\">");
+		$page->add_html_header("<meta property=\"og:title\" content=\"$h_metatags\">");
+		$page->add_html_header("<meta property=\"og:type\" content=\"article\">");
+		$page->add_html_header("<meta property=\"og:image\" content=\"".make_http($image->get_thumb_link())."\">");
+		$page->add_html_header("<meta property=\"og:url\" content=\"".make_http(make_link("post/view/{$image->id}"))."\">");
+		$page->set_heading(html_escape($image->get_tag_list()));
+		$page->add_block(new Block(null, $this->build_pin($image), "subtoolbar", 0));
+		$page->add_block(new Block(null, $this->build_info($image, $editor_parts), "left", 20));
+	}
+
+	public function display_admin_block(Page $page, $parts) {
+		if(count($parts) > 0) {
+			$page->add_block(new Block("Image Controls", join("<br>", $parts), "drawer", 50));
+		}
+	}
+
+	protected function build_pin(Image $image) {
+
+  		global $database;
+
+  		if(isset($_GET['search'])) {
+  			$search_terms = explode(' ', $_GET['search']);
+  			$query = "search=".url_escape($_GET['search']);
+  		}
+  		else {
+  			$search_terms = array();
+  			$query = null;
+  		}
+
+    $h_prev = '<a id="prevlink" class="mdl-navigation__link mdl-js-ripple-effect" href="'.make_link("post/prev/{$image->id}", $query).'">Prev</a>';
+		$h_index = "<a class='mdl-navigation__link mdl-js-ripple-effect' href='".make_link()."'>Current</a>";
+    $h_next = '<a id="nextlink" class="mdl-navigation__link mdl-js-ripple-effect" href="'.make_link("post/next/{$image->id}", $query).'">Next</a>';
+
+		return $h_prev.$h_index.$h_next;
+	}
+
+
+  	protected function build_info(Image $image, $editor_parts) {
+  		global $user;
+
+  		if(count($editor_parts) == 0) return ($image->is_locked() ? "<br>[Image Locked]" : "");
+
+  		$html = make_form(make_link("post/set"))."
+  					<input type='hidden' name='image_id' value='{$image->id}'>
+  					<table style='' class='image_info form'>
+  		";
+  		foreach($editor_parts as $part) {
+  			$html .= $part;
+  		}
+  		if(
+  			(!$image->is_locked() || $user->can("edit_image_lock")) &&
+  			$user->can("edit_image_tag")
+  		) {
+  			$html .= "
+  						<tr><td colspan='4'>
+  							<input class='view' type='button' value='Edit' onclick='$(\".view\").hide(); $(\".edit\").show();'>
+  							<input class='edit' type='submit' value='Set'>
+  						</td></tr>
+  			";
+  		}
+  		$html .= "
+  					</table>
+  				</form>
+  		";
+  		return $html;
+  	}
+
+}

From 4af1199ff39a52ab3f3a8e6e0d1339fe9118e713 Mon Sep 17 00:00:00 2001
From: William Crandell <william@crandell.ws>
Date: Mon, 26 Oct 2015 09:10:32 -0400
Subject: [PATCH 012/250] Hotfix flash message

  maybe other issues not sure
---
 themes/material/layout.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/themes/material/layout.class.php b/themes/material/layout.class.php
index e8da63d67..defac581e 100644
--- a/themes/material/layout.class.php
+++ b/themes/material/layout.class.php
@@ -95,11 +95,10 @@ public function display_page(Page $page) {
 		}
 		*/
 
-		$flash = get_prefixed_cookie("flash_message");
+    $flash = $page->get_cookie("flash_message");
 		$flash_html = "";
 		if($flash) {
 			$flash_html = "<b id='flash'>".nl2br(html_escape($flash))." <a href='#' onclick=\"\$('#flash').hide(); return false;\">[X]</a></b>";
-			set_prefixed_cookie("flash_message", "", -1, "/");
 		}
 
 		print <<<EOD

From b7114a142eabacb3674642f2dbcc49675eaebacc Mon Sep 17 00:00:00 2001
From: William Crandell <william@crandell.ws>
Date: Mon, 26 Oct 2015 09:20:09 -0400
Subject: [PATCH 013/250] Hotfix for better block id character filtering

---
 core/block.class.php             |  5 ++---
 ext/blotter/theme.php            | 11 +++++------
 themes/material/layout.class.php |  3 +--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/core/block.class.php b/core/block.class.php
index afdb23db7..1fbe0e3f8 100644
--- a/core/block.class.php
+++ b/core/block.class.php
@@ -20,7 +20,7 @@ class Block {
 	 */
 	public $body;
 
-	/** 
+	/**
 	 * Where the block should be placed. The default theme supports
 	 * "main" and "left", other themes can add their own areas.
 	 *
@@ -58,7 +58,7 @@ public function __construct($header, $body, /*string*/ $section="main", /*int*/
 		$this->body = $body;
 		$this->section = $section;
 		$this->position = $position;
-		$this->id = str_replace(' ', '_', is_null($id) ? (is_null($header) ? md5($body) : $header) . $section : $id);
+		$this->id = preg_replace('/[^\w]/', '',str_replace(' ', '_', is_null($id) ? (is_null($header) ? md5($body) : $header) . $section : $id));
 	}
 
 	/**
@@ -94,4 +94,3 @@ public function __construct() {
 		parent::__construct("Navigation", "<a href='".make_link()."'>Index</a>", "left", 0);
 	}
 }
-
diff --git a/ext/blotter/theme.php b/ext/blotter/theme.php
index 279876877..ba274cf83 100644
--- a/ext/blotter/theme.php
+++ b/ext/blotter/theme.php
@@ -62,7 +62,7 @@ private function get_html_for_blotter_editor($entries) {
 			if($entries[$i]['important'] == 'Y') { $important = 'Y'; } else { $important = 'N'; }
 
 			// Add the new table row(s)
-			$table_rows .= 
+			$table_rows .=
 				"<tr>
 				<td>$entry_date</td>
 				<td>$entry_text</td>
@@ -114,7 +114,7 @@ private function get_html_for_blotter_page($entries) {
 				$i_open = "<font color='#{$i_color}'>";
 				$i_close="</font>";
 			}
-			$html .= "{$i_open}{$clean_date} - {$entry_text}{$i_close}<br /><br />";			
+			$html .= "{$i_open}{$clean_date} - {$entry_text}{$i_close}<br /><br />";
 		}
 		$html .= "</pre>";
 		return $html;
@@ -139,9 +139,9 @@ private function get_html_for_blotter($entries) {
 			$entry_text = $entries[$i]['entry_text'];
 			if($entries[$i]['important'] == 'Y') {
 				$i_open = "<font color='#{$i_color}'>";
-				$i_close="</font>"; 
+				$i_close="</font>";
 			}
-			$entries_list .= "<li>{$i_open}{$clean_date} - {$entry_text}{$i_close}</li>";			
+			$entries_list .= "<li>{$i_open}{$clean_date} - {$entry_text}{$i_close}</li>";
 		}
 
 		$pos_break = "";
@@ -149,7 +149,7 @@ private function get_html_for_blotter($entries) {
 
 		if($position === "left") {
 			$pos_break = "<br />";
-			$pos_align = ""; 
+			$pos_align = "";
 		}
 
 		if(count($entries) === 0) {
@@ -176,4 +176,3 @@ private function get_html_for_blotter($entries) {
 		return $html;
 	}
 }
-
diff --git a/themes/material/layout.class.php b/themes/material/layout.class.php
index defac581e..5d88d9650 100644
--- a/themes/material/layout.class.php
+++ b/themes/material/layout.class.php
@@ -233,8 +233,7 @@ public function rework_navigation(Block $block){
   public function get_html(Block $block, $section="main", $hidable=false, $extra_class="") {
     $h = $block->header;
     $b = $block->body;
-    $i = $block->id;
-    $i = preg_replace('/[^\w-]/', '', $i);//blotter extention id has `!`
+    $i = $block->id;//blotter extention id has `!`
 
     if($section == "toolbar"){
       $html = "<section id='$i'>\n<nav class='mdl-navigation'>\n";

From 6d1c7c414b694c31e44ba3c88d94a8f0a2ae1e19 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 4 Dec 2015 11:38:44 +0000
Subject: [PATCH 014/250] mysql < 5.6 has terrible subquery optimization, using
 EXISTS / JOIN fixes this

---
 core/imageboard.pack.php | 19 ++++++++++++++++---
 ext/index/main.php       | 20 ++++++++++++++------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index e27bc7a0a..1d8365f70 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -560,9 +560,22 @@ public function set_locked($tf) {
 	 */
 	public function delete_tags_from_image() {
 		global $database;
-		$database->execute(
-				"UPDATE tags SET count = count - 1 WHERE id IN ".
-				"(SELECT tag_id FROM image_tags WHERE image_id = :id)", array("id"=>$this->id));
+		if($database->get_driver_name() == "mysql") {
+			//mysql < 5.6 has terrible subquery optimization, using EXISTS / JOIN fixes this
+			$database->execute("
+				UPDATE tags t
+				INNER JOIN image_tags it ON t.id = it.tag_id
+				SET count = count - 1
+				WHERE it.image_id = :id",
+				array("id"=>$this->id)
+			);
+		} else {
+			$database->execute("
+				UPDATE tags
+				SET count = count - 1
+				WHERE id IN (SELECT tag_id FROM image_tags WHERE image_id = :id)", array("id"=>$this->id)
+			);
+		}
 		$database->execute("DELETE FROM image_tags WHERE image_id=:id", array("id"=>$this->id));
 	}
 
diff --git a/ext/index/main.php b/ext/index/main.php
index 75a7fab00..78404fe68 100644
--- a/ext/index/main.php
+++ b/ext/index/main.php
@@ -253,9 +253,9 @@ public function onPageRequest(PageRequestEvent $event) {
 			$search_terms = $event->get_search_terms();
 			$page_number = $event->get_page_number();
 			$page_size = $event->get_page_size();
-            
+
 			$count_search_terms = count($search_terms);
-            
+
 			try {
 				#log_debug("index", "Search for ".implode(" ", $search_terms), false, array("terms"=>$search_terms));
 				$total_pages = Image::count_pages($search_terms);
@@ -277,7 +277,7 @@ public function onPageRequest(PageRequestEvent $event) {
 			}
 
 			$count_images = count($images);
-            
+
 			if($count_search_terms === 0 && $count_images === 0 && $page_number === 1) {
 				$this->theme->display_intro($page);
 				send_event(new PostListBuildingEvent($search_terms));
@@ -322,8 +322,17 @@ public function onSearchTermParse(SearchTermParseEvent $event) {
 		// check for tags first as tag based searches are more common.
 		if(preg_match("/^tags([:]?<|[:]?>|[:]?<=|[:]?>=|[:|=])(\d+)$/i", $event->term, $matches)) {
 			$cmp = ltrim($matches[1], ":") ?: "=";
-			$tags = $matches[2];
-			$event->add_querylet(new Querylet('images.id IN (SELECT DISTINCT image_id FROM image_tags GROUP BY image_id HAVING count(image_id) '.$cmp.' '.$tags.')'));
+			$count = $matches[2];
+			$event->add_querylet(
+				new Querylet("EXISTS (
+				              SELECT 1
+				              FROM image_tags it
+				              LEFT JOIN tags t ON it.tag_id = t.id
+				              WHERE images.id = it.image_id
+				              GROUP BY image_id
+				              HAVING COUNT(*) $cmp $count
+				)")
+			);
 		}
 		else if(preg_match("/^ratio([:]?<|[:]?>|[:]?<=|[:]?>=|[:|=])(\d+):(\d+)$/i", $event->term, $matches)) {
 			$cmp = preg_replace('/^:/', '=', $matches[1]);
@@ -394,4 +403,3 @@ public function onSearchTermParse(SearchTermParseEvent $event) {
 		$this->stpen++;
 	}
 }
-

From a8ca54db0b2e943e4b51c88753d3263720ba051c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Sun, 27 Dec 2015 16:10:01 +0100
Subject: [PATCH 015/250] ported search, counter, foot and title to php

---
 themes/material/home.theme.php | 74 ++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 themes/material/home.theme.php

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
new file mode 100644
index 000000000..6e4e8609a
--- /dev/null
+++ b/themes/material/home.theme.php
@@ -0,0 +1,74 @@
+<?php
+
+class CustomHomeTheme extends HomeTheme {
+	public function display_page(Page $page, $sitename, $base_href, $theme_name, $body) {
+		$page->set_mode("data");
+		$hh = "";
+		$page->add_auto_html_headers();
+		foreach($page->html_headers as $h) {$hh .= $h;}
+		$page->set_data(<<<EOD
+<html>
+	<head>
+		<title>$sitename</title>
+		<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		$hh
+	</head>
+	<style>
+		div#front-page h1 {font-size: 4em; margin-top: 2em; margin-bottom: 0px; text-align: center; border: none; background: none; box-shadow: none; -webkit-box-shadow: none; -moz-box-shadow: none;}
+		div#front-page {text-align:center;}
+		.space {margin-bottom: 1em;}
+		div#front-page div#links a {margin: 0 0.5em;}
+		div#front-page li {list-style-type: none; margin: 0;}
+		@media (max-width: 800px) {
+			div#front-page h1 {font-size: 3em; margin-top: 0.5em; margin-bottom: 0.5em;}
+			#counter {display: none;}
+		}
+	</style>
+	<body>
+		$body
+	</body>
+</html>
+EOD
+);
+	}
+
+	public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*string*/ $main_text, /*string*/ $contact_link, $num_comma, /*string*/ $counter_text) {
+		$main_links_html = empty($main_links) ? "" : /*Change this*/"<div class='space' id='links'>$main_links</div>";
+		$message_html = empty($main_text)     ? "" : "<div class='space' id='message'>$main_text</div>";
+		$counter_html = empty($counter_text)  ? "" : "<div class='mdl-typography--text-center' id='counter'>$counter_text</div>";
+		$contact_link = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a> &ndash;";
+		$search_html = "
+			<div class='mdl-grid'>
+				<div class='mdl-layout-spacer'></div>
+				<div class='mdl-cell mdl-cell--4-col'>
+					<!-- Simple Textfield -->
+					<div class='mdl-cell mdl-cell--4-col'>
+						<form class='mdl-typography--text-center' action='".make_link("post/list")."' method='GET'>
+							<input id='search' name='search' size='30' type='search' value='' class='autocomplete_tags mdl-textfield__input' autocomplete='off' />
+							<input type='hidden' name='q' value='/post/list'>
+							<label class='mdl-textfield__label' for='search'>Search</label>
+						</form>
+					</div>
+				</div>
+				<div class='mdl-layout-spacer'></div>
+			</div>
+		";
+		return "
+		<div class='mdl-layout mdl-js-layout mdl-layout--fixed-drawer vertical-center' id='front-page'>
+			$main_links_html
+			<main class='mdl-layout__content'>
+    			<div class='page-content'>
+					<h2 class='mdl-typography--text-center'><a style='text-decoration: none;' href='".make_link()."'><span>$sitename</span></a></h2>
+					$search_html
+					$message_html
+					$counter_html
+					<div class='mdl-typography--text-center' id='foot'>
+						<p>$contact_link - Serving $num_comma posts &ndash - Running <a href='http://code.shishnet.org/shimmie2/'>Shimmie</a>
+					</div>
+				</div>
+			</main>
+		</div>";
+	}
+}
+

From d21e86aeb0de727885630089527cf2cb84fbb2bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Mon, 28 Dec 2015 02:37:05 +0100
Subject: [PATCH 016/250] Cheated a bit to test it out ;)

---
 themes/material/home.theme.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index 6e4e8609a..511b13297 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -26,6 +26,9 @@ public function display_page(Page $page, $sitename, $base_href, $theme_name, $bo
 		}
 	</style>
 	<body>
+		<link rel="stylesheet" href="https://storage.googleapis.com/code.getmdl.io/1.0.6/material.indigo-pink.min.css">
+		<script src="https://storage.googleapis.com/code.getmdl.io/1.0.6/material.min.js"></script>
+		<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
 		$body
 	</body>
 </html>

From d8f18df3ec3ec7582017c34f59f0093e73234874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Mon, 28 Dec 2015 02:45:24 +0100
Subject: [PATCH 017/250] more testing

---
 themes/material/home.theme.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index 511b13297..32bdf2532 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -59,7 +59,9 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 		";
 		return "
 		<div class='mdl-layout mdl-js-layout mdl-layout--fixed-drawer vertical-center' id='front-page'>
-			$main_links_html
+			<div class='mdl-layout__drawer'>
+			    <span class='mdl-layout-title'>$sitename</span>
+			</div>
 			<main class='mdl-layout__content'>
     			<div class='page-content'>
 					<h2 class='mdl-typography--text-center'><a style='text-decoration: none;' href='".make_link()."'><span>$sitename</span></a></h2>

From 2afdbfc2d1c65b5f18bedefd1f2fefdd54f9144b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Mon, 28 Dec 2015 02:51:10 +0100
Subject: [PATCH 018/250] fixed search

---
 themes/material/home.theme.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index 32bdf2532..b41d65c77 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -48,9 +48,11 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 					<!-- Simple Textfield -->
 					<div class='mdl-cell mdl-cell--4-col'>
 						<form class='mdl-typography--text-center' action='".make_link("post/list")."' method='GET'>
-							<input id='search' name='search' size='30' type='search' value='' class='autocomplete_tags mdl-textfield__input' autocomplete='off' />
-							<input type='hidden' name='q' value='/post/list'>
-							<label class='mdl-textfield__label' for='search'>Search</label>
+							<div class='mdl-textfield mdl-js-textfield'>
+								<input id='search' name='search' size='30' type='search' value='' class='autocomplete_tags mdl-textfield__input' autocomplete='off' />
+								<input type='hidden' name='q' value='/post/list'>
+								<label class='mdl-textfield__label' for='search'>Search</label>
+							</div>
 						</form>
 					</div>
 				</div>

From 5761148d0a5420765a088e7744ba32378eef88f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Mon, 28 Dec 2015 03:01:12 +0100
Subject: [PATCH 019/250] fixed search - wow i was stoopid

---
 themes/material/home.theme.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index b41d65c77..9a726d377 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -45,16 +45,13 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 			<div class='mdl-grid'>
 				<div class='mdl-layout-spacer'></div>
 				<div class='mdl-cell mdl-cell--4-col'>
-					<!-- Simple Textfield -->
-					<div class='mdl-cell mdl-cell--4-col'>
-						<form class='mdl-typography--text-center' action='".make_link("post/list")."' method='GET'>
-							<div class='mdl-textfield mdl-js-textfield'>
-								<input id='search' name='search' size='30' type='search' value='' class='autocomplete_tags mdl-textfield__input' autocomplete='off' />
-								<input type='hidden' name='q' value='/post/list'>
-								<label class='mdl-textfield__label' for='search'>Search</label>
-							</div>
-						</form>
-					</div>
+					<form class='mdl-typography--text-center' action='".make_link("post/list")."' method='GET'>
+						<div class='mdl-textfield mdl-js-textfield'>
+							<input id='search' name='search' size='30' type='search' value='' class='autocomplete_tags mdl-textfield__input' autocomplete='off' />
+							<input type='hidden' name='q' value='/post/list'>
+							<label class='mdl-textfield__label' for='search'>Search</label>
+						</div>
+					</form>
 				</div>
 				<div class='mdl-layout-spacer'></div>
 			</div>

From eceef2a56f1b359337f846c347ded62228494165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Mon, 28 Dec 2015 03:22:42 +0100
Subject: [PATCH 020/250] Added links

---
 themes/material/home.theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index 9a726d377..894525bf8 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -37,7 +37,6 @@ public function display_page(Page $page, $sitename, $base_href, $theme_name, $bo
 	}
 
 	public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*string*/ $main_text, /*string*/ $contact_link, $num_comma, /*string*/ $counter_text) {
-		$main_links_html = empty($main_links) ? "" : /*Change this*/"<div class='space' id='links'>$main_links</div>";
 		$message_html = empty($main_text)     ? "" : "<div class='space' id='message'>$main_text</div>";
 		$counter_html = empty($counter_text)  ? "" : "<div class='mdl-typography--text-center' id='counter'>$counter_text</div>";
 		$contact_link = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a> &ndash;";
@@ -60,6 +59,7 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 		<div class='mdl-layout mdl-js-layout mdl-layout--fixed-drawer vertical-center' id='front-page'>
 			<div class='mdl-layout__drawer'>
 			    <span class='mdl-layout-title'>$sitename</span>
+			    $main_links
 			</div>
 			<main class='mdl-layout__content'>
     			<div class='page-content'>

From ddc3b844d16964568acb87b0522a59b2f177e938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Mon, 28 Dec 2015 18:09:06 +0100
Subject: [PATCH 021/250] Olds CSS rules begone!

---
 themes/material/home.theme.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index 894525bf8..45b13d8fd 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -14,17 +14,6 @@ public function display_page(Page $page, $sitename, $base_href, $theme_name, $bo
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 		$hh
 	</head>
-	<style>
-		div#front-page h1 {font-size: 4em; margin-top: 2em; margin-bottom: 0px; text-align: center; border: none; background: none; box-shadow: none; -webkit-box-shadow: none; -moz-box-shadow: none;}
-		div#front-page {text-align:center;}
-		.space {margin-bottom: 1em;}
-		div#front-page div#links a {margin: 0 0.5em;}
-		div#front-page li {list-style-type: none; margin: 0;}
-		@media (max-width: 800px) {
-			div#front-page h1 {font-size: 3em; margin-top: 0.5em; margin-bottom: 0.5em;}
-			#counter {display: none;}
-		}
-	</style>
 	<body>
 		<link rel="stylesheet" href="https://storage.googleapis.com/code.getmdl.io/1.0.6/material.indigo-pink.min.css">
 		<script src="https://storage.googleapis.com/code.getmdl.io/1.0.6/material.min.js"></script>
@@ -56,7 +45,7 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 			</div>
 		";
 		return "
-		<div class='mdl-layout mdl-js-layout mdl-layout--fixed-drawer vertical-center' id='front-page'>
+		<div class='mdl-layout mdl-js-layout mdl-layout--fixed-drawer vertical-center'>
 			<div class='mdl-layout__drawer'>
 			    <span class='mdl-layout-title'>$sitename</span>
 			    $main_links

From 90b306184facdb06ccebcef359eaa213517a5a48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Mon, 28 Dec 2015 18:12:37 +0100
Subject: [PATCH 022/250] weird &ndash;es

---
 themes/material/home.theme.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index 45b13d8fd..6a55c9a12 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -28,7 +28,7 @@ public function display_page(Page $page, $sitename, $base_href, $theme_name, $bo
 	public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*string*/ $main_text, /*string*/ $contact_link, $num_comma, /*string*/ $counter_text) {
 		$message_html = empty($main_text)     ? "" : "<div class='space' id='message'>$main_text</div>";
 		$counter_html = empty($counter_text)  ? "" : "<div class='mdl-typography--text-center' id='counter'>$counter_text</div>";
-		$contact_link = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a> &ndash;";
+		$contact_link = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a> -";
 		$search_html = "
 			<div class='mdl-grid'>
 				<div class='mdl-layout-spacer'></div>
@@ -57,7 +57,7 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 					$message_html
 					$counter_html
 					<div class='mdl-typography--text-center' id='foot'>
-						<p>$contact_link - Serving $num_comma posts &ndash - Running <a href='http://code.shishnet.org/shimmie2/'>Shimmie</a>
+						<p>$contact_link Serving $num_comma posts - Running <a href='http://code.shishnet.org/shimmie2/'>Shimmie</a>
 					</div>
 				</div>
 			</main>

From a267516b77746f150e7a8fffc176e262a056e549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Mon, 28 Dec 2015 18:42:55 +0100
Subject: [PATCH 023/250] Made navgation links reside inside nav - "I identify
 as navbarkin"

---
 themes/material/home.theme.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index 6a55c9a12..e12d1f179 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -48,7 +48,9 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 		<div class='mdl-layout mdl-js-layout mdl-layout--fixed-drawer vertical-center'>
 			<div class='mdl-layout__drawer'>
 			    <span class='mdl-layout-title'>$sitename</span>
-			    $main_links
+			    <nav class='mdl-navigation'>
+			    	$main_links
+		    	</nav>
 			</div>
 			<main class='mdl-layout__content'>
     			<div class='page-content'>

From 05656618db0699ee00a1d6b40d23c5b4b68cd005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Tue, 29 Dec 2015 19:26:40 +0100
Subject: [PATCH 024/250] Updated mdl and added license

---
 themes/material/material.min.css |   5 +-
 themes/material/material.min.js  |   6 +-
 themes/material/mdl-LICENSE      | 212 +++++++++++++++++++++++++++++++
 3 files changed, 218 insertions(+), 5 deletions(-)
 create mode 100644 themes/material/mdl-LICENSE

diff --git a/themes/material/material.min.css b/themes/material/material.min.css
index e72ca355d..7a2fb0a69 100644
--- a/themes/material/material.min.css
+++ b/themes/material/material.min.css
@@ -1,8 +1,9 @@
 /**
  * material-design-lite - Material Design Components in CSS, JS and HTML
- * @version v1.0.5
+ * @version v1.0.6
  * @license Apache-2.0
  * @copyright 2015 Google, Inc.
  * @link https://github.com/google/material-design-lite
  */
-@charset "UTF-8";html{color:rgba(0,0,0,.87)}::-moz-selection{background:#b3d4fc;text-shadow:none}::selection{background:#b3d4fc;text-shadow:none}hr{display:block;height:1px;border:0;border-top:1px solid #ccc;margin:1em 0;padding:0}audio,canvas,iframe,img,svg,video{vertical-align:middle}fieldset{border:0;margin:0;padding:0}textarea{resize:vertical}.browserupgrade{margin:.2em 0;background:#ccc;color:#000;padding:.2em 0}.hidden{display:none!important}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.clearfix:before,.clearfix:after{content:" ";display:table}.clearfix:after{clear:both}@media print{*,*:before,*:after,*:first-letter,*:first-line{background:transparent!important;color:#000!important;box-shadow:none!important;text-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href)")"}abbr[title]:after{content:" (" attr(title)")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}a,.mdl-accordion,.mdl-button,.mdl-card,.mdl-checkbox,.mdl-dropdown-menu,.mdl-icon-toggle,.mdl-item,.mdl-radio,.mdl-slider,.mdl-switch,.mdl-tabs__tab{-webkit-tap-highlight-color:transparent;-webkit-tap-highlight-color:rgba(255,255,255,0)}html{width:100%;height:100%;-ms-touch-action:manipulation;touch-action:manipulation}body{width:100%;min-height:100%}main{display:block}*[hidden]{display:none!important}html,body{font-family:"Helvetica","Arial",sans-serif;font-size:14px;font-weight:400;line-height:20px}h1,h2,h3,h4,h5,h6,p{padding:0}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400;line-height:1.35;letter-spacing:-.02em;opacity:.54;font-size:.6em}h1{font-size:56px;line-height:1.35;letter-spacing:-.02em;margin:24px 0}h1,h2{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400}h2{font-size:45px;line-height:48px}h2,h3{margin:24px 0}h3{font-size:34px;line-height:40px}h3,h4{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400}h4{font-size:24px;line-height:32px;-moz-osx-font-smoothing:grayscale;margin:24px 0 16px}h5{font-size:20px;font-weight:500;line-height:1;letter-spacing:.02em}h5,h6{font-family:"Roboto","Helvetica","Arial",sans-serif;margin:24px 0 16px}h6{font-size:16px;letter-spacing:.04em}h6,p{font-weight:400;line-height:24px}p{font-size:14px;letter-spacing:0;margin:0 0 16px}a{color:rgb(255,110,64);font-weight:500}blockquote{font-family:"Roboto","Helvetica","Arial",sans-serif;position:relative;font-size:24px;font-weight:300;font-style:italic;line-height:1.35;letter-spacing:.08em}blockquote:before{position:absolute;left:-.5em;content:'“'}blockquote:after{content:'”';margin-left:-.05em}mark{background-color:#f4ff81}dt{font-weight:700}address{font-size:12px;line-height:1;font-style:normal}address,ul,ol{font-weight:400;letter-spacing:0}ul,ol{font-size:14px;line-height:24px}.mdl-typography--display-4,.mdl-typography--display-4-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:112px;font-weight:300;line-height:1;letter-spacing:-.04em}.mdl-typography--display-4-color-contrast{opacity:.54}.mdl-typography--display-3,.mdl-typography--display-3-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:56px;font-weight:400;line-height:1.35;letter-spacing:-.02em}.mdl-typography--display-3-color-contrast{opacity:.54}.mdl-typography--display-2,.mdl-typography--display-2-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:45px;font-weight:400;line-height:48px}.mdl-typography--display-2-color-contrast{opacity:.54}.mdl-typography--display-1,.mdl-typography--display-1-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:34px;font-weight:400;line-height:40px}.mdl-typography--display-1-color-contrast{opacity:.54}.mdl-typography--headline,.mdl-typography--headline-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:24px;font-weight:400;line-height:32px;-moz-osx-font-smoothing:grayscale}.mdl-typography--headline-color-contrast{opacity:.87}.mdl-typography--title,.mdl-typography--title-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:20px;font-weight:500;line-height:1;letter-spacing:.02em}.mdl-typography--title-color-contrast{opacity:.87}.mdl-typography--subhead,.mdl-typography--subhead-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:16px;font-weight:400;line-height:24px;letter-spacing:.04em}.mdl-typography--subhead-color-contrast{opacity:.87}.mdl-typography--body-2,.mdl-typography--body-2-color-contrast{font-size:14px;font-weight:700;line-height:24px;letter-spacing:0}.mdl-typography--body-2-color-contrast{opacity:.87}.mdl-typography--body-1,.mdl-typography--body-1-color-contrast{font-size:14px;font-weight:400;line-height:24px;letter-spacing:0}.mdl-typography--body-1-color-contrast{opacity:.87}.mdl-typography--body-2-force-preferred-font,.mdl-typography--body-2-force-preferred-font-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;line-height:24px;letter-spacing:0}.mdl-typography--body-2-force-preferred-font-color-contrast{opacity:.87}.mdl-typography--body-1-force-preferred-font,.mdl-typography--body-1-force-preferred-font-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:400;line-height:24px;letter-spacing:0}.mdl-typography--body-1-force-preferred-font-color-contrast{opacity:.87}.mdl-typography--caption,.mdl-typography--caption-force-preferred-font{font-size:12px;font-weight:400;line-height:1;letter-spacing:0}.mdl-typography--caption-force-preferred-font{font-family:"Roboto","Helvetica","Arial",sans-serif}.mdl-typography--caption-color-contrast,.mdl-typography--caption-force-preferred-font-color-contrast{font-size:12px;font-weight:400;line-height:1;letter-spacing:0;opacity:.54}.mdl-typography--caption-force-preferred-font-color-contrast,.mdl-typography--menu{font-family:"Roboto","Helvetica","Arial",sans-serif}.mdl-typography--menu{font-size:14px;font-weight:500;line-height:1;letter-spacing:0}.mdl-typography--menu-color-contrast{opacity:.87}.mdl-typography--menu-color-contrast,.mdl-typography--button,.mdl-typography--button-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;line-height:1;letter-spacing:0}.mdl-typography--button,.mdl-typography--button-color-contrast{text-transform:uppercase}.mdl-typography--button-color-contrast{opacity:.87}.mdl-typography--text-left{text-align:left}.mdl-typography--text-right{text-align:right}.mdl-typography--text-center{text-align:center}.mdl-typography--text-justify{text-align:justify}.mdl-typography--text-nowrap{white-space:nowrap}.mdl-typography--text-lowercase{text-transform:lowercase}.mdl-typography--text-uppercase{text-transform:uppercase}.mdl-typography--text-capitalize{text-transform:capitalize}.mdl-typography--font-thin{font-weight:200!important}.mdl-typography--font-light{font-weight:300!important}.mdl-typography--font-regular{font-weight:400!important}.mdl-typography--font-medium{font-weight:500!important}.mdl-typography--font-bold{font-weight:700!important}.mdl-typography--font-black{font-weight:900!important}.mdl-color-text--red{color:#f44336 !important}.mdl-color--red{background-color:#f44336 !important}.mdl-color-text--red-50{color:#ffebee !important}.mdl-color--red-50{background-color:#ffebee !important}.mdl-color-text--red-100{color:#ffcdd2 !important}.mdl-color--red-100{background-color:#ffcdd2 !important}.mdl-color-text--red-200{color:#ef9a9a !important}.mdl-color--red-200{background-color:#ef9a9a !important}.mdl-color-text--red-300{color:#e57373 !important}.mdl-color--red-300{background-color:#e57373 !important}.mdl-color-text--red-400{color:#ef5350 !important}.mdl-color--red-400{background-color:#ef5350 !important}.mdl-color-text--red-500{color:#f44336 !important}.mdl-color--red-500{background-color:#f44336 !important}.mdl-color-text--red-600{color:#e53935 !important}.mdl-color--red-600{background-color:#e53935 !important}.mdl-color-text--red-700{color:#d32f2f !important}.mdl-color--red-700{background-color:#d32f2f !important}.mdl-color-text--red-800{color:#c62828 !important}.mdl-color--red-800{background-color:#c62828 !important}.mdl-color-text--red-900{color:#b71c1c !important}.mdl-color--red-900{background-color:#b71c1c !important}.mdl-color-text--red-A100{color:#ff8a80 !important}.mdl-color--red-A100{background-color:#ff8a80 !important}.mdl-color-text--red-A200{color:#ff5252 !important}.mdl-color--red-A200{background-color:#ff5252 !important}.mdl-color-text--red-A400{color:#ff1744 !important}.mdl-color--red-A400{background-color:#ff1744 !important}.mdl-color-text--red-A700{color:#d50000 !important}.mdl-color--red-A700{background-color:#d50000 !important}.mdl-color-text--pink{color:#e91e63 !important}.mdl-color--pink{background-color:#e91e63 !important}.mdl-color-text--pink-50{color:#fce4ec !important}.mdl-color--pink-50{background-color:#fce4ec !important}.mdl-color-text--pink-100{color:#f8bbd0 !important}.mdl-color--pink-100{background-color:#f8bbd0 !important}.mdl-color-text--pink-200{color:#f48fb1 !important}.mdl-color--pink-200{background-color:#f48fb1 !important}.mdl-color-text--pink-300{color:#f06292 !important}.mdl-color--pink-300{background-color:#f06292 !important}.mdl-color-text--pink-400{color:#ec407a !important}.mdl-color--pink-400{background-color:#ec407a !important}.mdl-color-text--pink-500{color:#e91e63 !important}.mdl-color--pink-500{background-color:#e91e63 !important}.mdl-color-text--pink-600{color:#d81b60 !important}.mdl-color--pink-600{background-color:#d81b60 !important}.mdl-color-text--pink-700{color:#c2185b !important}.mdl-color--pink-700{background-color:#c2185b !important}.mdl-color-text--pink-800{color:#ad1457 !important}.mdl-color--pink-800{background-color:#ad1457 !important}.mdl-color-text--pink-900{color:#880e4f !important}.mdl-color--pink-900{background-color:#880e4f !important}.mdl-color-text--pink-A100{color:#ff80ab !important}.mdl-color--pink-A100{background-color:#ff80ab !important}.mdl-color-text--pink-A200{color:#ff4081 !important}.mdl-color--pink-A200{background-color:#ff4081 !important}.mdl-color-text--pink-A400{color:#f50057 !important}.mdl-color--pink-A400{background-color:#f50057 !important}.mdl-color-text--pink-A700{color:#c51162 !important}.mdl-color--pink-A700{background-color:#c51162 !important}.mdl-color-text--purple{color:#9c27b0 !important}.mdl-color--purple{background-color:#9c27b0 !important}.mdl-color-text--purple-50{color:#f3e5f5 !important}.mdl-color--purple-50{background-color:#f3e5f5 !important}.mdl-color-text--purple-100{color:#e1bee7 !important}.mdl-color--purple-100{background-color:#e1bee7 !important}.mdl-color-text--purple-200{color:#ce93d8 !important}.mdl-color--purple-200{background-color:#ce93d8 !important}.mdl-color-text--purple-300{color:#ba68c8 !important}.mdl-color--purple-300{background-color:#ba68c8 !important}.mdl-color-text--purple-400{color:#ab47bc !important}.mdl-color--purple-400{background-color:#ab47bc !important}.mdl-color-text--purple-500{color:#9c27b0 !important}.mdl-color--purple-500{background-color:#9c27b0 !important}.mdl-color-text--purple-600{color:#8e24aa !important}.mdl-color--purple-600{background-color:#8e24aa !important}.mdl-color-text--purple-700{color:#7b1fa2 !important}.mdl-color--purple-700{background-color:#7b1fa2 !important}.mdl-color-text--purple-800{color:#6a1b9a !important}.mdl-color--purple-800{background-color:#6a1b9a !important}.mdl-color-text--purple-900{color:#4a148c !important}.mdl-color--purple-900{background-color:#4a148c !important}.mdl-color-text--purple-A100{color:#ea80fc !important}.mdl-color--purple-A100{background-color:#ea80fc !important}.mdl-color-text--purple-A200{color:#e040fb !important}.mdl-color--purple-A200{background-color:#e040fb !important}.mdl-color-text--purple-A400{color:#d500f9 !important}.mdl-color--purple-A400{background-color:#d500f9 !important}.mdl-color-text--purple-A700{color:#a0f !important}.mdl-color--purple-A700{background-color:#a0f !important}.mdl-color-text--deep-purple{color:#673ab7 !important}.mdl-color--deep-purple{background-color:#673ab7 !important}.mdl-color-text--deep-purple-50{color:#ede7f6 !important}.mdl-color--deep-purple-50{background-color:#ede7f6 !important}.mdl-color-text--deep-purple-100{color:#d1c4e9 !important}.mdl-color--deep-purple-100{background-color:#d1c4e9 !important}.mdl-color-text--deep-purple-200{color:#b39ddb !important}.mdl-color--deep-purple-200{background-color:#b39ddb !important}.mdl-color-text--deep-purple-300{color:#9575cd !important}.mdl-color--deep-purple-300{background-color:#9575cd !important}.mdl-color-text--deep-purple-400{color:#7e57c2 !important}.mdl-color--deep-purple-400{background-color:#7e57c2 !important}.mdl-color-text--deep-purple-500{color:#673ab7 !important}.mdl-color--deep-purple-500{background-color:#673ab7 !important}.mdl-color-text--deep-purple-600{color:#5e35b1 !important}.mdl-color--deep-purple-600{background-color:#5e35b1 !important}.mdl-color-text--deep-purple-700{color:#512da8 !important}.mdl-color--deep-purple-700{background-color:#512da8 !important}.mdl-color-text--deep-purple-800{color:#4527a0 !important}.mdl-color--deep-purple-800{background-color:#4527a0 !important}.mdl-color-text--deep-purple-900{color:#311b92 !important}.mdl-color--deep-purple-900{background-color:#311b92 !important}.mdl-color-text--deep-purple-A100{color:#b388ff !important}.mdl-color--deep-purple-A100{background-color:#b388ff !important}.mdl-color-text--deep-purple-A200{color:#7c4dff !important}.mdl-color--deep-purple-A200{background-color:#7c4dff !important}.mdl-color-text--deep-purple-A400{color:#651fff !important}.mdl-color--deep-purple-A400{background-color:#651fff !important}.mdl-color-text--deep-purple-A700{color:#6200ea !important}.mdl-color--deep-purple-A700{background-color:#6200ea !important}.mdl-color-text--indigo{color:#3f51b5 !important}.mdl-color--indigo{background-color:#3f51b5 !important}.mdl-color-text--indigo-50{color:#e8eaf6 !important}.mdl-color--indigo-50{background-color:#e8eaf6 !important}.mdl-color-text--indigo-100{color:#c5cae9 !important}.mdl-color--indigo-100{background-color:#c5cae9 !important}.mdl-color-text--indigo-200{color:#9fa8da !important}.mdl-color--indigo-200{background-color:#9fa8da !important}.mdl-color-text--indigo-300{color:#7986cb !important}.mdl-color--indigo-300{background-color:#7986cb !important}.mdl-color-text--indigo-400{color:#5c6bc0 !important}.mdl-color--indigo-400{background-color:#5c6bc0 !important}.mdl-color-text--indigo-500{color:#3f51b5 !important}.mdl-color--indigo-500{background-color:#3f51b5 !important}.mdl-color-text--indigo-600{color:#3949ab !important}.mdl-color--indigo-600{background-color:#3949ab !important}.mdl-color-text--indigo-700{color:#303f9f !important}.mdl-color--indigo-700{background-color:#303f9f !important}.mdl-color-text--indigo-800{color:#283593 !important}.mdl-color--indigo-800{background-color:#283593 !important}.mdl-color-text--indigo-900{color:#1a237e !important}.mdl-color--indigo-900{background-color:#1a237e !important}.mdl-color-text--indigo-A100{color:#8c9eff !important}.mdl-color--indigo-A100{background-color:#8c9eff !important}.mdl-color-text--indigo-A200{color:#536dfe !important}.mdl-color--indigo-A200{background-color:#536dfe !important}.mdl-color-text--indigo-A400{color:#3d5afe !important}.mdl-color--indigo-A400{background-color:#3d5afe !important}.mdl-color-text--indigo-A700{color:#304ffe !important}.mdl-color--indigo-A700{background-color:#304ffe !important}.mdl-color-text--blue{color:#2196f3 !important}.mdl-color--blue{background-color:#2196f3 !important}.mdl-color-text--blue-50{color:#e3f2fd !important}.mdl-color--blue-50{background-color:#e3f2fd !important}.mdl-color-text--blue-100{color:#bbdefb !important}.mdl-color--blue-100{background-color:#bbdefb !important}.mdl-color-text--blue-200{color:#90caf9 !important}.mdl-color--blue-200{background-color:#90caf9 !important}.mdl-color-text--blue-300{color:#64b5f6 !important}.mdl-color--blue-300{background-color:#64b5f6 !important}.mdl-color-text--blue-400{color:#42a5f5 !important}.mdl-color--blue-400{background-color:#42a5f5 !important}.mdl-color-text--blue-500{color:#2196f3 !important}.mdl-color--blue-500{background-color:#2196f3 !important}.mdl-color-text--blue-600{color:#1e88e5 !important}.mdl-color--blue-600{background-color:#1e88e5 !important}.mdl-color-text--blue-700{color:#1976d2 !important}.mdl-color--blue-700{background-color:#1976d2 !important}.mdl-color-text--blue-800{color:#1565c0 !important}.mdl-color--blue-800{background-color:#1565c0 !important}.mdl-color-text--blue-900{color:#0d47a1 !important}.mdl-color--blue-900{background-color:#0d47a1 !important}.mdl-color-text--blue-A100{color:#82b1ff !important}.mdl-color--blue-A100{background-color:#82b1ff !important}.mdl-color-text--blue-A200{color:#448aff !important}.mdl-color--blue-A200{background-color:#448aff !important}.mdl-color-text--blue-A400{color:#2979ff !important}.mdl-color--blue-A400{background-color:#2979ff !important}.mdl-color-text--blue-A700{color:#2962ff !important}.mdl-color--blue-A700{background-color:#2962ff !important}.mdl-color-text--light-blue{color:#03a9f4 !important}.mdl-color--light-blue{background-color:#03a9f4 !important}.mdl-color-text--light-blue-50{color:#e1f5fe !important}.mdl-color--light-blue-50{background-color:#e1f5fe !important}.mdl-color-text--light-blue-100{color:#b3e5fc !important}.mdl-color--light-blue-100{background-color:#b3e5fc !important}.mdl-color-text--light-blue-200{color:#81d4fa !important}.mdl-color--light-blue-200{background-color:#81d4fa !important}.mdl-color-text--light-blue-300{color:#4fc3f7 !important}.mdl-color--light-blue-300{background-color:#4fc3f7 !important}.mdl-color-text--light-blue-400{color:#29b6f6 !important}.mdl-color--light-blue-400{background-color:#29b6f6 !important}.mdl-color-text--light-blue-500{color:#03a9f4 !important}.mdl-color--light-blue-500{background-color:#03a9f4 !important}.mdl-color-text--light-blue-600{color:#039be5 !important}.mdl-color--light-blue-600{background-color:#039be5 !important}.mdl-color-text--light-blue-700{color:#0288d1 !important}.mdl-color--light-blue-700{background-color:#0288d1 !important}.mdl-color-text--light-blue-800{color:#0277bd !important}.mdl-color--light-blue-800{background-color:#0277bd !important}.mdl-color-text--light-blue-900{color:#01579b !important}.mdl-color--light-blue-900{background-color:#01579b !important}.mdl-color-text--light-blue-A100{color:#80d8ff !important}.mdl-color--light-blue-A100{background-color:#80d8ff !important}.mdl-color-text--light-blue-A200{color:#40c4ff !important}.mdl-color--light-blue-A200{background-color:#40c4ff !important}.mdl-color-text--light-blue-A400{color:#00b0ff !important}.mdl-color--light-blue-A400{background-color:#00b0ff !important}.mdl-color-text--light-blue-A700{color:#0091ea !important}.mdl-color--light-blue-A700{background-color:#0091ea !important}.mdl-color-text--cyan{color:#00bcd4 !important}.mdl-color--cyan{background-color:#00bcd4 !important}.mdl-color-text--cyan-50{color:#e0f7fa !important}.mdl-color--cyan-50{background-color:#e0f7fa !important}.mdl-color-text--cyan-100{color:#b2ebf2 !important}.mdl-color--cyan-100{background-color:#b2ebf2 !important}.mdl-color-text--cyan-200{color:#80deea !important}.mdl-color--cyan-200{background-color:#80deea !important}.mdl-color-text--cyan-300{color:#4dd0e1 !important}.mdl-color--cyan-300{background-color:#4dd0e1 !important}.mdl-color-text--cyan-400{color:#26c6da !important}.mdl-color--cyan-400{background-color:#26c6da !important}.mdl-color-text--cyan-500{color:#00bcd4 !important}.mdl-color--cyan-500{background-color:#00bcd4 !important}.mdl-color-text--cyan-600{color:#00acc1 !important}.mdl-color--cyan-600{background-color:#00acc1 !important}.mdl-color-text--cyan-700{color:#0097a7 !important}.mdl-color--cyan-700{background-color:#0097a7 !important}.mdl-color-text--cyan-800{color:#00838f !important}.mdl-color--cyan-800{background-color:#00838f !important}.mdl-color-text--cyan-900{color:#006064 !important}.mdl-color--cyan-900{background-color:#006064 !important}.mdl-color-text--cyan-A100{color:#84ffff !important}.mdl-color--cyan-A100{background-color:#84ffff !important}.mdl-color-text--cyan-A200{color:#18ffff !important}.mdl-color--cyan-A200{background-color:#18ffff !important}.mdl-color-text--cyan-A400{color:#00e5ff !important}.mdl-color--cyan-A400{background-color:#00e5ff !important}.mdl-color-text--cyan-A700{color:#00b8d4 !important}.mdl-color--cyan-A700{background-color:#00b8d4 !important}.mdl-color-text--teal{color:#009688 !important}.mdl-color--teal{background-color:#009688 !important}.mdl-color-text--teal-50{color:#e0f2f1 !important}.mdl-color--teal-50{background-color:#e0f2f1 !important}.mdl-color-text--teal-100{color:#b2dfdb !important}.mdl-color--teal-100{background-color:#b2dfdb !important}.mdl-color-text--teal-200{color:#80cbc4 !important}.mdl-color--teal-200{background-color:#80cbc4 !important}.mdl-color-text--teal-300{color:#4db6ac !important}.mdl-color--teal-300{background-color:#4db6ac !important}.mdl-color-text--teal-400{color:#26a69a !important}.mdl-color--teal-400{background-color:#26a69a !important}.mdl-color-text--teal-500{color:#009688 !important}.mdl-color--teal-500{background-color:#009688 !important}.mdl-color-text--teal-600{color:#00897b !important}.mdl-color--teal-600{background-color:#00897b !important}.mdl-color-text--teal-700{color:#00796b !important}.mdl-color--teal-700{background-color:#00796b !important}.mdl-color-text--teal-800{color:#00695c !important}.mdl-color--teal-800{background-color:#00695c !important}.mdl-color-text--teal-900{color:#004d40 !important}.mdl-color--teal-900{background-color:#004d40 !important}.mdl-color-text--teal-A100{color:#a7ffeb !important}.mdl-color--teal-A100{background-color:#a7ffeb !important}.mdl-color-text--teal-A200{color:#64ffda !important}.mdl-color--teal-A200{background-color:#64ffda !important}.mdl-color-text--teal-A400{color:#1de9b6 !important}.mdl-color--teal-A400{background-color:#1de9b6 !important}.mdl-color-text--teal-A700{color:#00bfa5 !important}.mdl-color--teal-A700{background-color:#00bfa5 !important}.mdl-color-text--green{color:#4caf50 !important}.mdl-color--green{background-color:#4caf50 !important}.mdl-color-text--green-50{color:#e8f5e9 !important}.mdl-color--green-50{background-color:#e8f5e9 !important}.mdl-color-text--green-100{color:#c8e6c9 !important}.mdl-color--green-100{background-color:#c8e6c9 !important}.mdl-color-text--green-200{color:#a5d6a7 !important}.mdl-color--green-200{background-color:#a5d6a7 !important}.mdl-color-text--green-300{color:#81c784 !important}.mdl-color--green-300{background-color:#81c784 !important}.mdl-color-text--green-400{color:#66bb6a !important}.mdl-color--green-400{background-color:#66bb6a !important}.mdl-color-text--green-500{color:#4caf50 !important}.mdl-color--green-500{background-color:#4caf50 !important}.mdl-color-text--green-600{color:#43a047 !important}.mdl-color--green-600{background-color:#43a047 !important}.mdl-color-text--green-700{color:#388e3c !important}.mdl-color--green-700{background-color:#388e3c !important}.mdl-color-text--green-800{color:#2e7d32 !important}.mdl-color--green-800{background-color:#2e7d32 !important}.mdl-color-text--green-900{color:#1b5e20 !important}.mdl-color--green-900{background-color:#1b5e20 !important}.mdl-color-text--green-A100{color:#b9f6ca !important}.mdl-color--green-A100{background-color:#b9f6ca !important}.mdl-color-text--green-A200{color:#69f0ae !important}.mdl-color--green-A200{background-color:#69f0ae !important}.mdl-color-text--green-A400{color:#00e676 !important}.mdl-color--green-A400{background-color:#00e676 !important}.mdl-color-text--green-A700{color:#00c853 !important}.mdl-color--green-A700{background-color:#00c853 !important}.mdl-color-text--light-green{color:#8bc34a !important}.mdl-color--light-green{background-color:#8bc34a !important}.mdl-color-text--light-green-50{color:#f1f8e9 !important}.mdl-color--light-green-50{background-color:#f1f8e9 !important}.mdl-color-text--light-green-100{color:#dcedc8 !important}.mdl-color--light-green-100{background-color:#dcedc8 !important}.mdl-color-text--light-green-200{color:#c5e1a5 !important}.mdl-color--light-green-200{background-color:#c5e1a5 !important}.mdl-color-text--light-green-300{color:#aed581 !important}.mdl-color--light-green-300{background-color:#aed581 !important}.mdl-color-text--light-green-400{color:#9ccc65 !important}.mdl-color--light-green-400{background-color:#9ccc65 !important}.mdl-color-text--light-green-500{color:#8bc34a !important}.mdl-color--light-green-500{background-color:#8bc34a !important}.mdl-color-text--light-green-600{color:#7cb342 !important}.mdl-color--light-green-600{background-color:#7cb342 !important}.mdl-color-text--light-green-700{color:#689f38 !important}.mdl-color--light-green-700{background-color:#689f38 !important}.mdl-color-text--light-green-800{color:#558b2f !important}.mdl-color--light-green-800{background-color:#558b2f !important}.mdl-color-text--light-green-900{color:#33691e !important}.mdl-color--light-green-900{background-color:#33691e !important}.mdl-color-text--light-green-A100{color:#ccff90 !important}.mdl-color--light-green-A100{background-color:#ccff90 !important}.mdl-color-text--light-green-A200{color:#b2ff59 !important}.mdl-color--light-green-A200{background-color:#b2ff59 !important}.mdl-color-text--light-green-A400{color:#76ff03 !important}.mdl-color--light-green-A400{background-color:#76ff03 !important}.mdl-color-text--light-green-A700{color:#64dd17 !important}.mdl-color--light-green-A700{background-color:#64dd17 !important}.mdl-color-text--lime{color:#cddc39 !important}.mdl-color--lime{background-color:#cddc39 !important}.mdl-color-text--lime-50{color:#f9fbe7 !important}.mdl-color--lime-50{background-color:#f9fbe7 !important}.mdl-color-text--lime-100{color:#f0f4c3 !important}.mdl-color--lime-100{background-color:#f0f4c3 !important}.mdl-color-text--lime-200{color:#e6ee9c !important}.mdl-color--lime-200{background-color:#e6ee9c !important}.mdl-color-text--lime-300{color:#dce775 !important}.mdl-color--lime-300{background-color:#dce775 !important}.mdl-color-text--lime-400{color:#d4e157 !important}.mdl-color--lime-400{background-color:#d4e157 !important}.mdl-color-text--lime-500{color:#cddc39 !important}.mdl-color--lime-500{background-color:#cddc39 !important}.mdl-color-text--lime-600{color:#c0ca33 !important}.mdl-color--lime-600{background-color:#c0ca33 !important}.mdl-color-text--lime-700{color:#afb42b !important}.mdl-color--lime-700{background-color:#afb42b !important}.mdl-color-text--lime-800{color:#9e9d24 !important}.mdl-color--lime-800{background-color:#9e9d24 !important}.mdl-color-text--lime-900{color:#827717 !important}.mdl-color--lime-900{background-color:#827717 !important}.mdl-color-text--lime-A100{color:#f4ff81 !important}.mdl-color--lime-A100{background-color:#f4ff81 !important}.mdl-color-text--lime-A200{color:#eeff41 !important}.mdl-color--lime-A200{background-color:#eeff41 !important}.mdl-color-text--lime-A400{color:#c6ff00 !important}.mdl-color--lime-A400{background-color:#c6ff00 !important}.mdl-color-text--lime-A700{color:#aeea00 !important}.mdl-color--lime-A700{background-color:#aeea00 !important}.mdl-color-text--yellow{color:#ffeb3b !important}.mdl-color--yellow{background-color:#ffeb3b !important}.mdl-color-text--yellow-50{color:#fffde7 !important}.mdl-color--yellow-50{background-color:#fffde7 !important}.mdl-color-text--yellow-100{color:#fff9c4 !important}.mdl-color--yellow-100{background-color:#fff9c4 !important}.mdl-color-text--yellow-200{color:#fff59d !important}.mdl-color--yellow-200{background-color:#fff59d !important}.mdl-color-text--yellow-300{color:#fff176 !important}.mdl-color--yellow-300{background-color:#fff176 !important}.mdl-color-text--yellow-400{color:#ffee58 !important}.mdl-color--yellow-400{background-color:#ffee58 !important}.mdl-color-text--yellow-500{color:#ffeb3b !important}.mdl-color--yellow-500{background-color:#ffeb3b !important}.mdl-color-text--yellow-600{color:#fdd835 !important}.mdl-color--yellow-600{background-color:#fdd835 !important}.mdl-color-text--yellow-700{color:#fbc02d !important}.mdl-color--yellow-700{background-color:#fbc02d !important}.mdl-color-text--yellow-800{color:#f9a825 !important}.mdl-color--yellow-800{background-color:#f9a825 !important}.mdl-color-text--yellow-900{color:#f57f17 !important}.mdl-color--yellow-900{background-color:#f57f17 !important}.mdl-color-text--yellow-A100{color:#ffff8d !important}.mdl-color--yellow-A100{background-color:#ffff8d !important}.mdl-color-text--yellow-A200{color:#ff0 !important}.mdl-color--yellow-A200{background-color:#ff0 !important}.mdl-color-text--yellow-A400{color:#ffea00 !important}.mdl-color--yellow-A400{background-color:#ffea00 !important}.mdl-color-text--yellow-A700{color:#ffd600 !important}.mdl-color--yellow-A700{background-color:#ffd600 !important}.mdl-color-text--amber{color:#ffc107 !important}.mdl-color--amber{background-color:#ffc107 !important}.mdl-color-text--amber-50{color:#fff8e1 !important}.mdl-color--amber-50{background-color:#fff8e1 !important}.mdl-color-text--amber-100{color:#ffecb3 !important}.mdl-color--amber-100{background-color:#ffecb3 !important}.mdl-color-text--amber-200{color:#ffe082 !important}.mdl-color--amber-200{background-color:#ffe082 !important}.mdl-color-text--amber-300{color:#ffd54f !important}.mdl-color--amber-300{background-color:#ffd54f !important}.mdl-color-text--amber-400{color:#ffca28 !important}.mdl-color--amber-400{background-color:#ffca28 !important}.mdl-color-text--amber-500{color:#ffc107 !important}.mdl-color--amber-500{background-color:#ffc107 !important}.mdl-color-text--amber-600{color:#ffb300 !important}.mdl-color--amber-600{background-color:#ffb300 !important}.mdl-color-text--amber-700{color:#ffa000 !important}.mdl-color--amber-700{background-color:#ffa000 !important}.mdl-color-text--amber-800{color:#ff8f00 !important}.mdl-color--amber-800{background-color:#ff8f00 !important}.mdl-color-text--amber-900{color:#ff6f00 !important}.mdl-color--amber-900{background-color:#ff6f00 !important}.mdl-color-text--amber-A100{color:#ffe57f !important}.mdl-color--amber-A100{background-color:#ffe57f !important}.mdl-color-text--amber-A200{color:#ffd740 !important}.mdl-color--amber-A200{background-color:#ffd740 !important}.mdl-color-text--amber-A400{color:#ffc400 !important}.mdl-color--amber-A400{background-color:#ffc400 !important}.mdl-color-text--amber-A700{color:#ffab00 !important}.mdl-color--amber-A700{background-color:#ffab00 !important}.mdl-color-text--orange{color:#ff9800 !important}.mdl-color--orange{background-color:#ff9800 !important}.mdl-color-text--orange-50{color:#fff3e0 !important}.mdl-color--orange-50{background-color:#fff3e0 !important}.mdl-color-text--orange-100{color:#ffe0b2 !important}.mdl-color--orange-100{background-color:#ffe0b2 !important}.mdl-color-text--orange-200{color:#ffcc80 !important}.mdl-color--orange-200{background-color:#ffcc80 !important}.mdl-color-text--orange-300{color:#ffb74d !important}.mdl-color--orange-300{background-color:#ffb74d !important}.mdl-color-text--orange-400{color:#ffa726 !important}.mdl-color--orange-400{background-color:#ffa726 !important}.mdl-color-text--orange-500{color:#ff9800 !important}.mdl-color--orange-500{background-color:#ff9800 !important}.mdl-color-text--orange-600{color:#fb8c00 !important}.mdl-color--orange-600{background-color:#fb8c00 !important}.mdl-color-text--orange-700{color:#f57c00 !important}.mdl-color--orange-700{background-color:#f57c00 !important}.mdl-color-text--orange-800{color:#ef6c00 !important}.mdl-color--orange-800{background-color:#ef6c00 !important}.mdl-color-text--orange-900{color:#e65100 !important}.mdl-color--orange-900{background-color:#e65100 !important}.mdl-color-text--orange-A100{color:#ffd180 !important}.mdl-color--orange-A100{background-color:#ffd180 !important}.mdl-color-text--orange-A200{color:#ffab40 !important}.mdl-color--orange-A200{background-color:#ffab40 !important}.mdl-color-text--orange-A400{color:#ff9100 !important}.mdl-color--orange-A400{background-color:#ff9100 !important}.mdl-color-text--orange-A700{color:#ff6d00 !important}.mdl-color--orange-A700{background-color:#ff6d00 !important}.mdl-color-text--deep-orange{color:#ff5722 !important}.mdl-color--deep-orange{background-color:#ff5722 !important}.mdl-color-text--deep-orange-50{color:#fbe9e7 !important}.mdl-color--deep-orange-50{background-color:#fbe9e7 !important}.mdl-color-text--deep-orange-100{color:#ffccbc !important}.mdl-color--deep-orange-100{background-color:#ffccbc !important}.mdl-color-text--deep-orange-200{color:#ffab91 !important}.mdl-color--deep-orange-200{background-color:#ffab91 !important}.mdl-color-text--deep-orange-300{color:#ff8a65 !important}.mdl-color--deep-orange-300{background-color:#ff8a65 !important}.mdl-color-text--deep-orange-400{color:#ff7043 !important}.mdl-color--deep-orange-400{background-color:#ff7043 !important}.mdl-color-text--deep-orange-500{color:#ff5722 !important}.mdl-color--deep-orange-500{background-color:#ff5722 !important}.mdl-color-text--deep-orange-600{color:#f4511e !important}.mdl-color--deep-orange-600{background-color:#f4511e !important}.mdl-color-text--deep-orange-700{color:#e64a19 !important}.mdl-color--deep-orange-700{background-color:#e64a19 !important}.mdl-color-text--deep-orange-800{color:#d84315 !important}.mdl-color--deep-orange-800{background-color:#d84315 !important}.mdl-color-text--deep-orange-900{color:#bf360c !important}.mdl-color--deep-orange-900{background-color:#bf360c !important}.mdl-color-text--deep-orange-A100{color:#ff9e80 !important}.mdl-color--deep-orange-A100{background-color:#ff9e80 !important}.mdl-color-text--deep-orange-A200{color:#ff6e40 !important}.mdl-color--deep-orange-A200{background-color:#ff6e40 !important}.mdl-color-text--deep-orange-A400{color:#ff3d00 !important}.mdl-color--deep-orange-A400{background-color:#ff3d00 !important}.mdl-color-text--deep-orange-A700{color:#dd2c00 !important}.mdl-color--deep-orange-A700{background-color:#dd2c00 !important}.mdl-color-text--brown{color:#795548 !important}.mdl-color--brown{background-color:#795548 !important}.mdl-color-text--brown-50{color:#efebe9 !important}.mdl-color--brown-50{background-color:#efebe9 !important}.mdl-color-text--brown-100{color:#d7ccc8 !important}.mdl-color--brown-100{background-color:#d7ccc8 !important}.mdl-color-text--brown-200{color:#bcaaa4 !important}.mdl-color--brown-200{background-color:#bcaaa4 !important}.mdl-color-text--brown-300{color:#a1887f !important}.mdl-color--brown-300{background-color:#a1887f !important}.mdl-color-text--brown-400{color:#8d6e63 !important}.mdl-color--brown-400{background-color:#8d6e63 !important}.mdl-color-text--brown-500{color:#795548 !important}.mdl-color--brown-500{background-color:#795548 !important}.mdl-color-text--brown-600{color:#6d4c41 !important}.mdl-color--brown-600{background-color:#6d4c41 !important}.mdl-color-text--brown-700{color:#5d4037 !important}.mdl-color--brown-700{background-color:#5d4037 !important}.mdl-color-text--brown-800{color:#4e342e !important}.mdl-color--brown-800{background-color:#4e342e !important}.mdl-color-text--brown-900{color:#3e2723 !important}.mdl-color--brown-900{background-color:#3e2723 !important}.mdl-color-text--grey{color:#9e9e9e !important}.mdl-color--grey{background-color:#9e9e9e !important}.mdl-color-text--grey-50{color:#fafafa !important}.mdl-color--grey-50{background-color:#fafafa !important}.mdl-color-text--grey-100{color:#f5f5f5 !important}.mdl-color--grey-100{background-color:#f5f5f5 !important}.mdl-color-text--grey-200{color:#eee !important}.mdl-color--grey-200{background-color:#eee !important}.mdl-color-text--grey-300{color:#e0e0e0 !important}.mdl-color--grey-300{background-color:#e0e0e0 !important}.mdl-color-text--grey-400{color:#bdbdbd !important}.mdl-color--grey-400{background-color:#bdbdbd !important}.mdl-color-text--grey-500{color:#9e9e9e !important}.mdl-color--grey-500{background-color:#9e9e9e !important}.mdl-color-text--grey-600{color:#757575 !important}.mdl-color--grey-600{background-color:#757575 !important}.mdl-color-text--grey-700{color:#616161 !important}.mdl-color--grey-700{background-color:#616161 !important}.mdl-color-text--grey-800{color:#424242 !important}.mdl-color--grey-800{background-color:#424242 !important}.mdl-color-text--grey-900{color:#212121 !important}.mdl-color--grey-900{background-color:#212121 !important}.mdl-color-text--blue-grey{color:#607d8b !important}.mdl-color--blue-grey{background-color:#607d8b !important}.mdl-color-text--blue-grey-50{color:#eceff1 !important}.mdl-color--blue-grey-50{background-color:#eceff1 !important}.mdl-color-text--blue-grey-100{color:#cfd8dc !important}.mdl-color--blue-grey-100{background-color:#cfd8dc !important}.mdl-color-text--blue-grey-200{color:#b0bec5 !important}.mdl-color--blue-grey-200{background-color:#b0bec5 !important}.mdl-color-text--blue-grey-300{color:#90a4ae !important}.mdl-color--blue-grey-300{background-color:#90a4ae !important}.mdl-color-text--blue-grey-400{color:#78909c !important}.mdl-color--blue-grey-400{background-color:#78909c !important}.mdl-color-text--blue-grey-500{color:#607d8b !important}.mdl-color--blue-grey-500{background-color:#607d8b !important}.mdl-color-text--blue-grey-600{color:#546e7a !important}.mdl-color--blue-grey-600{background-color:#546e7a !important}.mdl-color-text--blue-grey-700{color:#455a64 !important}.mdl-color--blue-grey-700{background-color:#455a64 !important}.mdl-color-text--blue-grey-800{color:#37474f !important}.mdl-color--blue-grey-800{background-color:#37474f !important}.mdl-color-text--blue-grey-900{color:#263238 !important}.mdl-color--blue-grey-900{background-color:#263238 !important}.mdl-color--black{background-color:#000 !important}.mdl-color-text--black{color:#000 !important}.mdl-color--white{background-color:#fff !important}.mdl-color-text--white{color:#fff !important}.mdl-color--primary{background-color:rgb(158,158,158)!important}.mdl-color--primary-contrast{background-color:rgb(66,66,66)!important}.mdl-color--primary-dark{background-color:rgb(97,97,97)!important}.mdl-color--accent{background-color:rgb(255,110,64)!important}.mdl-color--accent-contrast{background-color:rgb(66,66,66)!important}.mdl-color-text--primary{color:rgb(158,158,158)!important}.mdl-color-text--primary-contrast{color:rgb(66,66,66)!important}.mdl-color-text--primary-dark{color:rgb(97,97,97)!important}.mdl-color-text--accent{color:rgb(255,110,64)!important}.mdl-color-text--accent-contrast{color:rgb(66,66,66)!important}.mdl-ripple{background:#000;border-radius:50%;height:50px;left:0;opacity:0;pointer-events:none;position:absolute;top:0;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:50px;overflow:hidden}.mdl-ripple.is-animating{-webkit-transition:-webkit-transform .3s cubic-bezier(0,0,.2,1),width .3s cubic-bezier(0,0,.2,1),height .3s cubic-bezier(0,0,.2,1),opacity .6s cubic-bezier(0,0,.2,1);transition:transform .3s cubic-bezier(0,0,.2,1),width .3s cubic-bezier(0,0,.2,1),height .3s cubic-bezier(0,0,.2,1),opacity .6s cubic-bezier(0,0,.2,1)}.mdl-ripple.is-visible{opacity:.3}.mdl-animation--default,.mdl-animation--fast-out-slow-in{-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-animation--linear-out-slow-in{-webkit-transition-timing-function:cubic-bezier(0,0,.2,1);transition-timing-function:cubic-bezier(0,0,.2,1)}.mdl-animation--fast-out-linear-in{-webkit-transition-timing-function:cubic-bezier(.4,0,1,1);transition-timing-function:cubic-bezier(.4,0,1,1)}.mdl-badge{position:relative;white-space:nowrap;margin-right:24px}.mdl-badge:not([data-badge]){margin-right:auto}.mdl-badge[data-badge]:after{content:attr(data-badge);display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-content:center;-ms-flex-line-pack:center;align-content:center;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;position:absolute;top:-11px;right:-24px;font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:600;font-size:12px;width:22px;height:22px;border-radius:50%;background:rgb(255,110,64);color:#fff}.mdl-button .mdl-badge[data-badge]:after{top:-10px;right:-5px}.mdl-badge.mdl-badge--no-background[data-badge]:after{color:rgb(255,110,64);background:rgba(255,255,255,.2);box-shadow:0 0 1px gray}.mdl-button{background:0 0;border:none;border-radius:2px;color:#000;position:relative;height:36px;min-width:64px;padding:0 8px;display:inline-block;font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;text-transform:uppercase;letter-spacing:0;overflow:hidden;will-change:box-shadow,transform;-webkit-transition:box-shadow .2s cubic-bezier(.4,0,1,1),background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1);transition:box-shadow .2s cubic-bezier(.4,0,1,1),background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1);outline:none;cursor:pointer;text-decoration:none;text-align:center;line-height:36px;vertical-align:middle}.mdl-button::-moz-focus-inner{border:0}.mdl-button:hover{background-color:rgba(158,158,158,.2)}.mdl-button:focus:not(:active){background-color:rgba(0,0,0,.12)}.mdl-button:active{background-color:rgba(158,158,158,.4)}.mdl-button.mdl-button--colored{color:rgb(158,158,158)}.mdl-button.mdl-button--colored:focus:not(:active){background-color:rgba(0,0,0,.12)}input.mdl-button[type="submit"]{-webkit-appearance:none}.mdl-button--raised{background:rgba(158,158,158,.2);box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-button--raised:active{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2);background-color:rgba(158,158,158,.4)}.mdl-button--raised:focus:not(:active){box-shadow:0 0 8px rgba(0,0,0,.18),0 8px 16px rgba(0,0,0,.36);background-color:rgba(158,158,158,.4)}.mdl-button--raised.mdl-button--colored{background:rgb(158,158,158);color:rgb(66,66,66)}.mdl-button--raised.mdl-button--colored:hover{background-color:rgb(158,158,158)}.mdl-button--raised.mdl-button--colored:active{background-color:rgb(158,158,158)}.mdl-button--raised.mdl-button--colored:focus:not(:active){background-color:rgb(158,158,158)}.mdl-button--raised.mdl-button--colored .mdl-ripple{background:rgb(66,66,66)}.mdl-button--fab{border-radius:50%;font-size:24px;height:56px;margin:auto;min-width:56px;width:56px;padding:0;overflow:hidden;background:rgba(158,158,158,.2);box-shadow:0 1px 1.5px 0 rgba(0,0,0,.12),0 1px 1px 0 rgba(0,0,0,.24);position:relative;line-height:normal}.mdl-button--fab .material-icons{position:absolute;top:50%;left:50%;-webkit-transform:translate(-12px,-12px);-ms-transform:translate(-12px,-12px);transform:translate(-12px,-12px);line-height:24px;width:24px}.mdl-button--fab.mdl-button--mini-fab{height:40px;min-width:40px;width:40px}.mdl-button--fab .mdl-button__ripple-container{border-radius:50%;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-button--fab:active{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2);background-color:rgba(158,158,158,.4)}.mdl-button--fab:focus:not(:active){box-shadow:0 0 8px rgba(0,0,0,.18),0 8px 16px rgba(0,0,0,.36);background-color:rgba(158,158,158,.4)}.mdl-button--fab.mdl-button--colored{background:rgb(255,110,64);color:rgb(66,66,66)}.mdl-button--fab.mdl-button--colored:hover{background-color:rgb(255,110,64)}.mdl-button--fab.mdl-button--colored:focus:not(:active){background-color:rgb(255,110,64)}.mdl-button--fab.mdl-button--colored:active{background-color:rgb(255,110,64)}.mdl-button--fab.mdl-button--colored .mdl-ripple{background:rgb(66,66,66)}.mdl-button--icon{border-radius:50%;font-size:24px;height:32px;margin-left:0;margin-right:0;min-width:32px;width:32px;padding:0;overflow:hidden;color:inherit;line-height:normal}.mdl-button--icon .material-icons{position:absolute;top:50%;left:50%;-webkit-transform:translate(-12px,-12px);-ms-transform:translate(-12px,-12px);transform:translate(-12px,-12px);line-height:24px;width:24px}.mdl-button--icon.mdl-button--mini-icon{height:24px;min-width:24px;width:24px}.mdl-button--icon.mdl-button--mini-icon .material-icons{top:0;left:0}.mdl-button--icon .mdl-button__ripple-container{border-radius:50%;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-button__ripple-container{display:block;height:100%;left:0;position:absolute;top:0;width:100%;z-index:0;overflow:hidden}.mdl-button[disabled] .mdl-button__ripple-container .mdl-ripple,.mdl-button.mdl-button--disabled .mdl-button__ripple-container .mdl-ripple{background-color:transparent}.mdl-button--primary.mdl-button--primary{color:rgb(158,158,158)}.mdl-button--primary.mdl-button--primary .mdl-ripple{background:rgb(66,66,66)}.mdl-button--primary.mdl-button--primary.mdl-button--raised,.mdl-button--primary.mdl-button--primary.mdl-button--fab{color:rgb(66,66,66);background-color:rgb(158,158,158)}.mdl-button--accent.mdl-button--accent{color:rgb(255,110,64)}.mdl-button--accent.mdl-button--accent .mdl-ripple{background:rgb(66,66,66)}.mdl-button--accent.mdl-button--accent.mdl-button--raised,.mdl-button--accent.mdl-button--accent.mdl-button--fab{color:rgb(66,66,66);background-color:rgb(255,110,64)}.mdl-button[disabled][disabled],.mdl-button.mdl-button--disabled.mdl-button--disabled{color:rgba(0,0,0,.26);cursor:auto;background-color:transparent}.mdl-button--fab[disabled][disabled],.mdl-button--fab.mdl-button--disabled.mdl-button--disabled,.mdl-button--raised[disabled][disabled],.mdl-button--raised.mdl-button--disabled.mdl-button--disabled{background-color:rgba(0,0,0,.12);color:rgba(0,0,0,.26);box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-button--colored[disabled][disabled],.mdl-button--colored.mdl-button--disabled.mdl-button--disabled{color:rgba(0,0,0,.26)}.mdl-button .material-icons{vertical-align:middle}.mdl-card{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;font-size:16px;font-weight:400;min-height:200px;overflow:hidden;width:330px;z-index:1;position:relative;background:#fff;border-radius:2px;box-sizing:border-box}.mdl-card__media{background-color:rgb(255,110,64);background-repeat:repeat;background-position:50% 50%;background-size:cover;background-origin:padding-box;background-attachment:scroll;box-sizing:border-box}.mdl-card__title{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;color:#000;display:block;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:stretch;-webkit-justify-content:stretch;-ms-flex-pack:stretch;justify-content:stretch;line-height:normal;padding:16px;-webkit-perspective-origin:165px 56px;perspective-origin:165px 56px;-webkit-transform-origin:165px 56px;-ms-transform-origin:165px 56px;transform-origin:165px 56px;box-sizing:border-box}.mdl-card__title.mdl-card--border{border-bottom:1px solid rgba(0,0,0,.1)}.mdl-card__title-text{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end;color:inherit;display:block;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;font-size:24px;font-weight:300;line-height:normal;overflow:hidden;-webkit-transform-origin:149px 48px;-ms-transform-origin:149px 48px;transform-origin:149px 48px;margin:0}.mdl-card__subtitle-text{font-size:14px;color:grey;margin:0}.mdl-card__supporting-text{color:rgba(0,0,0,.54);font-size:13px;line-height:18px;overflow:hidden;padding:16px;width:90%}.mdl-card__actions{font-size:16px;line-height:normal;width:100%;background-color:transparent;padding:8px;box-sizing:border-box}.mdl-card__actions.mdl-card--border{border-top:1px solid rgba(0,0,0,.1)}.mdl-card--expand{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.mdl-card__menu{position:absolute;right:16px;top:16px}.mdl-checkbox{position:relative;z-index:1;vertical-align:middle;display:inline-block;box-sizing:border-box;width:100%;height:24px;margin:0;padding:0}.mdl-checkbox.is-upgraded{padding-left:24px}.mdl-checkbox__input{line-height:24px}.mdl-checkbox.is-upgraded .mdl-checkbox__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-checkbox__box-outline{position:absolute;top:3px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;margin:0;cursor:pointer;overflow:hidden;border:2px solid rgba(0,0,0,.54);border-radius:2px;z-index:2}.mdl-checkbox.is-checked .mdl-checkbox__box-outline{border:2px solid rgb(158,158,158)}.mdl-checkbox.is-disabled .mdl-checkbox__box-outline{border:2px solid rgba(0,0,0,.26);cursor:auto}.mdl-checkbox__focus-helper{position:absolute;top:3px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;border-radius:50%;background-color:transparent}.mdl-checkbox.is-focused .mdl-checkbox__focus-helper{box-shadow:0 0 0 8px rgba(0,0,0,.1);background-color:rgba(0,0,0,.1)}.mdl-checkbox.is-focused.is-checked .mdl-checkbox__focus-helper{box-shadow:0 0 0 8px rgba(158,158,158,.26);background-color:rgba(158,158,158,.26)}.mdl-checkbox__tick-outline{position:absolute;top:0;left:0;height:100%;width:100%;-webkit-mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8ZGVmcz4KICAgIDxjbGlwUGF0aCBpZD0iY2xpcCI+CiAgICAgIDxwYXRoCiAgICAgICAgIGQ9Ik0gMCwwIDAsMSAxLDEgMSwwIDAsMCB6IE0gMC44NTM0Mzc1LDAuMTY3MTg3NSAwLjk1OTY4NzUsMC4yNzMxMjUgMC40MjkzNzUsMC44MDM0Mzc1IDAuMzIzMTI1LDAuOTA5Njg3NSAwLjIxNzE4NzUsMC44MDM0Mzc1IDAuMDQwMzEyNSwwLjYyNjg3NSAwLjE0NjU2MjUsMC41MjA2MjUgMC4zMjMxMjUsMC42OTc1IDAuODUzNDM3NSwwLjE2NzE4NzUgeiIKICAgICAgICAgc3R5bGU9ImZpbGw6I2ZmZmZmZjtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KICAgIDwvY2xpcFBhdGg+CiAgICA8bWFzayBpZD0ibWFzayIgbWFza1VuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgbWFza0NvbnRlbnRVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giPgogICAgICA8cGF0aAogICAgICAgICBkPSJNIDAsMCAwLDEgMSwxIDEsMCAwLDAgeiBNIDAuODUzNDM3NSwwLjE2NzE4NzUgMC45NTk2ODc1LDAuMjczMTI1IDAuNDI5Mzc1LDAuODAzNDM3NSAwLjMyMzEyNSwwLjkwOTY4NzUgMC4yMTcxODc1LDAuODAzNDM3NSAwLjA0MDMxMjUsMC42MjY4NzUgMC4xNDY1NjI1LDAuNTIwNjI1IDAuMzIzMTI1LDAuNjk3NSAwLjg1MzQzNzUsMC4xNjcxODc1IHoiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmUiIC8+CiAgICA8L21hc2s+CiAgPC9kZWZzPgogIDxyZWN0CiAgICAgd2lkdGg9IjEiCiAgICAgaGVpZ2h0PSIxIgogICAgIHg9IjAiCiAgICAgeT0iMCIKICAgICBjbGlwLXBhdGg9InVybCgjY2xpcCkiCiAgICAgc3R5bGU9ImZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KPC9zdmc+Cg==");mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8ZGVmcz4KICAgIDxjbGlwUGF0aCBpZD0iY2xpcCI+CiAgICAgIDxwYXRoCiAgICAgICAgIGQ9Ik0gMCwwIDAsMSAxLDEgMSwwIDAsMCB6IE0gMC44NTM0Mzc1LDAuMTY3MTg3NSAwLjk1OTY4NzUsMC4yNzMxMjUgMC40MjkzNzUsMC44MDM0Mzc1IDAuMzIzMTI1LDAuOTA5Njg3NSAwLjIxNzE4NzUsMC44MDM0Mzc1IDAuMDQwMzEyNSwwLjYyNjg3NSAwLjE0NjU2MjUsMC41MjA2MjUgMC4zMjMxMjUsMC42OTc1IDAuODUzNDM3NSwwLjE2NzE4NzUgeiIKICAgICAgICAgc3R5bGU9ImZpbGw6I2ZmZmZmZjtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KICAgIDwvY2xpcFBhdGg+CiAgICA8bWFzayBpZD0ibWFzayIgbWFza1VuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgbWFza0NvbnRlbnRVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giPgogICAgICA8cGF0aAogICAgICAgICBkPSJNIDAsMCAwLDEgMSwxIDEsMCAwLDAgeiBNIDAuODUzNDM3NSwwLjE2NzE4NzUgMC45NTk2ODc1LDAuMjczMTI1IDAuNDI5Mzc1LDAuODAzNDM3NSAwLjMyMzEyNSwwLjkwOTY4NzUgMC4yMTcxODc1LDAuODAzNDM3NSAwLjA0MDMxMjUsMC42MjY4NzUgMC4xNDY1NjI1LDAuNTIwNjI1IDAuMzIzMTI1LDAuNjk3NSAwLjg1MzQzNzUsMC4xNjcxODc1IHoiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmUiIC8+CiAgICA8L21hc2s+CiAgPC9kZWZzPgogIDxyZWN0CiAgICAgd2lkdGg9IjEiCiAgICAgaGVpZ2h0PSIxIgogICAgIHg9IjAiCiAgICAgeT0iMCIKICAgICBjbGlwLXBhdGg9InVybCgjY2xpcCkiCiAgICAgc3R5bGU9ImZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KPC9zdmc+Cg==");background:0 0;-webkit-transition-duration:.28s;transition-duration:.28s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:background;transition-property:background}.mdl-checkbox.is-checked .mdl-checkbox__tick-outline{background:rgb(158,158,158)url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8cGF0aAogICAgIGQ9Ik0gMC4wNDAzODA1OSwwLjYyNjc3NjcgMC4xNDY0NDY2MSwwLjUyMDcxMDY4IDAuNDI5Mjg5MzIsMC44MDM1NTMzOSAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IE0gMC4yMTcxNTcyOSwwLjgwMzU1MzM5IDAuODUzNTUzMzksMC4xNjcxNTcyOSAwLjk1OTYxOTQxLDAuMjczMjIzMyAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IgogICAgIGlkPSJyZWN0Mzc4MCIKICAgICBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lIiAvPgo8L3N2Zz4K")}.mdl-checkbox.is-checked.is-disabled .mdl-checkbox__tick-outline{background:rgba(0,0,0,.26)url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8cGF0aAogICAgIGQ9Ik0gMC4wNDAzODA1OSwwLjYyNjc3NjcgMC4xNDY0NDY2MSwwLjUyMDcxMDY4IDAuNDI5Mjg5MzIsMC44MDM1NTMzOSAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IE0gMC4yMTcxNTcyOSwwLjgwMzU1MzM5IDAuODUzNTUzMzksMC4xNjcxNTcyOSAwLjk1OTYxOTQxLDAuMjczMjIzMyAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IgogICAgIGlkPSJyZWN0Mzc4MCIKICAgICBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lIiAvPgo8L3N2Zz4K")}.mdl-checkbox__label{position:relative;cursor:pointer;font-size:16px;line-height:24px;margin:0}.mdl-checkbox.is-disabled .mdl-checkbox__label{color:rgba(0,0,0,.26);cursor:auto}.mdl-checkbox__ripple-container{position:absolute;z-index:2;top:-6px;left:-10px;box-sizing:border-box;width:36px;height:36px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-checkbox__ripple-container .mdl-ripple{background:rgb(158,158,158)}.mdl-checkbox.is-disabled .mdl-checkbox__ripple-container{cursor:auto}.mdl-checkbox.is-disabled .mdl-checkbox__ripple-container .mdl-ripple{background:0 0}.mdl-data-table{position:relative;border:1px solid rgba(0,0,0,.12);border-collapse:collapse;white-space:nowrap;font-size:13px;background-color:#fff}.mdl-data-table thead{padding-bottom:3px}.mdl-data-table thead .mdl-data-table__select{margin-top:0}.mdl-data-table tbody tr{position:relative;height:48px;-webkit-transition-duration:.28s;transition-duration:.28s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:background-color;transition-property:background-color}.mdl-data-table tbody tr.is-selected{background-color:#e0e0e0}.mdl-data-table tbody tr:hover{background-color:#eee}.mdl-data-table td{text-align:right}.mdl-data-table th{padding:0 18px 0 18px;text-align:right}.mdl-data-table td:first-of-type,.mdl-data-table th:first-of-type{padding-left:24px}.mdl-data-table td:last-of-type,.mdl-data-table th:last-of-type{padding-right:24px}.mdl-data-table td{position:relative;vertical-align:top;height:48px;border-top:1px solid rgba(0,0,0,.12);border-bottom:1px solid rgba(0,0,0,.12);padding:12px 18px 0;box-sizing:border-box}.mdl-data-table td .mdl-data-table__select{vertical-align:top;position:absolute;left:24px}.mdl-data-table th{position:relative;vertical-align:bottom;text-overflow:ellipsis;font-weight:700;line-height:24px;letter-spacing:0;height:48px;font-size:12px;color:rgba(0,0,0,.54);padding-bottom:8px;box-sizing:border-box}.mdl-data-table th .mdl-data-table__select{position:absolute;bottom:8px;left:24px}.mdl-data-table__select{width:16px}.mdl-data-table__cell--non-numeric.mdl-data-table__cell--non-numeric{text-align:left}.mdl-mega-footer{padding:16px 40px;color:#9e9e9e;background-color:#424242}.mdl-mega-footer--top-section:after,.mdl-mega-footer--middle-section:after,.mdl-mega-footer--bottom-section:after,.mdl-mega-footer__top-section:after,.mdl-mega-footer__middle-section:after,.mdl-mega-footer__bottom-section:after{content:'';display:block;clear:both}.mdl-mega-footer--left-section,.mdl-mega-footer__left-section,.mdl-mega-footer--right-section,.mdl-mega-footer__right-section{margin-bottom:16px}.mdl-mega-footer--right-section a,.mdl-mega-footer__right-section a{display:block;margin-bottom:16px;color:inherit;text-decoration:none}@media screen and (min-width:760px){.mdl-mega-footer--left-section,.mdl-mega-footer__left-section{float:left}.mdl-mega-footer--right-section,.mdl-mega-footer__right-section{float:right}.mdl-mega-footer--right-section a,.mdl-mega-footer__right-section a{display:inline-block;margin-left:16px;line-height:36px;vertical-align:middle}}.mdl-mega-footer--social-btn,.mdl-mega-footer__social-btn{width:36px;height:36px;padding:0;margin:0;background-color:#9e9e9e;border:none}.mdl-mega-footer--drop-down-section,.mdl-mega-footer__drop-down-section{display:block;position:relative}@media screen and (min-width:760px){.mdl-mega-footer--drop-down-section,.mdl-mega-footer__drop-down-section{width:33%}.mdl-mega-footer--drop-down-section:nth-child(1),.mdl-mega-footer--drop-down-section:nth-child(2),.mdl-mega-footer__drop-down-section:nth-child(1),.mdl-mega-footer__drop-down-section:nth-child(2){float:left}.mdl-mega-footer--drop-down-section:nth-child(3),.mdl-mega-footer__drop-down-section:nth-child(3){float:right}.mdl-mega-footer--drop-down-section:nth-child(3):after,.mdl-mega-footer__drop-down-section:nth-child(3):after{clear:right}.mdl-mega-footer--drop-down-section:nth-child(4),.mdl-mega-footer__drop-down-section:nth-child(4){clear:right;float:right}.mdl-mega-footer--middle-section:after,.mdl-mega-footer__middle-section:after{content:'';display:block;clear:both}.mdl-mega-footer--bottom-section,.mdl-mega-footer__bottom-section{padding-top:0}}@media screen and (min-width:1024px){.mdl-mega-footer--drop-down-section,.mdl-mega-footer--drop-down-section:nth-child(3),.mdl-mega-footer--drop-down-section:nth-child(4),.mdl-mega-footer__drop-down-section,.mdl-mega-footer__drop-down-section:nth-child(3),.mdl-mega-footer__drop-down-section:nth-child(4){width:24%;float:left}}.mdl-mega-footer--heading-checkbox,.mdl-mega-footer__heading-checkbox{position:absolute;width:100%;height:55.8px;padding:32px;margin:-16px 0 0;cursor:pointer;z-index:1;opacity:0}.mdl-mega-footer--heading-checkbox~.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox~.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox~.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox~.mdl-mega-footer__heading:after{font-family:'Material Icons';content:'\E5CE'}.mdl-mega-footer--heading-checkbox:checked~ul,.mdl-mega-footer__heading-checkbox:checked~ul{display:none}.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer__heading:after{font-family:'Material Icons';content:'\E5CF'}.mdl-mega-footer--heading,.mdl-mega-footer__heading{position:relative;width:100%;padding-right:39.8px;margin-bottom:16px;box-sizing:border-box;font-size:14px;line-height:23.8px;font-weight:500;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;color:#e0e0e0}.mdl-mega-footer--heading:after,.mdl-mega-footer__heading:after{content:'';position:absolute;top:0;right:0;display:block;width:23.8px;height:23.8px;background-size:cover}.mdl-mega-footer--link-list,.mdl-mega-footer__link-list{list-style:none;padding:0;margin:0 0 32px}.mdl-mega-footer--link-list:after,.mdl-mega-footer__link-list:after{clear:both;display:block;content:''}.mdl-mega-footer--link-list li,.mdl-mega-footer__link-list li{font-size:14px;font-weight:400;letter-spacing:0;line-height:20px}.mdl-mega-footer--link-list a,.mdl-mega-footer__link-list a{color:inherit;text-decoration:none;white-space:nowrap}@media screen and (min-width:760px){.mdl-mega-footer--heading-checkbox,.mdl-mega-footer__heading-checkbox{display:none}.mdl-mega-footer--heading-checkbox~.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox~.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox~.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox~.mdl-mega-footer__heading:after{background-image:none}.mdl-mega-footer--heading-checkbox:checked~ul,.mdl-mega-footer__heading-checkbox:checked~ul{display:block}.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer__heading:after{content:''}}.mdl-mega-footer--bottom-section,.mdl-mega-footer__bottom-section{padding-top:16px;margin-bottom:16px}.mdl-logo{margin-bottom:16px;color:#fff}.mdl-mega-footer--bottom-section .mdl-mega-footer--link-list li,.mdl-mega-footer__bottom-section .mdl-mega-footer__link-list li{float:left;margin-bottom:0;margin-right:16px}@media screen and (min-width:760px){.mdl-logo{float:left;margin-bottom:0;margin-right:16px}}.mdl-mini-footer{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:32px 16px;color:#9e9e9e;background-color:#424242}.mdl-mini-footer:after{content:'';display:block}.mdl-mini-footer .mdl-logo{line-height:36px}.mdl-mini-footer--link-list,.mdl-mini-footer__link-list{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap;list-style:none;margin:0;padding:0}.mdl-mini-footer--link-list li,.mdl-mini-footer__link-list li{margin-bottom:0;margin-right:16px}@media screen and (min-width:760px){.mdl-mini-footer--link-list li,.mdl-mini-footer__link-list li{line-height:36px}}.mdl-mini-footer--link-list a,.mdl-mini-footer__link-list a{color:inherit;text-decoration:none;white-space:nowrap}.mdl-mini-footer--left-section,.mdl-mini-footer__left-section{display:inline-block;-webkit-box-ordinal-group:1;-webkit-order:0;-ms-flex-order:0;order:0}.mdl-mini-footer--right-section,.mdl-mini-footer__right-section{display:inline-block;-webkit-box-ordinal-group:2;-webkit-order:1;-ms-flex-order:1;order:1}.mdl-mini-footer--social-btn,.mdl-mini-footer__social-btn{width:36px;height:36px;padding:0;margin:0;background-color:#9e9e9e;border:none}.mdl-icon-toggle{position:relative;z-index:1;vertical-align:middle;display:inline-block;height:32px;margin:0;padding:0}.mdl-icon-toggle__input{line-height:32px}.mdl-icon-toggle.is-upgraded .mdl-icon-toggle__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-icon-toggle__label{display:inline-block;position:relative;cursor:pointer;height:32px;width:32px;min-width:32px;color:#616161;border-radius:50%;padding:0;margin-left:0;margin-right:0;text-align:center;background-color:transparent;will-change:background-color;-webkit-transition:background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1);transition:background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1)}.mdl-icon-toggle__label.material-icons{line-height:32px;font-size:24px}.mdl-icon-toggle.is-checked .mdl-icon-toggle__label{color:rgb(158,158,158)}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__label{color:rgba(0,0,0,.26);cursor:auto;-webkit-transition:none;transition:none}.mdl-icon-toggle.is-focused .mdl-icon-toggle__label{background-color:rgba(0,0,0,.12)}.mdl-icon-toggle.is-focused.is-checked .mdl-icon-toggle__label{background-color:rgba(158,158,158,.26)}.mdl-icon-toggle__ripple-container{position:absolute;z-index:2;top:-2px;left:-2px;box-sizing:border-box;width:36px;height:36px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-icon-toggle__ripple-container .mdl-ripple{background:#616161}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__ripple-container{cursor:auto}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__ripple-container .mdl-ripple{background:0 0}.mdl-menu__container{display:block;margin:0;padding:0;border:none;position:absolute;overflow:visible;height:0;width:0;visibility:hidden;z-index:-1}.mdl-menu__container.is-visible,.mdl-menu__container.is-animating{z-index:999;visibility:visible}.mdl-menu__outline{display:block;background:#fff;margin:0;padding:0;border:none;border-radius:2px;position:absolute;top:0;left:0;overflow:hidden;opacity:0;-webkit-transform:scale(0);-ms-transform:scale(0);transform:scale(0);-webkit-transform-origin:0 0;-ms-transform-origin:0 0;transform-origin:0 0;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);will-change:transform;-webkit-transition:-webkit-transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1);transition:transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1);z-index:-1}.mdl-menu__container.is-visible .mdl-menu__outline{opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1);z-index:999}.mdl-menu__outline.mdl-menu--bottom-right{-webkit-transform-origin:100% 0;-ms-transform-origin:100% 0;transform-origin:100% 0}.mdl-menu__outline.mdl-menu--top-left{-webkit-transform-origin:0 100%;-ms-transform-origin:0 100%;transform-origin:0 100%}.mdl-menu__outline.mdl-menu--top-right{-webkit-transform-origin:100% 100%;-ms-transform-origin:100% 100%;transform-origin:100% 100%}.mdl-menu{position:absolute;list-style:none;top:0;left:0;height:auto;width:auto;min-width:124px;padding:8px 0;margin:0;opacity:0;clip:rect(0 0 0 0);z-index:-1}.mdl-menu__container.is-visible .mdl-menu{opacity:1;z-index:999}.mdl-menu.is-animating{-webkit-transition:opacity .2s cubic-bezier(.4,0,.2,1),clip .3s cubic-bezier(.4,0,.2,1);transition:opacity .2s cubic-bezier(.4,0,.2,1),clip .3s cubic-bezier(.4,0,.2,1)}.mdl-menu.mdl-menu--bottom-right{left:auto;right:0}.mdl-menu.mdl-menu--top-left{top:auto;bottom:0}.mdl-menu.mdl-menu--top-right{top:auto;left:auto;bottom:0;right:0}.mdl-menu.mdl-menu--unaligned{top:auto;left:auto}.mdl-menu__item{display:block;border:none;color:rgba(0,0,0,.87);background-color:transparent;text-align:left;margin:0;padding:0 16px;outline-color:#bdbdbd;position:relative;overflow:hidden;font-size:14px;font-weight:400;letter-spacing:0;text-decoration:none;cursor:pointer;height:48px;line-height:48px;white-space:nowrap;opacity:0;-webkit-transition:opacity .2s cubic-bezier(.4,0,.2,1);transition:opacity .2s cubic-bezier(.4,0,.2,1);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-menu__container.is-visible .mdl-menu__item{opacity:1}.mdl-menu__item::-moz-focus-inner{border:0}.mdl-menu__item[disabled]{color:#bdbdbd;background-color:transparent;cursor:auto}.mdl-menu__item[disabled]:hover{background-color:transparent}.mdl-menu__item[disabled]:focus{background-color:transparent}.mdl-menu__item[disabled] .mdl-ripple{background:0 0}.mdl-menu__item:hover{background-color:#eee}.mdl-menu__item:focus{outline:none;background-color:#eee}.mdl-menu__item:active{background-color:#e0e0e0}.mdl-menu__item--ripple-container{display:block;height:100%;left:0;position:absolute;top:0;width:100%;z-index:0;overflow:hidden}.mdl-progress{display:block;position:relative;height:4px;width:500px}.mdl-progress>.bar{display:block;position:absolute;top:0;bottom:0;width:0%;-webkit-transition:width .2s cubic-bezier(.4,0,.2,1);transition:width .2s cubic-bezier(.4,0,.2,1)}.mdl-progress>.progressbar{background-color:rgb(158,158,158);z-index:1;left:0}.mdl-progress>.bufferbar{background-image:-webkit-linear-gradient(left,rgba(66,66,66,.7),rgba(66,66,66,.7)),-webkit-linear-gradient(left,rgb(158,158,158),rgb(158,158,158));background-image:linear-gradient(to right,rgba(66,66,66,.7),rgba(66,66,66,.7)),linear-gradient(to right,rgb(158,158,158),rgb(158,158,158));z-index:0;left:0}.mdl-progress>.auxbar{right:0}@supports (-webkit-appearance:none){.mdl-progress:not(.mdl-progress__indeterminate):not(.mdl-progress__indeterminate)>.auxbar{background-image:-webkit-linear-gradient(left,rgba(66,66,66,.7),rgba(66,66,66,.7)),-webkit-linear-gradient(left,rgb(158,158,158),rgb(158,158,158));background-image:linear-gradient(to right,rgba(66,66,66,.7),rgba(66,66,66,.7)),linear-gradient(to right,rgb(158,158,158),rgb(158,158,158));-webkit-mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjxzdmcgd2lkdGg9IjEyIiBoZWlnaHQ9IjQiIHZpZXdQb3J0PSIwIDAgMTIgNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxlbGxpcHNlIGN4PSIyIiBjeT0iMiIgcng9IjIiIHJ5PSIyIj4KICAgIDxhbmltYXRlIGF0dHJpYnV0ZU5hbWU9ImN4IiBmcm9tPSIyIiB0bz0iLTEwIiBkdXI9IjAuNnMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIiAvPgogIDwvZWxsaXBzZT4KICA8ZWxsaXBzZSBjeD0iMTQiIGN5PSIyIiByeD0iMiIgcnk9IjIiIGNsYXNzPSJsb2FkZXIiPgogICAgPGFuaW1hdGUgYXR0cmlidXRlTmFtZT0iY3giIGZyb209IjE0IiB0bz0iMiIgZHVyPSIwLjZzIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIgLz4KICA8L2VsbGlwc2U+Cjwvc3ZnPgo=");mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjxzdmcgd2lkdGg9IjEyIiBoZWlnaHQ9IjQiIHZpZXdQb3J0PSIwIDAgMTIgNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxlbGxpcHNlIGN4PSIyIiBjeT0iMiIgcng9IjIiIHJ5PSIyIj4KICAgIDxhbmltYXRlIGF0dHJpYnV0ZU5hbWU9ImN4IiBmcm9tPSIyIiB0bz0iLTEwIiBkdXI9IjAuNnMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIiAvPgogIDwvZWxsaXBzZT4KICA8ZWxsaXBzZSBjeD0iMTQiIGN5PSIyIiByeD0iMiIgcnk9IjIiIGNsYXNzPSJsb2FkZXIiPgogICAgPGFuaW1hdGUgYXR0cmlidXRlTmFtZT0iY3giIGZyb209IjE0IiB0bz0iMiIgZHVyPSIwLjZzIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIgLz4KICA8L2VsbGlwc2U+Cjwvc3ZnPgo=")}}.mdl-progress:not(.mdl-progress__indeterminate)>.auxbar{background-image:-webkit-linear-gradient(left,rgba(66,66,66,.9),rgba(66,66,66,.9)),-webkit-linear-gradient(left,rgb(158,158,158),rgb(158,158,158));background-image:linear-gradient(to right,rgba(66,66,66,.9),rgba(66,66,66,.9)),linear-gradient(to right,rgb(158,158,158),rgb(158,158,158))}.mdl-progress.mdl-progress__indeterminate>.bar1{-webkit-animation-name:indeterminate1;animation-name:indeterminate1}.mdl-progress.mdl-progress__indeterminate>.bar1,.mdl-progress.mdl-progress__indeterminate>.bar3{background-color:rgb(158,158,158);-webkit-animation-duration:2s;animation-duration:2s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-timing-function:linear;animation-timing-function:linear}.mdl-progress.mdl-progress__indeterminate>.bar3{background-image:none;-webkit-animation-name:indeterminate2;animation-name:indeterminate2}@-webkit-keyframes indeterminate1{0%{left:0%;width:0%}50%{left:25%;width:75%}75%{left:100%;width:0%}}@keyframes indeterminate1{0%{left:0%;width:0%}50%{left:25%;width:75%}75%{left:100%;width:0%}}@-webkit-keyframes indeterminate2{0%,50%{left:0%;width:0%}75%{left:0%;width:25%}100%{left:100%;width:0%}}@keyframes indeterminate2{0%,50%{left:0%;width:0%}75%{left:0%;width:25%}100%{left:100%;width:0%}}.mdl-navigation{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;box-sizing:border-box}.mdl-navigation__link{color:#424242;text-decoration:none;font-weight:500;font-size:13px;margin:0}.mdl-layout{width:100%;height:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;overflow-y:auto;overflow-x:hidden;position:relative;-webkit-overflow-scrolling:touch}.mdl-layout.is-small-screen .mdl-layout--large-screen-only{display:none}.mdl-layout:not(.is-small-screen) .mdl-layout--small-screen-only{display:none}.mdl-layout__container{position:absolute;width:100%;height:100%}.mdl-layout-title{display:block;position:relative;font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:20px;line-height:1;letter-spacing:.02em;font-weight:400;box-sizing:border-box}.mdl-layout-spacer{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.mdl-layout__drawer{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;width:240px;height:100%;max-height:100%;position:absolute;top:0;left:0;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);box-sizing:border-box;border-right:1px solid #e0e0e0;background:#fafafa;-webkit-transform:translateX(-250px);-ms-transform:translateX(-250px);transform:translateX(-250px);-webkit-transform-style:preserve-3d;transform-style:preserve-3d;will-change:transform;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:-webkit-transform;transition-property:transform;color:#424242;overflow:visible;overflow-y:auto;z-index:5}.mdl-layout__drawer.is-visible{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}.mdl-layout__drawer>*{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0}.mdl-layout__drawer>.mdl-layout-title{line-height:64px;padding-left:40px}@media screen and (max-width:1024px){.mdl-layout__drawer>.mdl-layout-title{line-height:56px;padding-left:16px}}.mdl-layout__drawer .mdl-navigation{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:stretch;-webkit-align-items:stretch;-ms-flex-align:stretch;align-items:stretch;padding-top:16px}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link{display:block;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;padding:16px 40px;margin:0;color:#757575}@media screen and (max-width:1024px){.mdl-layout__drawer .mdl-navigation .mdl-navigation__link{padding:16px}}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link:hover{background-color:#e0e0e0}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link--current{background-color:#000;color:rgb(158,158,158)}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__drawer{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}}.mdl-layout__drawer-button{display:block;position:absolute;height:48px;width:48px;border:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;overflow:hidden;text-align:center;cursor:pointer;font-size:26px;line-height:50px;font-family:Helvetica,Arial,sans-serif;margin:10px 12px;top:0;left:0;color:rgb(66,66,66);z-index:4}.mdl-layout__header .mdl-layout__drawer-button{position:absolute;color:rgb(66,66,66);background-color:inherit}@media screen and (max-width:1024px){.mdl-layout__header .mdl-layout__drawer-button{margin:4px}}@media screen and (max-width:1024px){.mdl-layout__drawer-button{margin:4px;color:rgba(0,0,0,.5)}}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__drawer-button{display:none}}.mdl-layout__header{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-box-pack:start;-webkit-justify-content:flex-start;-ms-flex-pack:start;justify-content:flex-start;box-sizing:border-box;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;width:100%;margin:0;padding:0;border:none;min-height:64px;max-height:1000px;z-index:3;background-color:rgb(158,158,158);color:rgb(66,66,66);box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:max-height,box-shadow;transition-property:max-height,box-shadow}@media screen and (max-width:1024px){.mdl-layout__header{min-height:56px}}.mdl-layout--fixed-drawer.is-upgraded:not(.is-small-screen)>.mdl-layout__header{margin-left:240px;width:calc(100% - 240px)}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__header .mdl-layout__header-row{padding-left:40px}}.mdl-layout__header>.mdl-layout-icon{position:absolute;left:40px;top:16px;height:32px;width:32px;overflow:hidden;z-index:3;display:block}@media screen and (max-width:1024px){.mdl-layout__header>.mdl-layout-icon{left:16px;top:12px}}.mdl-layout.has-drawer .mdl-layout__header>.mdl-layout-icon{display:none}.mdl-layout__header.is-compact{max-height:64px}@media screen and (max-width:1024px){.mdl-layout__header.is-compact{max-height:56px}}.mdl-layout__header.is-compact.has-tabs{height:112px}@media screen and (max-width:1024px){.mdl-layout__header.is-compact.has-tabs{min-height:104px}}@media screen and (max-width:1024px){.mdl-layout__header{display:none}.mdl-layout--fixed-header>.mdl-layout__header{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}}.mdl-layout__header--transparent.mdl-layout__header--transparent{background-color:transparent;box-shadow:none}.mdl-layout__header--seamed,.mdl-layout__header--scroll{box-shadow:none}.mdl-layout__header--waterfall{box-shadow:none;overflow:hidden}.mdl-layout__header--waterfall.is-casting-shadow{box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-layout__header-row{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;box-sizing:border-box;-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:64px;margin:0;padding:0 40px 0 80px}@media screen and (max-width:1024px){.mdl-layout__header-row{height:56px;padding:0 16px 0 72px}}.mdl-layout__header-row>*{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0}.mdl-layout__header--scroll .mdl-layout__header-row{width:100%}.mdl-layout__header-row .mdl-navigation{margin:0;padding:0;height:64px;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}@media screen and (max-width:1024px){.mdl-layout__header-row .mdl-navigation{height:56px}}.mdl-layout__header-row .mdl-navigation__link{display:block;color:rgb(66,66,66);line-height:64px;padding:0 24px}@media screen and (max-width:1024px){.mdl-layout__header-row .mdl-navigation__link{line-height:56px;padding:0 16px}}.mdl-layout__obfuscator{background-color:transparent;position:absolute;top:0;left:0;height:100%;width:100%;z-index:4;visibility:hidden;-webkit-transition-property:background-color;transition-property:background-color;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-layout__drawer.is-visible~.mdl-layout__obfuscator{background-color:rgba(0,0,0,.5);visibility:visible}.mdl-layout__content{-ms-flex:0 1 auto;display:inline-block;overflow-y:auto;overflow-x:hidden;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;z-index:1;-webkit-overflow-scrolling:touch}.mdl-layout--fixed-drawer>.mdl-layout__content{margin-left:240px}.mdl-layout__container.has-scrolling-header .mdl-layout__content{overflow:visible}@media screen and (max-width:1024px){.mdl-layout--fixed-drawer>.mdl-layout__content{margin-left:0}.mdl-layout__container.has-scrolling-header .mdl-layout__content{overflow-y:auto;overflow-x:hidden}}.mdl-layout__tab-bar{height:96px;margin:0;width:calc(100% - 112px);padding:0 0 0 56px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;background-color:rgb(158,158,158);overflow-y:hidden;overflow-x:scroll}.mdl-layout__tab-bar::-webkit-scrollbar{display:none}@media screen and (max-width:1024px){.mdl-layout__tab-bar{width:calc(100% - 60px);padding:0 0 0 60px}}.mdl-layout--fixed-tabs .mdl-layout__tab-bar{padding:0;overflow:hidden;width:100%}.mdl-layout__tab-bar-container{position:relative;height:48px;width:100%;border:none;margin:0;z-index:2;-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;overflow:hidden}.mdl-layout__container>.mdl-layout__tab-bar-container{position:absolute;top:0;left:0}.mdl-layout__tab-bar-button{display:inline-block;position:absolute;top:0;height:48px;width:56px;z-index:4;text-align:center;background-color:rgb(158,158,158);color:transparent;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}@media screen and (max-width:1024px){.mdl-layout__tab-bar-button{display:none;width:60px}}.mdl-layout--fixed-tabs .mdl-layout__tab-bar-button{display:none}.mdl-layout__tab-bar-button .material-icons{line-height:48px}.mdl-layout__tab-bar-button.is-active{color:rgb(66,66,66)}.mdl-layout__tab-bar-left-button{left:0}.mdl-layout__tab-bar-right-button{right:0}.mdl-layout__tab{margin:0;border:none;padding:0 24px;float:left;position:relative;display:block;-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;text-decoration:none;height:48px;line-height:48px;text-align:center;font-weight:500;font-size:14px;text-transform:uppercase;color:rgba(66,66,66,.6);overflow:hidden}@media screen and (max-width:1024px){.mdl-layout__tab{padding:0 12px}}.mdl-layout--fixed-tabs .mdl-layout__tab{float:none;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;padding:0}.mdl-layout.is-upgraded .mdl-layout__tab.is-active{color:rgb(66,66,66)}.mdl-layout.is-upgraded .mdl-layout__tab.is-active::after{height:2px;width:100%;display:block;content:" ";bottom:0;left:0;position:absolute;background:rgb(255,110,64);-webkit-animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;-webkit-transition:all 1s cubic-bezier(.4,0,1,1);transition:all 1s cubic-bezier(.4,0,1,1)}.mdl-layout__tab .mdl-layout__tab-ripple-container{display:block;position:absolute;height:100%;width:100%;left:0;top:0;z-index:1;overflow:hidden}.mdl-layout__tab .mdl-layout__tab-ripple-container .mdl-ripple{background-color:rgb(66,66,66)}.mdl-layout__tab-panel{display:block}.mdl-layout.is-upgraded .mdl-layout__tab-panel{display:none}.mdl-layout.is-upgraded .mdl-layout__tab-panel.is-active{display:block}.mdl-radio{position:relative;font-size:16px;line-height:24px;display:inline-block;box-sizing:border-box;margin:0;padding-left:0}.mdl-radio.is-upgraded{padding-left:24px}.mdl-radio__button{line-height:24px}.mdl-radio.is-upgraded .mdl-radio__button{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-radio__outer-circle{position:absolute;top:4px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;margin:0;cursor:pointer;border:2px solid rgba(0,0,0,.54);border-radius:50%;z-index:2}.mdl-radio.is-checked .mdl-radio__outer-circle{border:2px solid rgb(158,158,158)}.mdl-radio.is-disabled .mdl-radio__outer-circle{border:2px solid rgba(0,0,0,.26);cursor:auto}.mdl-radio__inner-circle{position:absolute;z-index:1;margin:0;top:8px;left:4px;box-sizing:border-box;width:8px;height:8px;cursor:pointer;-webkit-transition-duration:.28s;transition-duration:.28s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:-webkit-transform;transition-property:transform;-webkit-transform:scale3d(0,0,0);transform:scale3d(0,0,0);border-radius:50%;background:rgb(158,158,158)}.mdl-radio.is-checked .mdl-radio__inner-circle{-webkit-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}.mdl-radio.is-disabled .mdl-radio__inner-circle{background:rgba(0,0,0,.26);cursor:auto}.mdl-radio.is-focused .mdl-radio__inner-circle{box-shadow:0 0 0 10px rgba(0,0,0,.1)}.mdl-radio__label{cursor:pointer}.mdl-radio.is-disabled .mdl-radio__label{color:rgba(0,0,0,.26);cursor:auto}.mdl-radio__ripple-container{position:absolute;z-index:2;top:-9px;left:-13px;box-sizing:border-box;width:42px;height:42px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-radio__ripple-container .mdl-ripple{background:rgb(158,158,158)}.mdl-radio.is-disabled .mdl-radio__ripple-container{cursor:auto}.mdl-radio.is-disabled .mdl-radio__ripple-container .mdl-ripple{background:0 0}_:-ms-input-placeholder,:root .mdl-slider.mdl-slider.is-upgraded{-ms-appearance:none;height:32px;margin:0}.mdl-slider{width:calc(100% - 40px);margin:0 20px}.mdl-slider.is-upgraded{-webkit-appearance:none;-moz-appearance:none;appearance:none;height:2px;background:0 0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;outline:0;padding:0;color:rgb(158,158,158);-webkit-align-self:center;-ms-flex-item-align:center;align-self:center;z-index:1;cursor:pointer}.mdl-slider.is-upgraded::-moz-focus-outer{border:0}.mdl-slider.is-upgraded::-ms-tooltip{display:none}.mdl-slider.is-upgraded::-webkit-slider-runnable-track{background:0 0}.mdl-slider.is-upgraded::-moz-range-track{background:0 0;border:none}.mdl-slider.is-upgraded::-ms-track{background:0 0;color:transparent;height:2px;width:100%;border:none}.mdl-slider.is-upgraded::-ms-fill-lower{padding:0;background:linear-gradient(to right,transparent,transparent 16px,rgb(158,158,158)16px,rgb(158,158,158)0)}.mdl-slider.is-upgraded::-ms-fill-upper{padding:0;background:linear-gradient(to left,transparent,transparent 16px,rgba(0,0,0,.26)16px,rgba(0,0,0,.26)0)}.mdl-slider.is-upgraded::-webkit-slider-thumb{-webkit-appearance:none;width:12px;height:12px;box-sizing:border-box;border-radius:50%;background:rgb(158,158,158);border:none;-webkit-transition:-webkit-transform .18s cubic-bezier(.4,0,.2,1),border .18s cubic-bezier(.4,0,.2,1),box-shadow .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1);transition:transform .18s cubic-bezier(.4,0,.2,1),border .18s cubic-bezier(.4,0,.2,1),box-shadow .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1)}.mdl-slider.is-upgraded::-moz-range-thumb{-moz-appearance:none;width:12px;height:12px;box-sizing:border-box;border-radius:50%;background-image:none;background:rgb(158,158,158);border:none}.mdl-slider.is-upgraded:focus:not(:active)::-webkit-slider-thumb{box-shadow:0 0 0 10px rgba(158,158,158,.26)}.mdl-slider.is-upgraded:focus:not(:active)::-moz-range-thumb{box-shadow:0 0 0 10px rgba(158,158,158,.26)}.mdl-slider.is-upgraded:active::-webkit-slider-thumb{background-image:none;background:rgb(158,158,158);-webkit-transform:scale(1.5);transform:scale(1.5)}.mdl-slider.is-upgraded:active::-moz-range-thumb{background-image:none;background:rgb(158,158,158);transform:scale(1.5)}.mdl-slider.is-upgraded::-ms-thumb{width:32px;height:32px;border:none;border-radius:50%;background:rgb(158,158,158);-ms-transform:scale(.375);transform:scale(.375);transition:transform .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1)}.mdl-slider.is-upgraded:focus:not(:active)::-ms-thumb{background:radial-gradient(circle closest-side,rgb(158,158,158)0%,rgb(158,158,158)37.5%,rgba(158,158,158,.26)37.5%,rgba(158,158,158,.26)100%);-ms-transform:scale(1);transform:scale(1)}.mdl-slider.is-upgraded:active::-ms-thumb{background:rgb(158,158,158);-ms-transform:scale(.5625);transform:scale(.5625)}.mdl-slider.is-upgraded.is-lowest-value::-webkit-slider-thumb{border:2px solid rgba(0,0,0,.26);background:0 0}.mdl-slider.is-upgraded.is-lowest-value::-moz-range-thumb{border:2px solid rgba(0,0,0,.26);background:0 0}.mdl-slider.is-upgraded.is-lowest-value~.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-webkit-slider-thumb{box-shadow:0 0 0 10px rgba(0,0,0,.12);background:rgba(0,0,0,.12)}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-moz-range-thumb{box-shadow:0 0 0 10px rgba(0,0,0,.12);background:rgba(0,0,0,.12)}.mdl-slider.is-upgraded.is-lowest-value:active::-webkit-slider-thumb{border:1.6px solid rgba(0,0,0,.26);-webkit-transform:scale(1.5);transform:scale(1.5)}.mdl-slider.is-upgraded.is-lowest-value:active~.mdl-slider__background-flex>.mdl-slider__background-upper{left:9px}.mdl-slider.is-upgraded.is-lowest-value:active::-moz-range-thumb{border:1.5px solid rgba(0,0,0,.26);transform:scale(1.5)}.mdl-slider.is-upgraded.is-lowest-value::-ms-thumb{background:radial-gradient(circle closest-side,transparent 0%,transparent 66.67%,rgba(0,0,0,.26)66.67%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-ms-thumb{background:radial-gradient(circle closest-side,rgba(0,0,0,.12)0%,rgba(0,0,0,.12)25%,rgba(0,0,0,.26)25%,rgba(0,0,0,.26)37.5%,rgba(0,0,0,.12)37.5%,rgba(0,0,0,.12)100%);-ms-transform:scale(1);transform:scale(1)}.mdl-slider.is-upgraded.is-lowest-value:active::-ms-thumb{-ms-transform:scale(.5625);transform:scale(.5625);background:radial-gradient(circle closest-side,transparent 0%,transparent 77.78%,rgba(0,0,0,.26)77.78%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded.is-lowest-value::-ms-fill-lower{background:0 0}.mdl-slider.is-upgraded.is-lowest-value::-ms-fill-upper{margin-left:6px}.mdl-slider.is-upgraded.is-lowest-value:active::-ms-fill-upper{margin-left:9px}.mdl-slider.is-upgraded:disabled:focus::-webkit-slider-thumb,.mdl-slider.is-upgraded:disabled:active::-webkit-slider-thumb,.mdl-slider.is-upgraded:disabled::-webkit-slider-thumb{-webkit-transform:scale(.667);transform:scale(.667);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded:disabled:focus::-moz-range-thumb,.mdl-slider.is-upgraded:disabled:active::-moz-range-thumb,.mdl-slider.is-upgraded:disabled::-moz-range-thumb{transform:scale(.667);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded:disabled~.mdl-slider__background-flex>.mdl-slider__background-lower{background-color:rgba(0,0,0,.26);left:-6px}.mdl-slider.is-upgraded:disabled~.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-webkit-slider-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-webkit-slider-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-webkit-slider-thumb{border:3px solid rgba(0,0,0,.26);background:0 0;-webkit-transform:scale(.667);transform:scale(.667)}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-moz-range-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-moz-range-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-moz-range-thumb{border:3px solid rgba(0,0,0,.26);background:0 0;transform:scale(.667)}.mdl-slider.is-upgraded.is-lowest-value:disabled:active~.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded:disabled:focus::-ms-thumb,.mdl-slider.is-upgraded:disabled:active::-ms-thumb,.mdl-slider.is-upgraded:disabled::-ms-thumb{-ms-transform:scale(.25);transform:scale(.25);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-ms-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-ms-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-ms-thumb{-ms-transform:scale(.25);transform:scale(.25);background:radial-gradient(circle closest-side,transparent 0%,transparent 50%,rgba(0,0,0,.26)50%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded:disabled::-ms-fill-lower{margin-right:6px;background:linear-gradient(to right,transparent,transparent 25px,rgba(0,0,0,.26)25px,rgba(0,0,0,.26)0)}.mdl-slider.is-upgraded:disabled::-ms-fill-upper{margin-left:6px}.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-ms-fill-upper{margin-left:6px}.mdl-slider__ie-container{height:18px;overflow:visible;border:none;margin:none;padding:none}.mdl-slider__container{height:18px;position:relative;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row}.mdl-slider__container,.mdl-slider__background-flex{background:0 0;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.mdl-slider__background-flex{position:absolute;height:2px;width:calc(100% - 52px);top:50%;left:0;margin:0 26px;overflow:hidden;border:0;padding:0;-webkit-transform:translate(0,-1px);-ms-transform:translate(0,-1px);transform:translate(0,-1px)}.mdl-slider__background-lower{background:rgb(158,158,158)}.mdl-slider__background-lower,.mdl-slider__background-upper{-webkit-box-flex:0;-webkit-flex:0;-ms-flex:0;flex:0;position:relative;border:0;padding:0}.mdl-slider__background-upper{background:rgba(0,0,0,.26);-webkit-transition:left .18s cubic-bezier(.4,0,.2,1);transition:left .18s cubic-bezier(.4,0,.2,1)}.mdl-spinner{display:inline-block;position:relative;width:28px;height:28px}.mdl-spinner:not(.is-upgraded).is-active:after{content:"Loading..."}.mdl-spinner.is-upgraded.is-active{-webkit-animation:mdl-spinner__container-rotate 1568.23529412ms linear infinite;animation:mdl-spinner__container-rotate 1568.23529412ms linear infinite}@-webkit-keyframes mdl-spinner__container-rotate{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes mdl-spinner__container-rotate{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.mdl-spinner__layer{position:absolute;width:100%;height:100%;opacity:0}.mdl-spinner__layer-1{border-color:#42a5f5}.mdl-spinner--single-color .mdl-spinner__layer-1{border-color:rgb(158,158,158)}.mdl-spinner.is-active .mdl-spinner__layer-1{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-1-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-1-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-2{border-color:#f44336}.mdl-spinner--single-color .mdl-spinner__layer-2{border-color:rgb(158,158,158)}.mdl-spinner.is-active .mdl-spinner__layer-2{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-2-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-2-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-3{border-color:#fdd835}.mdl-spinner--single-color .mdl-spinner__layer-3{border-color:rgb(158,158,158)}.mdl-spinner.is-active .mdl-spinner__layer-3{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-3-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-3-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-4{border-color:#4caf50}.mdl-spinner--single-color .mdl-spinner__layer-4{border-color:rgb(158,158,158)}.mdl-spinner.is-active .mdl-spinner__layer-4{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-4-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-4-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}@-webkit-keyframes mdl-spinner__fill-unfill-rotate{12.5%{-webkit-transform:rotate(135deg);transform:rotate(135deg)}25%{-webkit-transform:rotate(270deg);transform:rotate(270deg)}37.5%{-webkit-transform:rotate(405deg);transform:rotate(405deg)}50%{-webkit-transform:rotate(540deg);transform:rotate(540deg)}62.5%{-webkit-transform:rotate(675deg);transform:rotate(675deg)}75%{-webkit-transform:rotate(810deg);transform:rotate(810deg)}87.5%{-webkit-transform:rotate(945deg);transform:rotate(945deg)}to{-webkit-transform:rotate(1080deg);transform:rotate(1080deg)}}@keyframes mdl-spinner__fill-unfill-rotate{12.5%{-webkit-transform:rotate(135deg);transform:rotate(135deg)}25%{-webkit-transform:rotate(270deg);transform:rotate(270deg)}37.5%{-webkit-transform:rotate(405deg);transform:rotate(405deg)}50%{-webkit-transform:rotate(540deg);transform:rotate(540deg)}62.5%{-webkit-transform:rotate(675deg);transform:rotate(675deg)}75%{-webkit-transform:rotate(810deg);transform:rotate(810deg)}87.5%{-webkit-transform:rotate(945deg);transform:rotate(945deg)}to{-webkit-transform:rotate(1080deg);transform:rotate(1080deg)}}@-webkit-keyframes mdl-spinner__layer-1-fade-in-out{from,25%{opacity:.99}26%,89%{opacity:0}90%,100%{opacity:.99}}@keyframes mdl-spinner__layer-1-fade-in-out{from,25%{opacity:.99}26%,89%{opacity:0}90%,100%{opacity:.99}}@-webkit-keyframes mdl-spinner__layer-2-fade-in-out{from,15%{opacity:0}25%,50%{opacity:.99}51%{opacity:0}}@keyframes mdl-spinner__layer-2-fade-in-out{from,15%{opacity:0}25%,50%{opacity:.99}51%{opacity:0}}@-webkit-keyframes mdl-spinner__layer-3-fade-in-out{from,40%{opacity:0}50%,75%{opacity:.99}76%{opacity:0}}@keyframes mdl-spinner__layer-3-fade-in-out{from,40%{opacity:0}50%,75%{opacity:.99}76%{opacity:0}}@-webkit-keyframes mdl-spinner__layer-4-fade-in-out{from,65%{opacity:0}75%,90%{opacity:.99}100%{opacity:0}}@keyframes mdl-spinner__layer-4-fade-in-out{from,65%{opacity:0}75%,90%{opacity:.99}100%{opacity:0}}.mdl-spinner__gap-patch{position:absolute;box-sizing:border-box;top:0;left:45%;width:10%;height:100%;overflow:hidden;border-color:inherit}.mdl-spinner__gap-patch .mdl-spinner__circle{width:1000%;left:-450%}.mdl-spinner__circle-clipper{display:inline-block;position:relative;width:50%;height:100%;overflow:hidden;border-color:inherit}.mdl-spinner__circle-clipper .mdl-spinner__circle{width:200%}.mdl-spinner__circle{box-sizing:border-box;height:100%;border-width:3px;border-style:solid;border-color:inherit;border-bottom-color:transparent!important;border-radius:50%;-webkit-animation:none;animation:none;position:absolute;top:0;right:0;bottom:0;left:0}.mdl-spinner__left .mdl-spinner__circle{border-right-color:transparent!important;-webkit-transform:rotate(129deg);-ms-transform:rotate(129deg);transform:rotate(129deg)}.mdl-spinner.is-active .mdl-spinner__left .mdl-spinner__circle{-webkit-animation:mdl-spinner__left-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__left-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__right .mdl-spinner__circle{left:-100%;border-left-color:transparent!important;-webkit-transform:rotate(-129deg);-ms-transform:rotate(-129deg);transform:rotate(-129deg)}.mdl-spinner.is-active .mdl-spinner__right .mdl-spinner__circle{-webkit-animation:mdl-spinner__right-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__right-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both}@-webkit-keyframes mdl-spinner__left-spin{from{-webkit-transform:rotate(130deg);transform:rotate(130deg)}50%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(130deg);transform:rotate(130deg)}}@keyframes mdl-spinner__left-spin{from{-webkit-transform:rotate(130deg);transform:rotate(130deg)}50%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(130deg);transform:rotate(130deg)}}@-webkit-keyframes mdl-spinner__right-spin{from{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}50%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}to{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}}@keyframes mdl-spinner__right-spin{from{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}50%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}to{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}}.mdl-switch{position:relative;z-index:1;vertical-align:middle;display:inline-block;box-sizing:border-box;width:100%;height:24px;margin:0;padding:0;overflow:visible;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-switch.is-upgraded{padding-left:28px}.mdl-switch__input{line-height:24px}.mdl-switch.is-upgraded .mdl-switch__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-switch__track{background:rgba(0,0,0,.26);position:absolute;left:0;top:5px;height:14px;width:36px;border-radius:14px;cursor:pointer}.mdl-switch.is-checked .mdl-switch__track{background:rgba(158,158,158,.5)}.mdl-switch.is-disabled .mdl-switch__track{background:rgba(0,0,0,.12);cursor:auto}.mdl-switch__thumb{background:#fafafa;position:absolute;left:0;top:2px;height:20px;width:20px;border-radius:50%;cursor:pointer;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);-webkit-transition-duration:.28s;transition-duration:.28s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:left;transition-property:left}.mdl-switch.is-checked .mdl-switch__thumb{background:rgb(158,158,158);left:16px;box-shadow:0 3px 4px 0 rgba(0,0,0,.14),0 3px 3px -2px rgba(0,0,0,.2),0 1px 8px 0 rgba(0,0,0,.12)}.mdl-switch.is-disabled .mdl-switch__thumb{background:#bdbdbd;cursor:auto}.mdl-switch__focus-helper{position:absolute;top:50%;left:50%;-webkit-transform:translate(-4px,-4px);-ms-transform:translate(-4px,-4px);transform:translate(-4px,-4px);display:inline-block;box-sizing:border-box;width:8px;height:8px;border-radius:50%;background-color:transparent}.mdl-switch.is-focused .mdl-switch__focus-helper{box-shadow:0 0 0 20px rgba(0,0,0,.1);background-color:rgba(0,0,0,.1)}.mdl-switch.is-focused.is-checked .mdl-switch__focus-helper{box-shadow:0 0 0 20px rgba(158,158,158,.26);background-color:rgba(158,158,158,.26)}.mdl-switch__label{position:relative;cursor:pointer;font-size:16px;line-height:24px;margin:0;left:24px}.mdl-switch.is-disabled .mdl-switch__label{color:#bdbdbd;cursor:auto}.mdl-switch__ripple-container{position:absolute;z-index:2;top:-12px;left:-14px;box-sizing:border-box;width:48px;height:48px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000);-webkit-transition-duration:.4s;transition-duration:.4s;-webkit-transition-timing-function:step-end;transition-timing-function:step-end;-webkit-transition-property:left;transition-property:left}.mdl-switch__ripple-container .mdl-ripple{background:rgb(158,158,158)}.mdl-switch.is-disabled .mdl-switch__ripple-container{cursor:auto}.mdl-switch.is-disabled .mdl-switch__ripple-container .mdl-ripple{background:0 0}.mdl-switch.is-checked .mdl-switch__ripple-container{cursor:auto;left:2px}.mdl-tabs{display:block;width:100%}.mdl-tabs__tab-bar{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-content:space-between;-ms-flex-line-pack:justify;align-content:space-between;-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;height:48px;padding:0;margin:0;border-bottom:1px solid #e0e0e0}.mdl-tabs__tab{margin:0;border:none;padding:0 24px;float:left;position:relative;display:block;color:red;text-decoration:none;height:48px;line-height:48px;text-align:center;font-weight:500;font-size:14px;text-transform:uppercase;color:rgba(0,0,0,.54);overflow:hidden}.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active{color:rgba(0,0,0,.87)}.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active:after{height:2px;width:100%;display:block;content:" ";bottom:0;left:0;position:absolute;background:rgb(158,158,158);-webkit-animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;-webkit-transition:all 1s cubic-bezier(.4,0,1,1);transition:all 1s cubic-bezier(.4,0,1,1)}.mdl-tabs__tab .mdl-tabs__ripple-container{display:block;position:absolute;height:100%;width:100%;left:0;top:0;z-index:1;overflow:hidden}.mdl-tabs__tab .mdl-tabs__ripple-container .mdl-ripple{background:rgb(158,158,158)}.mdl-tabs__panel{display:block}.mdl-tabs.is-upgraded .mdl-tabs__panel{display:none}.mdl-tabs.is-upgraded .mdl-tabs__panel.is-active{display:block}@-webkit-keyframes border-expand{0%{opacity:0;width:0}100%{opacity:1;width:100%}}@keyframes border-expand{0%{opacity:0;width:0}100%{opacity:1;width:100%}}.mdl-textfield{position:relative;font-size:16px;display:inline-block;box-sizing:border-box;width:300px;max-width:100%;margin:0;padding:20px 0}.mdl-textfield .mdl-button{position:absolute;bottom:20px}.mdl-textfield--align-right{text-align:right}.mdl-textfield--full-width{width:100%}.mdl-textfield--expandable{min-width:32px;width:auto;min-height:32px}.mdl-textfield__input{border:none;border-bottom:1px solid rgba(0,0,0,.12);display:block;font-size:16px;margin:0;padding:4px 0;width:100%;background:0 0;text-align:left;color:inherit}.mdl-textfield.is-focused .mdl-textfield__input{outline:none}.mdl-textfield.is-invalid .mdl-textfield__input{border-color:#de3226;box-shadow:none}.mdl-textfield.is-disabled .mdl-textfield__input{background-color:transparent;border-bottom:1px dotted rgba(0,0,0,.12);color:rgba(0,0,0,.26)}.mdl-textfield textarea.mdl-textfield__input{display:block}.mdl-textfield__label{bottom:0;color:rgba(0,0,0,.26);font-size:16px;left:0;right:0;pointer-events:none;position:absolute;display:block;top:24px;width:100%;overflow:hidden;white-space:nowrap;text-align:left}.mdl-textfield.is-dirty .mdl-textfield__label{visibility:hidden}.mdl-textfield--floating-label .mdl-textfield__label{-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-textfield.is-disabled.is-disabled .mdl-textfield__label{color:rgba(0,0,0,.26)}.mdl-textfield--floating-label.is-focused .mdl-textfield__label,.mdl-textfield--floating-label.is-dirty .mdl-textfield__label{color:rgb(158,158,158);font-size:12px;top:4px;visibility:visible}.mdl-textfield--floating-label.is-focused .mdl-textfield__expandable-holder .mdl-textfield__label,.mdl-textfield--floating-label.is-dirty .mdl-textfield__expandable-holder .mdl-textfield__label{top:-16px}.mdl-textfield--floating-label.is-invalid .mdl-textfield__label{color:#de3226;font-size:12px}.mdl-textfield__label:after{background-color:rgb(158,158,158);bottom:20px;content:'';height:2px;left:45%;position:absolute;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);visibility:hidden;width:10px}.mdl-textfield.is-focused .mdl-textfield__label:after{left:0;visibility:visible;width:100%}.mdl-textfield.is-invalid .mdl-textfield__label:after{background-color:#de3226}.mdl-textfield__error{color:#de3226;position:absolute;font-size:12px;margin-top:3px;visibility:hidden;display:block}.mdl-textfield.is-invalid .mdl-textfield__error{visibility:visible}.mdl-textfield__expandable-holder{display:inline-block;position:relative;margin-left:32px;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);display:inline-block;max-width:.1px}.mdl-textfield.is-focused .mdl-textfield__expandable-holder,.mdl-textfield.is-dirty .mdl-textfield__expandable-holder{max-width:600px}.mdl-textfield__expandable-holder .mdl-textfield__label:after{bottom:0}.mdl-tooltip{-webkit-transform:scale(0);-ms-transform:scale(0);transform:scale(0);-webkit-transform-origin:top center;-ms-transform-origin:top center;transform-origin:top center;will-change:transform;z-index:999;background:rgba(97,97,97,.9);border-radius:2px;color:#fff;display:inline-block;font-size:10px;font-weight:500;line-height:14px;max-width:170px;position:fixed;top:-500px;left:-500px;padding:8px;text-align:center}.mdl-tooltip.is-active{-webkit-animation:pulse 200ms cubic-bezier(0,0,.2,1)forwards;animation:pulse 200ms cubic-bezier(0,0,.2,1)forwards}.mdl-tooltip--large{line-height:14px;font-size:14px;padding:16px}@-webkit-keyframes pulse{0%{-webkit-transform:scale(0);transform:scale(0);opacity:0}50%{-webkit-transform:scale(.99);transform:scale(.99)}100%{-webkit-transform:scale(1);transform:scale(1);opacity:1;visibility:visible}}@keyframes pulse{0%{-webkit-transform:scale(0);transform:scale(0);opacity:0}50%{-webkit-transform:scale(.99);transform:scale(.99)}100%{-webkit-transform:scale(1);transform:scale(1);opacity:1;visibility:visible}}.mdl-shadow--2dp{box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-shadow--3dp{box-shadow:0 3px 4px 0 rgba(0,0,0,.14),0 3px 3px -2px rgba(0,0,0,.2),0 1px 8px 0 rgba(0,0,0,.12)}.mdl-shadow--4dp{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2)}.mdl-shadow--6dp{box-shadow:0 6px 10px 0 rgba(0,0,0,.14),0 1px 18px 0 rgba(0,0,0,.12),0 3px 5px -1px rgba(0,0,0,.2)}.mdl-shadow--8dp{box-shadow:0 8px 10px 1px rgba(0,0,0,.14),0 3px 14px 2px rgba(0,0,0,.12),0 5px 5px -3px rgba(0,0,0,.2)}.mdl-shadow--16dp{box-shadow:0 16px 24px 2px rgba(0,0,0,.14),0 6px 30px 5px rgba(0,0,0,.12),0 8px 10px -5px rgba(0,0,0,.2)}.mdl-grid{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;margin:0 auto;-webkit-box-align:stretch;-webkit-align-items:stretch;-ms-flex-align:stretch;align-items:stretch}.mdl-grid.mdl-grid--no-spacing{padding:0}.mdl-cell{box-sizing:border-box}.mdl-cell--top{-webkit-align-self:flex-start;-ms-flex-item-align:start;align-self:flex-start}.mdl-cell--middle{-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.mdl-cell--bottom{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end}.mdl-cell--stretch{-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch}.mdl-grid.mdl-grid--no-spacing>.mdl-cell{margin:0}@media (max-width:479px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:100%}.mdl-cell--hide-phone{display:none!important}.mdl-cell--1-col,.mdl-cell--1-col-phone.mdl-cell--1-col-phone{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-phone.mdl-cell--1-col-phone{width:25%}.mdl-cell--2-col,.mdl-cell--2-col-phone.mdl-cell--2-col-phone{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-phone.mdl-cell--2-col-phone{width:50%}.mdl-cell--3-col,.mdl-cell--3-col-phone.mdl-cell--3-col-phone{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-phone.mdl-cell--3-col-phone{width:75%}.mdl-cell--4-col,.mdl-cell--4-col-phone.mdl-cell--4-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-phone.mdl-cell--4-col-phone{width:100%}.mdl-cell--5-col,.mdl-cell--5-col-phone.mdl-cell--5-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-phone.mdl-cell--5-col-phone{width:100%}.mdl-cell--6-col,.mdl-cell--6-col-phone.mdl-cell--6-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-phone.mdl-cell--6-col-phone{width:100%}.mdl-cell--7-col,.mdl-cell--7-col-phone.mdl-cell--7-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-phone.mdl-cell--7-col-phone{width:100%}.mdl-cell--8-col,.mdl-cell--8-col-phone.mdl-cell--8-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-phone.mdl-cell--8-col-phone{width:100%}.mdl-cell--9-col,.mdl-cell--9-col-phone.mdl-cell--9-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-phone.mdl-cell--9-col-phone{width:100%}.mdl-cell--10-col,.mdl-cell--10-col-phone.mdl-cell--10-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-phone.mdl-cell--10-col-phone{width:100%}.mdl-cell--11-col,.mdl-cell--11-col-phone.mdl-cell--11-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-phone.mdl-cell--11-col-phone{width:100%}.mdl-cell--12-col,.mdl-cell--12-col-phone.mdl-cell--12-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-phone.mdl-cell--12-col-phone{width:100%}}@media (min-width:480px) and (max-width:839px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:50%}.mdl-cell--hide-tablet{display:none!important}.mdl-cell--1-col,.mdl-cell--1-col-tablet.mdl-cell--1-col-tablet{width:calc(12.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-tablet.mdl-cell--1-col-tablet{width:12.5%}.mdl-cell--2-col,.mdl-cell--2-col-tablet.mdl-cell--2-col-tablet{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-tablet.mdl-cell--2-col-tablet{width:25%}.mdl-cell--3-col,.mdl-cell--3-col-tablet.mdl-cell--3-col-tablet{width:calc(37.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-tablet.mdl-cell--3-col-tablet{width:37.5%}.mdl-cell--4-col,.mdl-cell--4-col-tablet.mdl-cell--4-col-tablet{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-tablet.mdl-cell--4-col-tablet{width:50%}.mdl-cell--5-col,.mdl-cell--5-col-tablet.mdl-cell--5-col-tablet{width:calc(62.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-tablet.mdl-cell--5-col-tablet{width:62.5%}.mdl-cell--6-col,.mdl-cell--6-col-tablet.mdl-cell--6-col-tablet{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-tablet.mdl-cell--6-col-tablet{width:75%}.mdl-cell--7-col,.mdl-cell--7-col-tablet.mdl-cell--7-col-tablet{width:calc(87.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-tablet.mdl-cell--7-col-tablet{width:87.5%}.mdl-cell--8-col,.mdl-cell--8-col-tablet.mdl-cell--8-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-tablet.mdl-cell--8-col-tablet{width:100%}.mdl-cell--9-col,.mdl-cell--9-col-tablet.mdl-cell--9-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-tablet.mdl-cell--9-col-tablet{width:100%}.mdl-cell--10-col,.mdl-cell--10-col-tablet.mdl-cell--10-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-tablet.mdl-cell--10-col-tablet{width:100%}.mdl-cell--11-col,.mdl-cell--11-col-tablet.mdl-cell--11-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-tablet.mdl-cell--11-col-tablet{width:100%}.mdl-cell--12-col,.mdl-cell--12-col-tablet.mdl-cell--12-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-tablet.mdl-cell--12-col-tablet{width:100%}}@media (min-width:840px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(33.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:33.3333333333%}.mdl-cell--hide-desktop{display:none!important}.mdl-cell--1-col,.mdl-cell--1-col-desktop.mdl-cell--1-col-desktop{width:calc(8.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-desktop.mdl-cell--1-col-desktop{width:8.3333333333%}.mdl-cell--2-col,.mdl-cell--2-col-desktop.mdl-cell--2-col-desktop{width:calc(16.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-desktop.mdl-cell--2-col-desktop{width:16.6666666667%}.mdl-cell--3-col,.mdl-cell--3-col-desktop.mdl-cell--3-col-desktop{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-desktop.mdl-cell--3-col-desktop{width:25%}.mdl-cell--4-col,.mdl-cell--4-col-desktop.mdl-cell--4-col-desktop{width:calc(33.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-desktop.mdl-cell--4-col-desktop{width:33.3333333333%}.mdl-cell--5-col,.mdl-cell--5-col-desktop.mdl-cell--5-col-desktop{width:calc(41.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-desktop.mdl-cell--5-col-desktop{width:41.6666666667%}.mdl-cell--6-col,.mdl-cell--6-col-desktop.mdl-cell--6-col-desktop{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-desktop.mdl-cell--6-col-desktop{width:50%}.mdl-cell--7-col,.mdl-cell--7-col-desktop.mdl-cell--7-col-desktop{width:calc(58.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-desktop.mdl-cell--7-col-desktop{width:58.3333333333%}.mdl-cell--8-col,.mdl-cell--8-col-desktop.mdl-cell--8-col-desktop{width:calc(66.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-desktop.mdl-cell--8-col-desktop{width:66.6666666667%}.mdl-cell--9-col,.mdl-cell--9-col-desktop.mdl-cell--9-col-desktop{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-desktop.mdl-cell--9-col-desktop{width:75%}.mdl-cell--10-col,.mdl-cell--10-col-desktop.mdl-cell--10-col-desktop{width:calc(83.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-desktop.mdl-cell--10-col-desktop{width:83.3333333333%}.mdl-cell--11-col,.mdl-cell--11-col-desktop.mdl-cell--11-col-desktop{width:calc(91.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-desktop.mdl-cell--11-col-desktop{width:91.6666666667%}.mdl-cell--12-col,.mdl-cell--12-col-desktop.mdl-cell--12-col-desktop{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-desktop.mdl-cell--12-col-desktop{width:100%}}body{margin:0}.styleguide-demo h1{margin:48px 24px 0}.styleguide-demo h1:after{content:'';display:block;width:100%;border-bottom:1px solid rgba(0,0,0,.5);margin-top:24px}.styleguide-demo{opacity:0;-webkit-transition:opacity .6s ease;transition:opacity .6s ease}.styleguide-masthead{height:256px;background:#212121;padding:115px 16px 0}.styleguide-container{position:relative;max-width:960px;width:100%}.styleguide-title{color:#fff;bottom:auto;position:relative;font-size:56px;font-weight:300;line-height:1;letter-spacing:-.02em}.styleguide-title:after{border-bottom:0}.styleguide-title span{font-weight:300}.mdl-styleguide .mdl-layout__drawer .mdl-navigation__link{padding:10px 24px}.demosLoaded .styleguide-demo{opacity:1}iframe{display:block;width:100%;border:none}iframe.heightSet{overflow:hidden}.demo-wrapper{margin:24px}.demo-wrapper iframe{border:1px solid rgba(0,0,0,.5)}
\ No newline at end of file
+@charset "UTF-8";html{color:rgba(0,0,0,.87)}::-moz-selection{background:#b3d4fc;text-shadow:none}::selection{background:#b3d4fc;text-shadow:none}hr{display:block;height:1px;border:0;border-top:1px solid #ccc;margin:1em 0;padding:0}audio,canvas,iframe,img,svg,video{vertical-align:middle}fieldset{border:0;margin:0;padding:0}textarea{resize:vertical}.browserupgrade{margin:.2em 0;background:#ccc;color:#000;padding:.2em 0}.hidden{display:none!important}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.clearfix:before,.clearfix:after{content:" ";display:table}.clearfix:after{clear:both}@media print{*,*:before,*:after,*:first-letter,*:first-line{background:0 0!important;color:#000!important;box-shadow:none!important;text-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href)")"}abbr[title]:after{content:" (" attr(title)")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}a,.mdl-accordion,.mdl-button,.mdl-card,.mdl-checkbox,.mdl-dropdown-menu,.mdl-icon-toggle,.mdl-item,.mdl-radio,.mdl-slider,.mdl-switch,.mdl-tabs__tab{-webkit-tap-highlight-color:transparent;-webkit-tap-highlight-color:rgba(255,255,255,0)}html{width:100%;height:100%;-ms-touch-action:manipulation;touch-action:manipulation}body{width:100%;min-height:100%;margin:0}main{display:block}*[hidden]{display:none!important}html,body{font-family:"Helvetica","Arial",sans-serif;font-size:14px;font-weight:400;line-height:20px}h1,h2,h3,h4,h5,h6,p{padding:0}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400;line-height:1.35;letter-spacing:-.02em;opacity:.54;font-size:.6em}h1{font-size:56px;line-height:1.35;letter-spacing:-.02em;margin:24px 0}h1,h2{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400}h2{font-size:45px;line-height:48px}h2,h3{margin:24px 0}h3{font-size:34px;line-height:40px}h3,h4{font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:400}h4{font-size:24px;line-height:32px;-moz-osx-font-smoothing:grayscale;margin:24px 0 16px}h5{font-size:20px;font-weight:500;line-height:1;letter-spacing:.02em}h5,h6{font-family:"Roboto","Helvetica","Arial",sans-serif;margin:24px 0 16px}h6{font-size:16px;letter-spacing:.04em}h6,p{font-weight:400;line-height:24px}p{font-size:14px;letter-spacing:0;margin:0 0 16px}a{color:#ff4081;font-weight:500}blockquote{font-family:"Roboto","Helvetica","Arial",sans-serif;position:relative;font-size:24px;font-weight:300;font-style:italic;line-height:1.35;letter-spacing:.08em}blockquote:before{position:absolute;left:-.5em;content:'“'}blockquote:after{content:'”';margin-left:-.05em}mark{background-color:#f4ff81}dt{font-weight:700}address{font-size:12px;line-height:1;font-style:normal}address,ul,ol{font-weight:400;letter-spacing:0}ul,ol{font-size:14px;line-height:24px}.mdl-typography--display-4,.mdl-typography--display-4-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:112px;font-weight:300;line-height:1;letter-spacing:-.04em}.mdl-typography--display-4-color-contrast{opacity:.54}.mdl-typography--display-3,.mdl-typography--display-3-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:56px;font-weight:400;line-height:1.35;letter-spacing:-.02em}.mdl-typography--display-3-color-contrast{opacity:.54}.mdl-typography--display-2,.mdl-typography--display-2-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:45px;font-weight:400;line-height:48px}.mdl-typography--display-2-color-contrast{opacity:.54}.mdl-typography--display-1,.mdl-typography--display-1-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:34px;font-weight:400;line-height:40px}.mdl-typography--display-1-color-contrast{opacity:.54}.mdl-typography--headline,.mdl-typography--headline-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:24px;font-weight:400;line-height:32px;-moz-osx-font-smoothing:grayscale}.mdl-typography--headline-color-contrast{opacity:.87}.mdl-typography--title,.mdl-typography--title-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:20px;font-weight:500;line-height:1;letter-spacing:.02em}.mdl-typography--title-color-contrast{opacity:.87}.mdl-typography--subhead,.mdl-typography--subhead-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:16px;font-weight:400;line-height:24px;letter-spacing:.04em}.mdl-typography--subhead-color-contrast{opacity:.87}.mdl-typography--body-2,.mdl-typography--body-2-color-contrast{font-size:14px;font-weight:700;line-height:24px;letter-spacing:0}.mdl-typography--body-2-color-contrast{opacity:.87}.mdl-typography--body-1,.mdl-typography--body-1-color-contrast{font-size:14px;font-weight:400;line-height:24px;letter-spacing:0}.mdl-typography--body-1-color-contrast{opacity:.87}.mdl-typography--body-2-force-preferred-font,.mdl-typography--body-2-force-preferred-font-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;line-height:24px;letter-spacing:0}.mdl-typography--body-2-force-preferred-font-color-contrast{opacity:.87}.mdl-typography--body-1-force-preferred-font,.mdl-typography--body-1-force-preferred-font-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:400;line-height:24px;letter-spacing:0}.mdl-typography--body-1-force-preferred-font-color-contrast{opacity:.87}.mdl-typography--caption,.mdl-typography--caption-force-preferred-font{font-size:12px;font-weight:400;line-height:1;letter-spacing:0}.mdl-typography--caption-force-preferred-font{font-family:"Roboto","Helvetica","Arial",sans-serif}.mdl-typography--caption-color-contrast,.mdl-typography--caption-force-preferred-font-color-contrast{font-size:12px;font-weight:400;line-height:1;letter-spacing:0;opacity:.54}.mdl-typography--caption-force-preferred-font-color-contrast,.mdl-typography--menu{font-family:"Roboto","Helvetica","Arial",sans-serif}.mdl-typography--menu{font-size:14px;font-weight:500;line-height:1;letter-spacing:0}.mdl-typography--menu-color-contrast{opacity:.87}.mdl-typography--menu-color-contrast,.mdl-typography--button,.mdl-typography--button-color-contrast{font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;line-height:1;letter-spacing:0}.mdl-typography--button,.mdl-typography--button-color-contrast{text-transform:uppercase}.mdl-typography--button-color-contrast{opacity:.87}.mdl-typography--text-left{text-align:left}.mdl-typography--text-right{text-align:right}.mdl-typography--text-center{text-align:center}.mdl-typography--text-justify{text-align:justify}.mdl-typography--text-nowrap{white-space:nowrap}.mdl-typography--text-lowercase{text-transform:lowercase}.mdl-typography--text-uppercase{text-transform:uppercase}.mdl-typography--text-capitalize{text-transform:capitalize}.mdl-typography--font-thin{font-weight:200!important}.mdl-typography--font-light{font-weight:300!important}.mdl-typography--font-regular{font-weight:400!important}.mdl-typography--font-medium{font-weight:500!important}.mdl-typography--font-bold{font-weight:700!important}.mdl-typography--font-black{font-weight:900!important}.mdl-color-text--red{color:#f44336 !important}.mdl-color--red{background-color:#f44336 !important}.mdl-color-text--red-50{color:#ffebee !important}.mdl-color--red-50{background-color:#ffebee !important}.mdl-color-text--red-100{color:#ffcdd2 !important}.mdl-color--red-100{background-color:#ffcdd2 !important}.mdl-color-text--red-200{color:#ef9a9a !important}.mdl-color--red-200{background-color:#ef9a9a !important}.mdl-color-text--red-300{color:#e57373 !important}.mdl-color--red-300{background-color:#e57373 !important}.mdl-color-text--red-400{color:#ef5350 !important}.mdl-color--red-400{background-color:#ef5350 !important}.mdl-color-text--red-500{color:#f44336 !important}.mdl-color--red-500{background-color:#f44336 !important}.mdl-color-text--red-600{color:#e53935 !important}.mdl-color--red-600{background-color:#e53935 !important}.mdl-color-text--red-700{color:#d32f2f !important}.mdl-color--red-700{background-color:#d32f2f !important}.mdl-color-text--red-800{color:#c62828 !important}.mdl-color--red-800{background-color:#c62828 !important}.mdl-color-text--red-900{color:#b71c1c !important}.mdl-color--red-900{background-color:#b71c1c !important}.mdl-color-text--red-A100{color:#ff8a80 !important}.mdl-color--red-A100{background-color:#ff8a80 !important}.mdl-color-text--red-A200{color:#ff5252 !important}.mdl-color--red-A200{background-color:#ff5252 !important}.mdl-color-text--red-A400{color:#ff1744 !important}.mdl-color--red-A400{background-color:#ff1744 !important}.mdl-color-text--red-A700{color:#d50000 !important}.mdl-color--red-A700{background-color:#d50000 !important}.mdl-color-text--pink{color:#e91e63 !important}.mdl-color--pink{background-color:#e91e63 !important}.mdl-color-text--pink-50{color:#fce4ec !important}.mdl-color--pink-50{background-color:#fce4ec !important}.mdl-color-text--pink-100{color:#f8bbd0 !important}.mdl-color--pink-100{background-color:#f8bbd0 !important}.mdl-color-text--pink-200{color:#f48fb1 !important}.mdl-color--pink-200{background-color:#f48fb1 !important}.mdl-color-text--pink-300{color:#f06292 !important}.mdl-color--pink-300{background-color:#f06292 !important}.mdl-color-text--pink-400{color:#ec407a !important}.mdl-color--pink-400{background-color:#ec407a !important}.mdl-color-text--pink-500{color:#e91e63 !important}.mdl-color--pink-500{background-color:#e91e63 !important}.mdl-color-text--pink-600{color:#d81b60 !important}.mdl-color--pink-600{background-color:#d81b60 !important}.mdl-color-text--pink-700{color:#c2185b !important}.mdl-color--pink-700{background-color:#c2185b !important}.mdl-color-text--pink-800{color:#ad1457 !important}.mdl-color--pink-800{background-color:#ad1457 !important}.mdl-color-text--pink-900{color:#880e4f !important}.mdl-color--pink-900{background-color:#880e4f !important}.mdl-color-text--pink-A100{color:#ff80ab !important}.mdl-color--pink-A100{background-color:#ff80ab !important}.mdl-color-text--pink-A200{color:#ff4081 !important}.mdl-color--pink-A200{background-color:#ff4081 !important}.mdl-color-text--pink-A400{color:#f50057 !important}.mdl-color--pink-A400{background-color:#f50057 !important}.mdl-color-text--pink-A700{color:#c51162 !important}.mdl-color--pink-A700{background-color:#c51162 !important}.mdl-color-text--purple{color:#9c27b0 !important}.mdl-color--purple{background-color:#9c27b0 !important}.mdl-color-text--purple-50{color:#f3e5f5 !important}.mdl-color--purple-50{background-color:#f3e5f5 !important}.mdl-color-text--purple-100{color:#e1bee7 !important}.mdl-color--purple-100{background-color:#e1bee7 !important}.mdl-color-text--purple-200{color:#ce93d8 !important}.mdl-color--purple-200{background-color:#ce93d8 !important}.mdl-color-text--purple-300{color:#ba68c8 !important}.mdl-color--purple-300{background-color:#ba68c8 !important}.mdl-color-text--purple-400{color:#ab47bc !important}.mdl-color--purple-400{background-color:#ab47bc !important}.mdl-color-text--purple-500{color:#9c27b0 !important}.mdl-color--purple-500{background-color:#9c27b0 !important}.mdl-color-text--purple-600{color:#8e24aa !important}.mdl-color--purple-600{background-color:#8e24aa !important}.mdl-color-text--purple-700{color:#7b1fa2 !important}.mdl-color--purple-700{background-color:#7b1fa2 !important}.mdl-color-text--purple-800{color:#6a1b9a !important}.mdl-color--purple-800{background-color:#6a1b9a !important}.mdl-color-text--purple-900{color:#4a148c !important}.mdl-color--purple-900{background-color:#4a148c !important}.mdl-color-text--purple-A100{color:#ea80fc !important}.mdl-color--purple-A100{background-color:#ea80fc !important}.mdl-color-text--purple-A200{color:#e040fb !important}.mdl-color--purple-A200{background-color:#e040fb !important}.mdl-color-text--purple-A400{color:#d500f9 !important}.mdl-color--purple-A400{background-color:#d500f9 !important}.mdl-color-text--purple-A700{color:#a0f !important}.mdl-color--purple-A700{background-color:#a0f !important}.mdl-color-text--deep-purple{color:#673ab7 !important}.mdl-color--deep-purple{background-color:#673ab7 !important}.mdl-color-text--deep-purple-50{color:#ede7f6 !important}.mdl-color--deep-purple-50{background-color:#ede7f6 !important}.mdl-color-text--deep-purple-100{color:#d1c4e9 !important}.mdl-color--deep-purple-100{background-color:#d1c4e9 !important}.mdl-color-text--deep-purple-200{color:#b39ddb !important}.mdl-color--deep-purple-200{background-color:#b39ddb !important}.mdl-color-text--deep-purple-300{color:#9575cd !important}.mdl-color--deep-purple-300{background-color:#9575cd !important}.mdl-color-text--deep-purple-400{color:#7e57c2 !important}.mdl-color--deep-purple-400{background-color:#7e57c2 !important}.mdl-color-text--deep-purple-500{color:#673ab7 !important}.mdl-color--deep-purple-500{background-color:#673ab7 !important}.mdl-color-text--deep-purple-600{color:#5e35b1 !important}.mdl-color--deep-purple-600{background-color:#5e35b1 !important}.mdl-color-text--deep-purple-700{color:#512da8 !important}.mdl-color--deep-purple-700{background-color:#512da8 !important}.mdl-color-text--deep-purple-800{color:#4527a0 !important}.mdl-color--deep-purple-800{background-color:#4527a0 !important}.mdl-color-text--deep-purple-900{color:#311b92 !important}.mdl-color--deep-purple-900{background-color:#311b92 !important}.mdl-color-text--deep-purple-A100{color:#b388ff !important}.mdl-color--deep-purple-A100{background-color:#b388ff !important}.mdl-color-text--deep-purple-A200{color:#7c4dff !important}.mdl-color--deep-purple-A200{background-color:#7c4dff !important}.mdl-color-text--deep-purple-A400{color:#651fff !important}.mdl-color--deep-purple-A400{background-color:#651fff !important}.mdl-color-text--deep-purple-A700{color:#6200ea !important}.mdl-color--deep-purple-A700{background-color:#6200ea !important}.mdl-color-text--indigo{color:#3f51b5 !important}.mdl-color--indigo{background-color:#3f51b5 !important}.mdl-color-text--indigo-50{color:#e8eaf6 !important}.mdl-color--indigo-50{background-color:#e8eaf6 !important}.mdl-color-text--indigo-100{color:#c5cae9 !important}.mdl-color--indigo-100{background-color:#c5cae9 !important}.mdl-color-text--indigo-200{color:#9fa8da !important}.mdl-color--indigo-200{background-color:#9fa8da !important}.mdl-color-text--indigo-300{color:#7986cb !important}.mdl-color--indigo-300{background-color:#7986cb !important}.mdl-color-text--indigo-400{color:#5c6bc0 !important}.mdl-color--indigo-400{background-color:#5c6bc0 !important}.mdl-color-text--indigo-500{color:#3f51b5 !important}.mdl-color--indigo-500{background-color:#3f51b5 !important}.mdl-color-text--indigo-600{color:#3949ab !important}.mdl-color--indigo-600{background-color:#3949ab !important}.mdl-color-text--indigo-700{color:#303f9f !important}.mdl-color--indigo-700{background-color:#303f9f !important}.mdl-color-text--indigo-800{color:#283593 !important}.mdl-color--indigo-800{background-color:#283593 !important}.mdl-color-text--indigo-900{color:#1a237e !important}.mdl-color--indigo-900{background-color:#1a237e !important}.mdl-color-text--indigo-A100{color:#8c9eff !important}.mdl-color--indigo-A100{background-color:#8c9eff !important}.mdl-color-text--indigo-A200{color:#536dfe !important}.mdl-color--indigo-A200{background-color:#536dfe !important}.mdl-color-text--indigo-A400{color:#3d5afe !important}.mdl-color--indigo-A400{background-color:#3d5afe !important}.mdl-color-text--indigo-A700{color:#304ffe !important}.mdl-color--indigo-A700{background-color:#304ffe !important}.mdl-color-text--blue{color:#2196f3 !important}.mdl-color--blue{background-color:#2196f3 !important}.mdl-color-text--blue-50{color:#e3f2fd !important}.mdl-color--blue-50{background-color:#e3f2fd !important}.mdl-color-text--blue-100{color:#bbdefb !important}.mdl-color--blue-100{background-color:#bbdefb !important}.mdl-color-text--blue-200{color:#90caf9 !important}.mdl-color--blue-200{background-color:#90caf9 !important}.mdl-color-text--blue-300{color:#64b5f6 !important}.mdl-color--blue-300{background-color:#64b5f6 !important}.mdl-color-text--blue-400{color:#42a5f5 !important}.mdl-color--blue-400{background-color:#42a5f5 !important}.mdl-color-text--blue-500{color:#2196f3 !important}.mdl-color--blue-500{background-color:#2196f3 !important}.mdl-color-text--blue-600{color:#1e88e5 !important}.mdl-color--blue-600{background-color:#1e88e5 !important}.mdl-color-text--blue-700{color:#1976d2 !important}.mdl-color--blue-700{background-color:#1976d2 !important}.mdl-color-text--blue-800{color:#1565c0 !important}.mdl-color--blue-800{background-color:#1565c0 !important}.mdl-color-text--blue-900{color:#0d47a1 !important}.mdl-color--blue-900{background-color:#0d47a1 !important}.mdl-color-text--blue-A100{color:#82b1ff !important}.mdl-color--blue-A100{background-color:#82b1ff !important}.mdl-color-text--blue-A200{color:#448aff !important}.mdl-color--blue-A200{background-color:#448aff !important}.mdl-color-text--blue-A400{color:#2979ff !important}.mdl-color--blue-A400{background-color:#2979ff !important}.mdl-color-text--blue-A700{color:#2962ff !important}.mdl-color--blue-A700{background-color:#2962ff !important}.mdl-color-text--light-blue{color:#03a9f4 !important}.mdl-color--light-blue{background-color:#03a9f4 !important}.mdl-color-text--light-blue-50{color:#e1f5fe !important}.mdl-color--light-blue-50{background-color:#e1f5fe !important}.mdl-color-text--light-blue-100{color:#b3e5fc !important}.mdl-color--light-blue-100{background-color:#b3e5fc !important}.mdl-color-text--light-blue-200{color:#81d4fa !important}.mdl-color--light-blue-200{background-color:#81d4fa !important}.mdl-color-text--light-blue-300{color:#4fc3f7 !important}.mdl-color--light-blue-300{background-color:#4fc3f7 !important}.mdl-color-text--light-blue-400{color:#29b6f6 !important}.mdl-color--light-blue-400{background-color:#29b6f6 !important}.mdl-color-text--light-blue-500{color:#03a9f4 !important}.mdl-color--light-blue-500{background-color:#03a9f4 !important}.mdl-color-text--light-blue-600{color:#039be5 !important}.mdl-color--light-blue-600{background-color:#039be5 !important}.mdl-color-text--light-blue-700{color:#0288d1 !important}.mdl-color--light-blue-700{background-color:#0288d1 !important}.mdl-color-text--light-blue-800{color:#0277bd !important}.mdl-color--light-blue-800{background-color:#0277bd !important}.mdl-color-text--light-blue-900{color:#01579b !important}.mdl-color--light-blue-900{background-color:#01579b !important}.mdl-color-text--light-blue-A100{color:#80d8ff !important}.mdl-color--light-blue-A100{background-color:#80d8ff !important}.mdl-color-text--light-blue-A200{color:#40c4ff !important}.mdl-color--light-blue-A200{background-color:#40c4ff !important}.mdl-color-text--light-blue-A400{color:#00b0ff !important}.mdl-color--light-blue-A400{background-color:#00b0ff !important}.mdl-color-text--light-blue-A700{color:#0091ea !important}.mdl-color--light-blue-A700{background-color:#0091ea !important}.mdl-color-text--cyan{color:#00bcd4 !important}.mdl-color--cyan{background-color:#00bcd4 !important}.mdl-color-text--cyan-50{color:#e0f7fa !important}.mdl-color--cyan-50{background-color:#e0f7fa !important}.mdl-color-text--cyan-100{color:#b2ebf2 !important}.mdl-color--cyan-100{background-color:#b2ebf2 !important}.mdl-color-text--cyan-200{color:#80deea !important}.mdl-color--cyan-200{background-color:#80deea !important}.mdl-color-text--cyan-300{color:#4dd0e1 !important}.mdl-color--cyan-300{background-color:#4dd0e1 !important}.mdl-color-text--cyan-400{color:#26c6da !important}.mdl-color--cyan-400{background-color:#26c6da !important}.mdl-color-text--cyan-500{color:#00bcd4 !important}.mdl-color--cyan-500{background-color:#00bcd4 !important}.mdl-color-text--cyan-600{color:#00acc1 !important}.mdl-color--cyan-600{background-color:#00acc1 !important}.mdl-color-text--cyan-700{color:#0097a7 !important}.mdl-color--cyan-700{background-color:#0097a7 !important}.mdl-color-text--cyan-800{color:#00838f !important}.mdl-color--cyan-800{background-color:#00838f !important}.mdl-color-text--cyan-900{color:#006064 !important}.mdl-color--cyan-900{background-color:#006064 !important}.mdl-color-text--cyan-A100{color:#84ffff !important}.mdl-color--cyan-A100{background-color:#84ffff !important}.mdl-color-text--cyan-A200{color:#18ffff !important}.mdl-color--cyan-A200{background-color:#18ffff !important}.mdl-color-text--cyan-A400{color:#00e5ff !important}.mdl-color--cyan-A400{background-color:#00e5ff !important}.mdl-color-text--cyan-A700{color:#00b8d4 !important}.mdl-color--cyan-A700{background-color:#00b8d4 !important}.mdl-color-text--teal{color:#009688 !important}.mdl-color--teal{background-color:#009688 !important}.mdl-color-text--teal-50{color:#e0f2f1 !important}.mdl-color--teal-50{background-color:#e0f2f1 !important}.mdl-color-text--teal-100{color:#b2dfdb !important}.mdl-color--teal-100{background-color:#b2dfdb !important}.mdl-color-text--teal-200{color:#80cbc4 !important}.mdl-color--teal-200{background-color:#80cbc4 !important}.mdl-color-text--teal-300{color:#4db6ac !important}.mdl-color--teal-300{background-color:#4db6ac !important}.mdl-color-text--teal-400{color:#26a69a !important}.mdl-color--teal-400{background-color:#26a69a !important}.mdl-color-text--teal-500{color:#009688 !important}.mdl-color--teal-500{background-color:#009688 !important}.mdl-color-text--teal-600{color:#00897b !important}.mdl-color--teal-600{background-color:#00897b !important}.mdl-color-text--teal-700{color:#00796b !important}.mdl-color--teal-700{background-color:#00796b !important}.mdl-color-text--teal-800{color:#00695c !important}.mdl-color--teal-800{background-color:#00695c !important}.mdl-color-text--teal-900{color:#004d40 !important}.mdl-color--teal-900{background-color:#004d40 !important}.mdl-color-text--teal-A100{color:#a7ffeb !important}.mdl-color--teal-A100{background-color:#a7ffeb !important}.mdl-color-text--teal-A200{color:#64ffda !important}.mdl-color--teal-A200{background-color:#64ffda !important}.mdl-color-text--teal-A400{color:#1de9b6 !important}.mdl-color--teal-A400{background-color:#1de9b6 !important}.mdl-color-text--teal-A700{color:#00bfa5 !important}.mdl-color--teal-A700{background-color:#00bfa5 !important}.mdl-color-text--green{color:#4caf50 !important}.mdl-color--green{background-color:#4caf50 !important}.mdl-color-text--green-50{color:#e8f5e9 !important}.mdl-color--green-50{background-color:#e8f5e9 !important}.mdl-color-text--green-100{color:#c8e6c9 !important}.mdl-color--green-100{background-color:#c8e6c9 !important}.mdl-color-text--green-200{color:#a5d6a7 !important}.mdl-color--green-200{background-color:#a5d6a7 !important}.mdl-color-text--green-300{color:#81c784 !important}.mdl-color--green-300{background-color:#81c784 !important}.mdl-color-text--green-400{color:#66bb6a !important}.mdl-color--green-400{background-color:#66bb6a !important}.mdl-color-text--green-500{color:#4caf50 !important}.mdl-color--green-500{background-color:#4caf50 !important}.mdl-color-text--green-600{color:#43a047 !important}.mdl-color--green-600{background-color:#43a047 !important}.mdl-color-text--green-700{color:#388e3c !important}.mdl-color--green-700{background-color:#388e3c !important}.mdl-color-text--green-800{color:#2e7d32 !important}.mdl-color--green-800{background-color:#2e7d32 !important}.mdl-color-text--green-900{color:#1b5e20 !important}.mdl-color--green-900{background-color:#1b5e20 !important}.mdl-color-text--green-A100{color:#b9f6ca !important}.mdl-color--green-A100{background-color:#b9f6ca !important}.mdl-color-text--green-A200{color:#69f0ae !important}.mdl-color--green-A200{background-color:#69f0ae !important}.mdl-color-text--green-A400{color:#00e676 !important}.mdl-color--green-A400{background-color:#00e676 !important}.mdl-color-text--green-A700{color:#00c853 !important}.mdl-color--green-A700{background-color:#00c853 !important}.mdl-color-text--light-green{color:#8bc34a !important}.mdl-color--light-green{background-color:#8bc34a !important}.mdl-color-text--light-green-50{color:#f1f8e9 !important}.mdl-color--light-green-50{background-color:#f1f8e9 !important}.mdl-color-text--light-green-100{color:#dcedc8 !important}.mdl-color--light-green-100{background-color:#dcedc8 !important}.mdl-color-text--light-green-200{color:#c5e1a5 !important}.mdl-color--light-green-200{background-color:#c5e1a5 !important}.mdl-color-text--light-green-300{color:#aed581 !important}.mdl-color--light-green-300{background-color:#aed581 !important}.mdl-color-text--light-green-400{color:#9ccc65 !important}.mdl-color--light-green-400{background-color:#9ccc65 !important}.mdl-color-text--light-green-500{color:#8bc34a !important}.mdl-color--light-green-500{background-color:#8bc34a !important}.mdl-color-text--light-green-600{color:#7cb342 !important}.mdl-color--light-green-600{background-color:#7cb342 !important}.mdl-color-text--light-green-700{color:#689f38 !important}.mdl-color--light-green-700{background-color:#689f38 !important}.mdl-color-text--light-green-800{color:#558b2f !important}.mdl-color--light-green-800{background-color:#558b2f !important}.mdl-color-text--light-green-900{color:#33691e !important}.mdl-color--light-green-900{background-color:#33691e !important}.mdl-color-text--light-green-A100{color:#ccff90 !important}.mdl-color--light-green-A100{background-color:#ccff90 !important}.mdl-color-text--light-green-A200{color:#b2ff59 !important}.mdl-color--light-green-A200{background-color:#b2ff59 !important}.mdl-color-text--light-green-A400{color:#76ff03 !important}.mdl-color--light-green-A400{background-color:#76ff03 !important}.mdl-color-text--light-green-A700{color:#64dd17 !important}.mdl-color--light-green-A700{background-color:#64dd17 !important}.mdl-color-text--lime{color:#cddc39 !important}.mdl-color--lime{background-color:#cddc39 !important}.mdl-color-text--lime-50{color:#f9fbe7 !important}.mdl-color--lime-50{background-color:#f9fbe7 !important}.mdl-color-text--lime-100{color:#f0f4c3 !important}.mdl-color--lime-100{background-color:#f0f4c3 !important}.mdl-color-text--lime-200{color:#e6ee9c !important}.mdl-color--lime-200{background-color:#e6ee9c !important}.mdl-color-text--lime-300{color:#dce775 !important}.mdl-color--lime-300{background-color:#dce775 !important}.mdl-color-text--lime-400{color:#d4e157 !important}.mdl-color--lime-400{background-color:#d4e157 !important}.mdl-color-text--lime-500{color:#cddc39 !important}.mdl-color--lime-500{background-color:#cddc39 !important}.mdl-color-text--lime-600{color:#c0ca33 !important}.mdl-color--lime-600{background-color:#c0ca33 !important}.mdl-color-text--lime-700{color:#afb42b !important}.mdl-color--lime-700{background-color:#afb42b !important}.mdl-color-text--lime-800{color:#9e9d24 !important}.mdl-color--lime-800{background-color:#9e9d24 !important}.mdl-color-text--lime-900{color:#827717 !important}.mdl-color--lime-900{background-color:#827717 !important}.mdl-color-text--lime-A100{color:#f4ff81 !important}.mdl-color--lime-A100{background-color:#f4ff81 !important}.mdl-color-text--lime-A200{color:#eeff41 !important}.mdl-color--lime-A200{background-color:#eeff41 !important}.mdl-color-text--lime-A400{color:#c6ff00 !important}.mdl-color--lime-A400{background-color:#c6ff00 !important}.mdl-color-text--lime-A700{color:#aeea00 !important}.mdl-color--lime-A700{background-color:#aeea00 !important}.mdl-color-text--yellow{color:#ffeb3b !important}.mdl-color--yellow{background-color:#ffeb3b !important}.mdl-color-text--yellow-50{color:#fffde7 !important}.mdl-color--yellow-50{background-color:#fffde7 !important}.mdl-color-text--yellow-100{color:#fff9c4 !important}.mdl-color--yellow-100{background-color:#fff9c4 !important}.mdl-color-text--yellow-200{color:#fff59d !important}.mdl-color--yellow-200{background-color:#fff59d !important}.mdl-color-text--yellow-300{color:#fff176 !important}.mdl-color--yellow-300{background-color:#fff176 !important}.mdl-color-text--yellow-400{color:#ffee58 !important}.mdl-color--yellow-400{background-color:#ffee58 !important}.mdl-color-text--yellow-500{color:#ffeb3b !important}.mdl-color--yellow-500{background-color:#ffeb3b !important}.mdl-color-text--yellow-600{color:#fdd835 !important}.mdl-color--yellow-600{background-color:#fdd835 !important}.mdl-color-text--yellow-700{color:#fbc02d !important}.mdl-color--yellow-700{background-color:#fbc02d !important}.mdl-color-text--yellow-800{color:#f9a825 !important}.mdl-color--yellow-800{background-color:#f9a825 !important}.mdl-color-text--yellow-900{color:#f57f17 !important}.mdl-color--yellow-900{background-color:#f57f17 !important}.mdl-color-text--yellow-A100{color:#ffff8d !important}.mdl-color--yellow-A100{background-color:#ffff8d !important}.mdl-color-text--yellow-A200{color:#ff0 !important}.mdl-color--yellow-A200{background-color:#ff0 !important}.mdl-color-text--yellow-A400{color:#ffea00 !important}.mdl-color--yellow-A400{background-color:#ffea00 !important}.mdl-color-text--yellow-A700{color:#ffd600 !important}.mdl-color--yellow-A700{background-color:#ffd600 !important}.mdl-color-text--amber{color:#ffc107 !important}.mdl-color--amber{background-color:#ffc107 !important}.mdl-color-text--amber-50{color:#fff8e1 !important}.mdl-color--amber-50{background-color:#fff8e1 !important}.mdl-color-text--amber-100{color:#ffecb3 !important}.mdl-color--amber-100{background-color:#ffecb3 !important}.mdl-color-text--amber-200{color:#ffe082 !important}.mdl-color--amber-200{background-color:#ffe082 !important}.mdl-color-text--amber-300{color:#ffd54f !important}.mdl-color--amber-300{background-color:#ffd54f !important}.mdl-color-text--amber-400{color:#ffca28 !important}.mdl-color--amber-400{background-color:#ffca28 !important}.mdl-color-text--amber-500{color:#ffc107 !important}.mdl-color--amber-500{background-color:#ffc107 !important}.mdl-color-text--amber-600{color:#ffb300 !important}.mdl-color--amber-600{background-color:#ffb300 !important}.mdl-color-text--amber-700{color:#ffa000 !important}.mdl-color--amber-700{background-color:#ffa000 !important}.mdl-color-text--amber-800{color:#ff8f00 !important}.mdl-color--amber-800{background-color:#ff8f00 !important}.mdl-color-text--amber-900{color:#ff6f00 !important}.mdl-color--amber-900{background-color:#ff6f00 !important}.mdl-color-text--amber-A100{color:#ffe57f !important}.mdl-color--amber-A100{background-color:#ffe57f !important}.mdl-color-text--amber-A200{color:#ffd740 !important}.mdl-color--amber-A200{background-color:#ffd740 !important}.mdl-color-text--amber-A400{color:#ffc400 !important}.mdl-color--amber-A400{background-color:#ffc400 !important}.mdl-color-text--amber-A700{color:#ffab00 !important}.mdl-color--amber-A700{background-color:#ffab00 !important}.mdl-color-text--orange{color:#ff9800 !important}.mdl-color--orange{background-color:#ff9800 !important}.mdl-color-text--orange-50{color:#fff3e0 !important}.mdl-color--orange-50{background-color:#fff3e0 !important}.mdl-color-text--orange-100{color:#ffe0b2 !important}.mdl-color--orange-100{background-color:#ffe0b2 !important}.mdl-color-text--orange-200{color:#ffcc80 !important}.mdl-color--orange-200{background-color:#ffcc80 !important}.mdl-color-text--orange-300{color:#ffb74d !important}.mdl-color--orange-300{background-color:#ffb74d !important}.mdl-color-text--orange-400{color:#ffa726 !important}.mdl-color--orange-400{background-color:#ffa726 !important}.mdl-color-text--orange-500{color:#ff9800 !important}.mdl-color--orange-500{background-color:#ff9800 !important}.mdl-color-text--orange-600{color:#fb8c00 !important}.mdl-color--orange-600{background-color:#fb8c00 !important}.mdl-color-text--orange-700{color:#f57c00 !important}.mdl-color--orange-700{background-color:#f57c00 !important}.mdl-color-text--orange-800{color:#ef6c00 !important}.mdl-color--orange-800{background-color:#ef6c00 !important}.mdl-color-text--orange-900{color:#e65100 !important}.mdl-color--orange-900{background-color:#e65100 !important}.mdl-color-text--orange-A100{color:#ffd180 !important}.mdl-color--orange-A100{background-color:#ffd180 !important}.mdl-color-text--orange-A200{color:#ffab40 !important}.mdl-color--orange-A200{background-color:#ffab40 !important}.mdl-color-text--orange-A400{color:#ff9100 !important}.mdl-color--orange-A400{background-color:#ff9100 !important}.mdl-color-text--orange-A700{color:#ff6d00 !important}.mdl-color--orange-A700{background-color:#ff6d00 !important}.mdl-color-text--deep-orange{color:#ff5722 !important}.mdl-color--deep-orange{background-color:#ff5722 !important}.mdl-color-text--deep-orange-50{color:#fbe9e7 !important}.mdl-color--deep-orange-50{background-color:#fbe9e7 !important}.mdl-color-text--deep-orange-100{color:#ffccbc !important}.mdl-color--deep-orange-100{background-color:#ffccbc !important}.mdl-color-text--deep-orange-200{color:#ffab91 !important}.mdl-color--deep-orange-200{background-color:#ffab91 !important}.mdl-color-text--deep-orange-300{color:#ff8a65 !important}.mdl-color--deep-orange-300{background-color:#ff8a65 !important}.mdl-color-text--deep-orange-400{color:#ff7043 !important}.mdl-color--deep-orange-400{background-color:#ff7043 !important}.mdl-color-text--deep-orange-500{color:#ff5722 !important}.mdl-color--deep-orange-500{background-color:#ff5722 !important}.mdl-color-text--deep-orange-600{color:#f4511e !important}.mdl-color--deep-orange-600{background-color:#f4511e !important}.mdl-color-text--deep-orange-700{color:#e64a19 !important}.mdl-color--deep-orange-700{background-color:#e64a19 !important}.mdl-color-text--deep-orange-800{color:#d84315 !important}.mdl-color--deep-orange-800{background-color:#d84315 !important}.mdl-color-text--deep-orange-900{color:#bf360c !important}.mdl-color--deep-orange-900{background-color:#bf360c !important}.mdl-color-text--deep-orange-A100{color:#ff9e80 !important}.mdl-color--deep-orange-A100{background-color:#ff9e80 !important}.mdl-color-text--deep-orange-A200{color:#ff6e40 !important}.mdl-color--deep-orange-A200{background-color:#ff6e40 !important}.mdl-color-text--deep-orange-A400{color:#ff3d00 !important}.mdl-color--deep-orange-A400{background-color:#ff3d00 !important}.mdl-color-text--deep-orange-A700{color:#dd2c00 !important}.mdl-color--deep-orange-A700{background-color:#dd2c00 !important}.mdl-color-text--brown{color:#795548 !important}.mdl-color--brown{background-color:#795548 !important}.mdl-color-text--brown-50{color:#efebe9 !important}.mdl-color--brown-50{background-color:#efebe9 !important}.mdl-color-text--brown-100{color:#d7ccc8 !important}.mdl-color--brown-100{background-color:#d7ccc8 !important}.mdl-color-text--brown-200{color:#bcaaa4 !important}.mdl-color--brown-200{background-color:#bcaaa4 !important}.mdl-color-text--brown-300{color:#a1887f !important}.mdl-color--brown-300{background-color:#a1887f !important}.mdl-color-text--brown-400{color:#8d6e63 !important}.mdl-color--brown-400{background-color:#8d6e63 !important}.mdl-color-text--brown-500{color:#795548 !important}.mdl-color--brown-500{background-color:#795548 !important}.mdl-color-text--brown-600{color:#6d4c41 !important}.mdl-color--brown-600{background-color:#6d4c41 !important}.mdl-color-text--brown-700{color:#5d4037 !important}.mdl-color--brown-700{background-color:#5d4037 !important}.mdl-color-text--brown-800{color:#4e342e !important}.mdl-color--brown-800{background-color:#4e342e !important}.mdl-color-text--brown-900{color:#3e2723 !important}.mdl-color--brown-900{background-color:#3e2723 !important}.mdl-color-text--grey{color:#9e9e9e !important}.mdl-color--grey{background-color:#9e9e9e !important}.mdl-color-text--grey-50{color:#fafafa !important}.mdl-color--grey-50{background-color:#fafafa !important}.mdl-color-text--grey-100{color:#f5f5f5 !important}.mdl-color--grey-100{background-color:#f5f5f5 !important}.mdl-color-text--grey-200{color:#eee !important}.mdl-color--grey-200{background-color:#eee !important}.mdl-color-text--grey-300{color:#e0e0e0 !important}.mdl-color--grey-300{background-color:#e0e0e0 !important}.mdl-color-text--grey-400{color:#bdbdbd !important}.mdl-color--grey-400{background-color:#bdbdbd !important}.mdl-color-text--grey-500{color:#9e9e9e !important}.mdl-color--grey-500{background-color:#9e9e9e !important}.mdl-color-text--grey-600{color:#757575 !important}.mdl-color--grey-600{background-color:#757575 !important}.mdl-color-text--grey-700{color:#616161 !important}.mdl-color--grey-700{background-color:#616161 !important}.mdl-color-text--grey-800{color:#424242 !important}.mdl-color--grey-800{background-color:#424242 !important}.mdl-color-text--grey-900{color:#212121 !important}.mdl-color--grey-900{background-color:#212121 !important}.mdl-color-text--blue-grey{color:#607d8b !important}.mdl-color--blue-grey{background-color:#607d8b !important}.mdl-color-text--blue-grey-50{color:#eceff1 !important}.mdl-color--blue-grey-50{background-color:#eceff1 !important}.mdl-color-text--blue-grey-100{color:#cfd8dc !important}.mdl-color--blue-grey-100{background-color:#cfd8dc !important}.mdl-color-text--blue-grey-200{color:#b0bec5 !important}.mdl-color--blue-grey-200{background-color:#b0bec5 !important}.mdl-color-text--blue-grey-300{color:#90a4ae !important}.mdl-color--blue-grey-300{background-color:#90a4ae !important}.mdl-color-text--blue-grey-400{color:#78909c !important}.mdl-color--blue-grey-400{background-color:#78909c !important}.mdl-color-text--blue-grey-500{color:#607d8b !important}.mdl-color--blue-grey-500{background-color:#607d8b !important}.mdl-color-text--blue-grey-600{color:#546e7a !important}.mdl-color--blue-grey-600{background-color:#546e7a !important}.mdl-color-text--blue-grey-700{color:#455a64 !important}.mdl-color--blue-grey-700{background-color:#455a64 !important}.mdl-color-text--blue-grey-800{color:#37474f !important}.mdl-color--blue-grey-800{background-color:#37474f !important}.mdl-color-text--blue-grey-900{color:#263238 !important}.mdl-color--blue-grey-900{background-color:#263238 !important}.mdl-color--black{background-color:#000 !important}.mdl-color-text--black{color:#000 !important}.mdl-color--white{background-color:#fff !important}.mdl-color-text--white{color:#fff !important}.mdl-color--primary{background-color:#3f51b5 !important}.mdl-color--primary-contrast{background-color:#fff !important}.mdl-color--primary-dark{background-color:#303f9f !important}.mdl-color--accent{background-color:#ff4081 !important}.mdl-color--accent-contrast{background-color:#fff !important}.mdl-color-text--primary{color:#3f51b5 !important}.mdl-color-text--primary-contrast{color:#fff !important}.mdl-color-text--primary-dark{color:#303f9f !important}.mdl-color-text--accent{color:#ff4081 !important}.mdl-color-text--accent-contrast{color:#fff !important}.mdl-ripple{background:#000;border-radius:50%;height:50px;left:0;opacity:0;pointer-events:none;position:absolute;top:0;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:50px;overflow:hidden}.mdl-ripple.is-animating{-webkit-transition:-webkit-transform .3s cubic-bezier(0,0,.2,1),width .3s cubic-bezier(0,0,.2,1),height .3s cubic-bezier(0,0,.2,1),opacity .6s cubic-bezier(0,0,.2,1);transition:transform .3s cubic-bezier(0,0,.2,1),width .3s cubic-bezier(0,0,.2,1),height .3s cubic-bezier(0,0,.2,1),opacity .6s cubic-bezier(0,0,.2,1)}.mdl-ripple.is-visible{opacity:.3}.mdl-animation--default,.mdl-animation--fast-out-slow-in{-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-animation--linear-out-slow-in{-webkit-transition-timing-function:cubic-bezier(0,0,.2,1);transition-timing-function:cubic-bezier(0,0,.2,1)}.mdl-animation--fast-out-linear-in{-webkit-transition-timing-function:cubic-bezier(.4,0,1,1);transition-timing-function:cubic-bezier(.4,0,1,1)}.mdl-badge{position:relative;white-space:nowrap;margin-right:24px}.mdl-badge:not([data-badge]){margin-right:auto}.mdl-badge[data-badge]:after{content:attr(data-badge);display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-content:center;-ms-flex-line-pack:center;align-content:center;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;position:absolute;top:-11px;right:-24px;font-family:"Roboto","Helvetica","Arial",sans-serif;font-weight:600;font-size:12px;width:22px;height:22px;border-radius:50%;background:#ff4081;color:#fff}.mdl-button .mdl-badge[data-badge]:after{top:-10px;right:-5px}.mdl-badge.mdl-badge--no-background[data-badge]:after{color:#ff4081;background:#fff;box-shadow:0 0 1px gray}.mdl-button{background:0 0;border:none;border-radius:2px;color:#000;position:relative;height:36px;min-width:64px;padding:0 16px;display:inline-block;font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:14px;font-weight:500;text-transform:uppercase;letter-spacing:0;overflow:hidden;will-change:box-shadow,transform;-webkit-transition:box-shadow .2s cubic-bezier(.4,0,1,1),background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1);transition:box-shadow .2s cubic-bezier(.4,0,1,1),background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1);outline:none;cursor:pointer;text-decoration:none;text-align:center;line-height:36px;vertical-align:middle}.mdl-button::-moz-focus-inner{border:0}.mdl-button:hover{background-color:rgba(158,158,158,.2)}.mdl-button:focus:not(:active){background-color:rgba(0,0,0,.12)}.mdl-button:active{background-color:rgba(158,158,158,.4)}.mdl-button.mdl-button--colored{color:#3f51b5}.mdl-button.mdl-button--colored:focus:not(:active){background-color:rgba(0,0,0,.12)}input.mdl-button[type="submit"]{-webkit-appearance:none}.mdl-button--raised{background:rgba(158,158,158,.2);box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-button--raised:active{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2);background-color:rgba(158,158,158,.4)}.mdl-button--raised:focus:not(:active){box-shadow:0 0 8px rgba(0,0,0,.18),0 8px 16px rgba(0,0,0,.36);background-color:rgba(158,158,158,.4)}.mdl-button--raised.mdl-button--colored{background:#3f51b5;color:#fff}.mdl-button--raised.mdl-button--colored:hover{background-color:#3f51b5}.mdl-button--raised.mdl-button--colored:active{background-color:#3f51b5}.mdl-button--raised.mdl-button--colored:focus:not(:active){background-color:#3f51b5}.mdl-button--raised.mdl-button--colored .mdl-ripple{background:#fff}.mdl-button--fab{border-radius:50%;font-size:24px;height:56px;margin:auto;min-width:56px;width:56px;padding:0;overflow:hidden;background:rgba(158,158,158,.2);box-shadow:0 1px 1.5px 0 rgba(0,0,0,.12),0 1px 1px 0 rgba(0,0,0,.24);position:relative;line-height:normal}.mdl-button--fab .material-icons{position:absolute;top:50%;left:50%;-webkit-transform:translate(-12px,-12px);-ms-transform:translate(-12px,-12px);transform:translate(-12px,-12px);line-height:24px;width:24px}.mdl-button--fab.mdl-button--mini-fab{height:40px;min-width:40px;width:40px}.mdl-button--fab .mdl-button__ripple-container{border-radius:50%;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-button--fab:active{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2);background-color:rgba(158,158,158,.4)}.mdl-button--fab:focus:not(:active){box-shadow:0 0 8px rgba(0,0,0,.18),0 8px 16px rgba(0,0,0,.36);background-color:rgba(158,158,158,.4)}.mdl-button--fab.mdl-button--colored{background:#ff4081;color:#fff}.mdl-button--fab.mdl-button--colored:hover{background-color:#ff4081}.mdl-button--fab.mdl-button--colored:focus:not(:active){background-color:#ff4081}.mdl-button--fab.mdl-button--colored:active{background-color:#ff4081}.mdl-button--fab.mdl-button--colored .mdl-ripple{background:#fff}.mdl-button--icon{border-radius:50%;font-size:24px;height:32px;margin-left:0;margin-right:0;min-width:32px;width:32px;padding:0;overflow:hidden;color:inherit;line-height:normal}.mdl-button--icon .material-icons{position:absolute;top:50%;left:50%;-webkit-transform:translate(-12px,-12px);-ms-transform:translate(-12px,-12px);transform:translate(-12px,-12px);line-height:24px;width:24px}.mdl-button--icon.mdl-button--mini-icon{height:24px;min-width:24px;width:24px}.mdl-button--icon.mdl-button--mini-icon .material-icons{top:0;left:0}.mdl-button--icon .mdl-button__ripple-container{border-radius:50%;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-button__ripple-container{display:block;height:100%;left:0;position:absolute;top:0;width:100%;z-index:0;overflow:hidden}.mdl-button[disabled] .mdl-button__ripple-container .mdl-ripple,.mdl-button.mdl-button--disabled .mdl-button__ripple-container .mdl-ripple{background-color:transparent}.mdl-button--primary.mdl-button--primary{color:#3f51b5}.mdl-button--primary.mdl-button--primary .mdl-ripple{background:#fff}.mdl-button--primary.mdl-button--primary.mdl-button--raised,.mdl-button--primary.mdl-button--primary.mdl-button--fab{color:#fff;background-color:#3f51b5}.mdl-button--accent.mdl-button--accent{color:#ff4081}.mdl-button--accent.mdl-button--accent .mdl-ripple{background:#fff}.mdl-button--accent.mdl-button--accent.mdl-button--raised,.mdl-button--accent.mdl-button--accent.mdl-button--fab{color:#fff;background-color:#ff4081}.mdl-button[disabled][disabled],.mdl-button.mdl-button--disabled.mdl-button--disabled{color:rgba(0,0,0,.26);cursor:default;background-color:transparent}.mdl-button--fab[disabled][disabled],.mdl-button--fab.mdl-button--disabled.mdl-button--disabled,.mdl-button--raised[disabled][disabled],.mdl-button--raised.mdl-button--disabled.mdl-button--disabled{background-color:rgba(0,0,0,.12);color:rgba(0,0,0,.26);box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-button--colored[disabled][disabled],.mdl-button--colored.mdl-button--disabled.mdl-button--disabled{color:rgba(0,0,0,.26)}.mdl-button .material-icons{vertical-align:middle}.mdl-card{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;font-size:16px;font-weight:400;min-height:200px;overflow:hidden;width:330px;z-index:1;position:relative;background:#fff;border-radius:2px;box-sizing:border-box}.mdl-card__media{background-color:#ff4081;background-repeat:repeat;background-position:50% 50%;background-size:cover;background-origin:padding-box;background-attachment:scroll;box-sizing:border-box}.mdl-card__title{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;color:#000;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:stretch;-webkit-justify-content:stretch;-ms-flex-pack:stretch;justify-content:stretch;line-height:normal;padding:16px;-webkit-perspective-origin:165px 56px;perspective-origin:165px 56px;-webkit-transform-origin:165px 56px;-ms-transform-origin:165px 56px;transform-origin:165px 56px;box-sizing:border-box}.mdl-card__title.mdl-card--border{border-bottom:1px solid rgba(0,0,0,.1)}.mdl-card__title-text{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end;color:inherit;display:-webkit-flex;display:-ms-flexbox;display:flex;font-size:24px;font-weight:300;line-height:normal;overflow:hidden;-webkit-transform-origin:149px 48px;-ms-transform-origin:149px 48px;transform-origin:149px 48px;margin:0}.mdl-card__subtitle-text{font-size:14px;color:rgba(0,0,0,.54);margin:0}.mdl-card__supporting-text{color:rgba(0,0,0,.54);font-size:13px;line-height:18px;overflow:hidden;padding:16px;width:90%}.mdl-card__actions{font-size:16px;line-height:normal;width:100%;background-color:transparent;padding:8px;box-sizing:border-box}.mdl-card__actions.mdl-card--border{border-top:1px solid rgba(0,0,0,.1)}.mdl-card--expand{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.mdl-card__menu{position:absolute;right:16px;top:16px}.mdl-checkbox{position:relative;z-index:1;vertical-align:middle;display:inline-block;box-sizing:border-box;width:100%;height:24px;margin:0;padding:0}.mdl-checkbox.is-upgraded{padding-left:24px}.mdl-checkbox__input{line-height:24px}.mdl-checkbox.is-upgraded .mdl-checkbox__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-checkbox__box-outline{position:absolute;top:3px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;margin:0;cursor:pointer;overflow:hidden;border:2px solid rgba(0,0,0,.54);border-radius:2px;z-index:2}.mdl-checkbox.is-checked .mdl-checkbox__box-outline{border:2px solid #3f51b5}.mdl-checkbox.is-disabled .mdl-checkbox__box-outline{border:2px solid rgba(0,0,0,.26);cursor:auto}.mdl-checkbox__focus-helper{position:absolute;top:3px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;border-radius:50%;background-color:transparent}.mdl-checkbox.is-focused .mdl-checkbox__focus-helper{box-shadow:0 0 0 8px rgba(0,0,0,.1);background-color:rgba(0,0,0,.1)}.mdl-checkbox.is-focused.is-checked .mdl-checkbox__focus-helper{box-shadow:0 0 0 8px rgba(63,81,181,.26);background-color:rgba(63,81,181,.26)}.mdl-checkbox__tick-outline{position:absolute;top:0;left:0;height:100%;width:100%;-webkit-mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8ZGVmcz4KICAgIDxjbGlwUGF0aCBpZD0iY2xpcCI+CiAgICAgIDxwYXRoCiAgICAgICAgIGQ9Ik0gMCwwIDAsMSAxLDEgMSwwIDAsMCB6IE0gMC44NTM0Mzc1LDAuMTY3MTg3NSAwLjk1OTY4NzUsMC4yNzMxMjUgMC40MjkzNzUsMC44MDM0Mzc1IDAuMzIzMTI1LDAuOTA5Njg3NSAwLjIxNzE4NzUsMC44MDM0Mzc1IDAuMDQwMzEyNSwwLjYyNjg3NSAwLjE0NjU2MjUsMC41MjA2MjUgMC4zMjMxMjUsMC42OTc1IDAuODUzNDM3NSwwLjE2NzE4NzUgeiIKICAgICAgICAgc3R5bGU9ImZpbGw6I2ZmZmZmZjtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KICAgIDwvY2xpcFBhdGg+CiAgICA8bWFzayBpZD0ibWFzayIgbWFza1VuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgbWFza0NvbnRlbnRVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giPgogICAgICA8cGF0aAogICAgICAgICBkPSJNIDAsMCAwLDEgMSwxIDEsMCAwLDAgeiBNIDAuODUzNDM3NSwwLjE2NzE4NzUgMC45NTk2ODc1LDAuMjczMTI1IDAuNDI5Mzc1LDAuODAzNDM3NSAwLjMyMzEyNSwwLjkwOTY4NzUgMC4yMTcxODc1LDAuODAzNDM3NSAwLjA0MDMxMjUsMC42MjY4NzUgMC4xNDY1NjI1LDAuNTIwNjI1IDAuMzIzMTI1LDAuNjk3NSAwLjg1MzQzNzUsMC4xNjcxODc1IHoiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmUiIC8+CiAgICA8L21hc2s+CiAgPC9kZWZzPgogIDxyZWN0CiAgICAgd2lkdGg9IjEiCiAgICAgaGVpZ2h0PSIxIgogICAgIHg9IjAiCiAgICAgeT0iMCIKICAgICBjbGlwLXBhdGg9InVybCgjY2xpcCkiCiAgICAgc3R5bGU9ImZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KPC9zdmc+Cg==");mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8ZGVmcz4KICAgIDxjbGlwUGF0aCBpZD0iY2xpcCI+CiAgICAgIDxwYXRoCiAgICAgICAgIGQ9Ik0gMCwwIDAsMSAxLDEgMSwwIDAsMCB6IE0gMC44NTM0Mzc1LDAuMTY3MTg3NSAwLjk1OTY4NzUsMC4yNzMxMjUgMC40MjkzNzUsMC44MDM0Mzc1IDAuMzIzMTI1LDAuOTA5Njg3NSAwLjIxNzE4NzUsMC44MDM0Mzc1IDAuMDQwMzEyNSwwLjYyNjg3NSAwLjE0NjU2MjUsMC41MjA2MjUgMC4zMjMxMjUsMC42OTc1IDAuODUzNDM3NSwwLjE2NzE4NzUgeiIKICAgICAgICAgc3R5bGU9ImZpbGw6I2ZmZmZmZjtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KICAgIDwvY2xpcFBhdGg+CiAgICA8bWFzayBpZD0ibWFzayIgbWFza1VuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgbWFza0NvbnRlbnRVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giPgogICAgICA8cGF0aAogICAgICAgICBkPSJNIDAsMCAwLDEgMSwxIDEsMCAwLDAgeiBNIDAuODUzNDM3NSwwLjE2NzE4NzUgMC45NTk2ODc1LDAuMjczMTI1IDAuNDI5Mzc1LDAuODAzNDM3NSAwLjMyMzEyNSwwLjkwOTY4NzUgMC4yMTcxODc1LDAuODAzNDM3NSAwLjA0MDMxMjUsMC42MjY4NzUgMC4xNDY1NjI1LDAuNTIwNjI1IDAuMzIzMTI1LDAuNjk3NSAwLjg1MzQzNzUsMC4xNjcxODc1IHoiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmUiIC8+CiAgICA8L21hc2s+CiAgPC9kZWZzPgogIDxyZWN0CiAgICAgd2lkdGg9IjEiCiAgICAgaGVpZ2h0PSIxIgogICAgIHg9IjAiCiAgICAgeT0iMCIKICAgICBjbGlwLXBhdGg9InVybCgjY2xpcCkiCiAgICAgc3R5bGU9ImZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZSIgLz4KPC9zdmc+Cg==");background:0 0;-webkit-transition-duration:.28s;transition-duration:.28s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:background;transition-property:background}.mdl-checkbox.is-checked .mdl-checkbox__tick-outline{background:#3f51b5 url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8cGF0aAogICAgIGQ9Ik0gMC4wNDAzODA1OSwwLjYyNjc3NjcgMC4xNDY0NDY2MSwwLjUyMDcxMDY4IDAuNDI5Mjg5MzIsMC44MDM1NTMzOSAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IE0gMC4yMTcxNTcyOSwwLjgwMzU1MzM5IDAuODUzNTUzMzksMC4xNjcxNTcyOSAwLjk1OTYxOTQxLDAuMjczMjIzMyAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IgogICAgIGlkPSJyZWN0Mzc4MCIKICAgICBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lIiAvPgo8L3N2Zz4K")}.mdl-checkbox.is-checked.is-disabled .mdl-checkbox__tick-outline{background:rgba(0,0,0,.26)url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8cGF0aAogICAgIGQ9Ik0gMC4wNDAzODA1OSwwLjYyNjc3NjcgMC4xNDY0NDY2MSwwLjUyMDcxMDY4IDAuNDI5Mjg5MzIsMC44MDM1NTMzOSAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IE0gMC4yMTcxNTcyOSwwLjgwMzU1MzM5IDAuODUzNTUzMzksMC4xNjcxNTcyOSAwLjk1OTYxOTQxLDAuMjczMjIzMyAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IgogICAgIGlkPSJyZWN0Mzc4MCIKICAgICBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lIiAvPgo8L3N2Zz4K")}.mdl-checkbox__label{position:relative;cursor:pointer;font-size:16px;line-height:24px;margin:0}.mdl-checkbox.is-disabled .mdl-checkbox__label{color:rgba(0,0,0,.26);cursor:auto}.mdl-checkbox__ripple-container{position:absolute;z-index:2;top:-6px;left:-10px;box-sizing:border-box;width:36px;height:36px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-checkbox__ripple-container .mdl-ripple{background:#3f51b5}.mdl-checkbox.is-disabled .mdl-checkbox__ripple-container{cursor:auto}.mdl-checkbox.is-disabled .mdl-checkbox__ripple-container .mdl-ripple{background:0 0}.mdl-data-table{position:relative;border:1px solid rgba(0,0,0,.12);border-collapse:collapse;white-space:nowrap;font-size:13px;background-color:#fff}.mdl-data-table thead{padding-bottom:3px}.mdl-data-table thead .mdl-data-table__select{margin-top:0}.mdl-data-table tbody tr{position:relative;height:48px;-webkit-transition-duration:.28s;transition-duration:.28s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:background-color;transition-property:background-color}.mdl-data-table tbody tr.is-selected{background-color:#e0e0e0}.mdl-data-table tbody tr:hover{background-color:#eee}.mdl-data-table td{text-align:right}.mdl-data-table th{padding:0 18px;text-align:right}.mdl-data-table td:first-of-type,.mdl-data-table th:first-of-type{padding-left:24px}.mdl-data-table td:last-of-type,.mdl-data-table th:last-of-type{padding-right:24px}.mdl-data-table td{position:relative;vertical-align:top;height:48px;border-top:1px solid rgba(0,0,0,.12);border-bottom:1px solid rgba(0,0,0,.12);padding:12px 18px 0;box-sizing:border-box}.mdl-data-table td .mdl-data-table__select{vertical-align:top;position:absolute;left:24px}.mdl-data-table th{position:relative;vertical-align:bottom;text-overflow:ellipsis;font-weight:700;line-height:24px;letter-spacing:0;height:48px;font-size:12px;color:rgba(0,0,0,.54);padding-bottom:8px;box-sizing:border-box}.mdl-data-table th .mdl-data-table__select{position:absolute;bottom:8px;left:24px}.mdl-data-table__select{width:16px}.mdl-data-table__cell--non-numeric.mdl-data-table__cell--non-numeric{text-align:left}.mdl-mega-footer{padding:16px 40px;color:#9e9e9e;background-color:#424242}.mdl-mega-footer--top-section:after,.mdl-mega-footer--middle-section:after,.mdl-mega-footer--bottom-section:after,.mdl-mega-footer__top-section:after,.mdl-mega-footer__middle-section:after,.mdl-mega-footer__bottom-section:after{content:'';display:block;clear:both}.mdl-mega-footer--left-section,.mdl-mega-footer__left-section,.mdl-mega-footer--right-section,.mdl-mega-footer__right-section{margin-bottom:16px}.mdl-mega-footer--right-section a,.mdl-mega-footer__right-section a{display:block;margin-bottom:16px;color:inherit;text-decoration:none}@media screen and (min-width:760px){.mdl-mega-footer--left-section,.mdl-mega-footer__left-section{float:left}.mdl-mega-footer--right-section,.mdl-mega-footer__right-section{float:right}.mdl-mega-footer--right-section a,.mdl-mega-footer__right-section a{display:inline-block;margin-left:16px;line-height:36px;vertical-align:middle}}.mdl-mega-footer--social-btn,.mdl-mega-footer__social-btn{width:36px;height:36px;padding:0;margin:0;background-color:#9e9e9e;border:none}.mdl-mega-footer--drop-down-section,.mdl-mega-footer__drop-down-section{display:block;position:relative}@media screen and (min-width:760px){.mdl-mega-footer--drop-down-section,.mdl-mega-footer__drop-down-section{width:33%}.mdl-mega-footer--drop-down-section:nth-child(1),.mdl-mega-footer--drop-down-section:nth-child(2),.mdl-mega-footer__drop-down-section:nth-child(1),.mdl-mega-footer__drop-down-section:nth-child(2){float:left}.mdl-mega-footer--drop-down-section:nth-child(3),.mdl-mega-footer__drop-down-section:nth-child(3){float:right}.mdl-mega-footer--drop-down-section:nth-child(3):after,.mdl-mega-footer__drop-down-section:nth-child(3):after{clear:right}.mdl-mega-footer--drop-down-section:nth-child(4),.mdl-mega-footer__drop-down-section:nth-child(4){clear:right;float:right}.mdl-mega-footer--middle-section:after,.mdl-mega-footer__middle-section:after{content:'';display:block;clear:both}.mdl-mega-footer--bottom-section,.mdl-mega-footer__bottom-section{padding-top:0}}@media screen and (min-width:1024px){.mdl-mega-footer--drop-down-section,.mdl-mega-footer--drop-down-section:nth-child(3),.mdl-mega-footer--drop-down-section:nth-child(4),.mdl-mega-footer__drop-down-section,.mdl-mega-footer__drop-down-section:nth-child(3),.mdl-mega-footer__drop-down-section:nth-child(4){width:24%;float:left}}.mdl-mega-footer--heading-checkbox,.mdl-mega-footer__heading-checkbox{position:absolute;width:100%;height:55.8px;padding:32px;margin:-16px 0 0;cursor:pointer;z-index:1;opacity:0}.mdl-mega-footer--heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer__heading:after{font-family:'Material Icons';content:'\E5CE'}.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list{display:none}.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading:after{font-family:'Material Icons';content:'\E5CF'}.mdl-mega-footer--heading,.mdl-mega-footer__heading{position:relative;width:100%;padding-right:39.8px;margin-bottom:16px;box-sizing:border-box;font-size:14px;line-height:23.8px;font-weight:500;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;color:#e0e0e0}.mdl-mega-footer--heading:after,.mdl-mega-footer__heading:after{content:'';position:absolute;top:0;right:0;display:block;width:23.8px;height:23.8px;background-size:cover}.mdl-mega-footer--link-list,.mdl-mega-footer__link-list{list-style:none;padding:0;margin:0 0 32px}.mdl-mega-footer--link-list:after,.mdl-mega-footer__link-list:after{clear:both;display:block;content:''}.mdl-mega-footer--link-list li,.mdl-mega-footer__link-list li{font-size:14px;font-weight:400;letter-spacing:0;line-height:20px}.mdl-mega-footer--link-list a,.mdl-mega-footer__link-list a{color:inherit;text-decoration:none;white-space:nowrap}@media screen and (min-width:760px){.mdl-mega-footer--heading-checkbox,.mdl-mega-footer__heading-checkbox{display:none}.mdl-mega-footer--heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox+.mdl-mega-footer__heading:after{background-image:none}.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer--heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer--link-list,.mdl-mega-footer__heading-checkbox:checked~.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading+.mdl-mega-footer__link-list,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading+.mdl-mega-footer--link-list{display:block}.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer--heading-checkbox:checked+.mdl-mega-footer__heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer--heading:after,.mdl-mega-footer__heading-checkbox:checked+.mdl-mega-footer__heading:after{content:''}}.mdl-mega-footer--bottom-section,.mdl-mega-footer__bottom-section{padding-top:16px;margin-bottom:16px}.mdl-logo{margin-bottom:16px;color:#fff}.mdl-mega-footer--bottom-section .mdl-mega-footer--link-list li,.mdl-mega-footer__bottom-section .mdl-mega-footer__link-list li{float:left;margin-bottom:0;margin-right:16px}@media screen and (min-width:760px){.mdl-logo{float:left;margin-bottom:0;margin-right:16px}}.mdl-mini-footer{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:32px 16px;color:#9e9e9e;background-color:#424242}.mdl-mini-footer:after{content:'';display:block}.mdl-mini-footer .mdl-logo{line-height:36px}.mdl-mini-footer--link-list,.mdl-mini-footer__link-list{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap;list-style:none;margin:0;padding:0}.mdl-mini-footer--link-list li,.mdl-mini-footer__link-list li{margin-bottom:0;margin-right:16px}@media screen and (min-width:760px){.mdl-mini-footer--link-list li,.mdl-mini-footer__link-list li{line-height:36px}}.mdl-mini-footer--link-list a,.mdl-mini-footer__link-list a{color:inherit;text-decoration:none;white-space:nowrap}.mdl-mini-footer--left-section,.mdl-mini-footer__left-section{display:inline-block;-webkit-box-ordinal-group:1;-webkit-order:0;-ms-flex-order:0;order:0}.mdl-mini-footer--right-section,.mdl-mini-footer__right-section{display:inline-block;-webkit-box-ordinal-group:2;-webkit-order:1;-ms-flex-order:1;order:1}.mdl-mini-footer--social-btn,.mdl-mini-footer__social-btn{width:36px;height:36px;padding:0;margin:0;background-color:#9e9e9e;border:none}.mdl-icon-toggle{position:relative;z-index:1;vertical-align:middle;display:inline-block;height:32px;margin:0;padding:0}.mdl-icon-toggle__input{line-height:32px}.mdl-icon-toggle.is-upgraded .mdl-icon-toggle__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-icon-toggle__label{display:inline-block;position:relative;cursor:pointer;height:32px;width:32px;min-width:32px;color:#616161;border-radius:50%;padding:0;margin-left:0;margin-right:0;text-align:center;background-color:transparent;will-change:background-color;-webkit-transition:background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1);transition:background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1)}.mdl-icon-toggle__label.material-icons{line-height:32px;font-size:24px}.mdl-icon-toggle.is-checked .mdl-icon-toggle__label{color:#3f51b5}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__label{color:rgba(0,0,0,.26);cursor:auto;-webkit-transition:none;transition:none}.mdl-icon-toggle.is-focused .mdl-icon-toggle__label{background-color:rgba(0,0,0,.12)}.mdl-icon-toggle.is-focused.is-checked .mdl-icon-toggle__label{background-color:rgba(63,81,181,.26)}.mdl-icon-toggle__ripple-container{position:absolute;z-index:2;top:-2px;left:-2px;box-sizing:border-box;width:36px;height:36px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-icon-toggle__ripple-container .mdl-ripple{background:#616161}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__ripple-container{cursor:auto}.mdl-icon-toggle.is-disabled .mdl-icon-toggle__ripple-container .mdl-ripple{background:0 0}.mdl-menu__container{display:block;margin:0;padding:0;border:none;position:absolute;overflow:visible;height:0;width:0;visibility:hidden;z-index:-1}.mdl-menu__container.is-visible,.mdl-menu__container.is-animating{z-index:999;visibility:visible}.mdl-menu__outline{display:block;background:#fff;margin:0;padding:0;border:none;border-radius:2px;position:absolute;top:0;left:0;overflow:hidden;opacity:0;-webkit-transform:scale(0);-ms-transform:scale(0);transform:scale(0);-webkit-transform-origin:0 0;-ms-transform-origin:0 0;transform-origin:0 0;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);will-change:transform;-webkit-transition:-webkit-transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1);transition:transform .3s cubic-bezier(.4,0,.2,1),opacity .2s cubic-bezier(.4,0,.2,1);z-index:-1}.mdl-menu__container.is-visible .mdl-menu__outline{opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1);z-index:999}.mdl-menu__outline.mdl-menu--bottom-right{-webkit-transform-origin:100% 0;-ms-transform-origin:100% 0;transform-origin:100% 0}.mdl-menu__outline.mdl-menu--top-left{-webkit-transform-origin:0 100%;-ms-transform-origin:0 100%;transform-origin:0 100%}.mdl-menu__outline.mdl-menu--top-right{-webkit-transform-origin:100% 100%;-ms-transform-origin:100% 100%;transform-origin:100% 100%}.mdl-menu{position:absolute;list-style:none;top:0;left:0;height:auto;width:auto;min-width:124px;padding:8px 0;margin:0;opacity:0;clip:rect(0 0 0 0);z-index:-1}.mdl-menu__container.is-visible .mdl-menu{opacity:1;z-index:999}.mdl-menu.is-animating{-webkit-transition:opacity .2s cubic-bezier(.4,0,.2,1),clip .3s cubic-bezier(.4,0,.2,1);transition:opacity .2s cubic-bezier(.4,0,.2,1),clip .3s cubic-bezier(.4,0,.2,1)}.mdl-menu.mdl-menu--bottom-right{left:auto;right:0}.mdl-menu.mdl-menu--top-left{top:auto;bottom:0}.mdl-menu.mdl-menu--top-right{top:auto;left:auto;bottom:0;right:0}.mdl-menu.mdl-menu--unaligned{top:auto;left:auto}.mdl-menu__item{display:block;border:none;color:rgba(0,0,0,.87);background-color:transparent;text-align:left;margin:0;padding:0 16px;outline-color:#bdbdbd;position:relative;overflow:hidden;font-size:14px;font-weight:400;letter-spacing:0;text-decoration:none;cursor:pointer;height:48px;line-height:48px;white-space:nowrap;opacity:0;-webkit-transition:opacity .2s cubic-bezier(.4,0,.2,1);transition:opacity .2s cubic-bezier(.4,0,.2,1);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-menu__container.is-visible .mdl-menu__item{opacity:1}.mdl-menu__item::-moz-focus-inner{border:0}.mdl-menu__item[disabled]{color:#bdbdbd;background-color:transparent;cursor:auto}.mdl-menu__item[disabled]:hover{background-color:transparent}.mdl-menu__item[disabled]:focus{background-color:transparent}.mdl-menu__item[disabled] .mdl-ripple{background:0 0}.mdl-menu__item:hover{background-color:#eee}.mdl-menu__item:focus{outline:none;background-color:#eee}.mdl-menu__item:active{background-color:#e0e0e0}.mdl-menu__item--ripple-container{display:block;height:100%;left:0;position:absolute;top:0;width:100%;z-index:0;overflow:hidden}.mdl-progress{display:block;position:relative;height:4px;width:500px}.mdl-progress>.bar{display:block;position:absolute;top:0;bottom:0;width:0%;-webkit-transition:width .2s cubic-bezier(.4,0,.2,1);transition:width .2s cubic-bezier(.4,0,.2,1)}.mdl-progress>.progressbar{background-color:#3f51b5;z-index:1;left:0}.mdl-progress>.bufferbar{background-image:-webkit-linear-gradient(left,rgba(255,255,255,.7),rgba(255,255,255,.7)),-webkit-linear-gradient(left,#3f51b5 ,#3f51b5);background-image:linear-gradient(to right,rgba(255,255,255,.7),rgba(255,255,255,.7)),linear-gradient(to right,#3f51b5 ,#3f51b5);z-index:0;left:0}.mdl-progress>.auxbar{right:0}@supports (-webkit-appearance:none){.mdl-progress:not(.mdl-progress__indeterminate):not(.mdl-progress__indeterminate)>.auxbar{background-image:-webkit-linear-gradient(left,rgba(255,255,255,.7),rgba(255,255,255,.7)),-webkit-linear-gradient(left,#3f51b5 ,#3f51b5);background-image:linear-gradient(to right,rgba(255,255,255,.7),rgba(255,255,255,.7)),linear-gradient(to right,#3f51b5 ,#3f51b5);-webkit-mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjxzdmcgd2lkdGg9IjEyIiBoZWlnaHQ9IjQiIHZpZXdQb3J0PSIwIDAgMTIgNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxlbGxpcHNlIGN4PSIyIiBjeT0iMiIgcng9IjIiIHJ5PSIyIj4KICAgIDxhbmltYXRlIGF0dHJpYnV0ZU5hbWU9ImN4IiBmcm9tPSIyIiB0bz0iLTEwIiBkdXI9IjAuNnMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIiAvPgogIDwvZWxsaXBzZT4KICA8ZWxsaXBzZSBjeD0iMTQiIGN5PSIyIiByeD0iMiIgcnk9IjIiIGNsYXNzPSJsb2FkZXIiPgogICAgPGFuaW1hdGUgYXR0cmlidXRlTmFtZT0iY3giIGZyb209IjE0IiB0bz0iMiIgZHVyPSIwLjZzIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIgLz4KICA8L2VsbGlwc2U+Cjwvc3ZnPgo=");mask:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+Cjxzdmcgd2lkdGg9IjEyIiBoZWlnaHQ9IjQiIHZpZXdQb3J0PSIwIDAgMTIgNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxlbGxpcHNlIGN4PSIyIiBjeT0iMiIgcng9IjIiIHJ5PSIyIj4KICAgIDxhbmltYXRlIGF0dHJpYnV0ZU5hbWU9ImN4IiBmcm9tPSIyIiB0bz0iLTEwIiBkdXI9IjAuNnMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIiAvPgogIDwvZWxsaXBzZT4KICA8ZWxsaXBzZSBjeD0iMTQiIGN5PSIyIiByeD0iMiIgcnk9IjIiIGNsYXNzPSJsb2FkZXIiPgogICAgPGFuaW1hdGUgYXR0cmlidXRlTmFtZT0iY3giIGZyb209IjE0IiB0bz0iMiIgZHVyPSIwLjZzIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIgLz4KICA8L2VsbGlwc2U+Cjwvc3ZnPgo=")}}.mdl-progress:not(.mdl-progress__indeterminate)>.auxbar{background-image:-webkit-linear-gradient(left,rgba(255,255,255,.9),rgba(255,255,255,.9)),-webkit-linear-gradient(left,#3f51b5 ,#3f51b5);background-image:linear-gradient(to right,rgba(255,255,255,.9),rgba(255,255,255,.9)),linear-gradient(to right,#3f51b5 ,#3f51b5)}.mdl-progress.mdl-progress__indeterminate>.bar1{-webkit-animation-name:indeterminate1;animation-name:indeterminate1}.mdl-progress.mdl-progress__indeterminate>.bar1,.mdl-progress.mdl-progress__indeterminate>.bar3{background-color:#3f51b5;-webkit-animation-duration:2s;animation-duration:2s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-timing-function:linear;animation-timing-function:linear}.mdl-progress.mdl-progress__indeterminate>.bar3{background-image:none;-webkit-animation-name:indeterminate2;animation-name:indeterminate2}@-webkit-keyframes indeterminate1{0%{left:0%;width:0%}50%{left:25%;width:75%}75%{left:100%;width:0%}}@keyframes indeterminate1{0%{left:0%;width:0%}50%{left:25%;width:75%}75%{left:100%;width:0%}}@-webkit-keyframes indeterminate2{0%,50%{left:0%;width:0%}75%{left:0%;width:25%}100%{left:100%;width:0%}}@keyframes indeterminate2{0%,50%{left:0%;width:0%}75%{left:0%;width:25%}100%{left:100%;width:0%}}.mdl-navigation{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;box-sizing:border-box}.mdl-navigation__link{color:#424242;text-decoration:none;font-weight:500;font-size:13px;margin:0}.mdl-layout{width:100%;height:100%;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;overflow-y:auto;overflow-x:hidden;position:relative;-webkit-overflow-scrolling:touch}.mdl-layout.is-small-screen .mdl-layout--large-screen-only{display:none}.mdl-layout:not(.is-small-screen) .mdl-layout--small-screen-only{display:none}.mdl-layout__container{position:absolute;width:100%;height:100%}.mdl-layout__title,.mdl-layout-title{display:block;position:relative;font-family:"Roboto","Helvetica","Arial",sans-serif;font-size:20px;line-height:1;letter-spacing:.02em;font-weight:400;box-sizing:border-box}.mdl-layout-spacer{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.mdl-layout__drawer{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;width:240px;height:100%;max-height:100%;position:absolute;top:0;left:0;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);box-sizing:border-box;border-right:1px solid #e0e0e0;background:#fafafa;-webkit-transform:translateX(-250px);-ms-transform:translateX(-250px);transform:translateX(-250px);-webkit-transform-style:preserve-3d;transform-style:preserve-3d;will-change:transform;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:-webkit-transform;transition-property:transform;color:#424242;overflow:visible;overflow-y:auto;z-index:5}.mdl-layout__drawer.is-visible{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}.mdl-layout__drawer.is-visible~.mdl-layout__content.mdl-layout__content{overflow:hidden}.mdl-layout__drawer>*{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0}.mdl-layout__drawer>.mdl-layout__title,.mdl-layout__drawer>.mdl-layout-title{line-height:64px;padding-left:40px}@media screen and (max-width:1024px){.mdl-layout__drawer>.mdl-layout__title,.mdl-layout__drawer>.mdl-layout-title{line-height:56px;padding-left:16px}}.mdl-layout__drawer .mdl-navigation{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:stretch;-webkit-align-items:stretch;-ms-flex-align:stretch;align-items:stretch;padding-top:16px}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link{display:block;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;padding:16px 40px;margin:0;color:#757575}@media screen and (max-width:1024px){.mdl-layout__drawer .mdl-navigation .mdl-navigation__link{padding:16px}}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link:hover{background-color:#e0e0e0}.mdl-layout__drawer .mdl-navigation .mdl-navigation__link--current{background-color:#000;color:#e0e0e0}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__drawer{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}}.mdl-layout__drawer-button{display:block;position:absolute;height:48px;width:48px;border:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;overflow:hidden;text-align:center;cursor:pointer;font-size:26px;line-height:50px;font-family:Helvetica,Arial,sans-serif;margin:10px 12px;top:0;left:0;color:#fff;z-index:4}.mdl-layout__header .mdl-layout__drawer-button{position:absolute;color:#fff;background-color:inherit}@media screen and (max-width:1024px){.mdl-layout__header .mdl-layout__drawer-button{margin:4px}}@media screen and (max-width:1024px){.mdl-layout__drawer-button{margin:4px;color:rgba(0,0,0,.5)}}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__drawer-button{display:none}}.mdl-layout__header{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-box-pack:start;-webkit-justify-content:flex-start;-ms-flex-pack:start;justify-content:flex-start;box-sizing:border-box;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;width:100%;margin:0;padding:0;border:none;min-height:64px;max-height:1000px;z-index:3;background-color:#3f51b5;color:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:max-height,box-shadow;transition-property:max-height,box-shadow}@media screen and (max-width:1024px){.mdl-layout__header{min-height:56px}}.mdl-layout--fixed-drawer.is-upgraded:not(.is-small-screen)>.mdl-layout__header{margin-left:240px;width:calc(100% - 240px)}@media screen and (min-width:1025px){.mdl-layout--fixed-drawer>.mdl-layout__header .mdl-layout__header-row{padding-left:40px}}.mdl-layout__header>.mdl-layout-icon{position:absolute;left:40px;top:16px;height:32px;width:32px;overflow:hidden;z-index:3;display:block}@media screen and (max-width:1024px){.mdl-layout__header>.mdl-layout-icon{left:16px;top:12px}}.mdl-layout.has-drawer .mdl-layout__header>.mdl-layout-icon{display:none}.mdl-layout__header.is-compact{max-height:64px}@media screen and (max-width:1024px){.mdl-layout__header.is-compact{max-height:56px}}.mdl-layout__header.is-compact.has-tabs{height:112px}@media screen and (max-width:1024px){.mdl-layout__header.is-compact.has-tabs{min-height:104px}}@media screen and (max-width:1024px){.mdl-layout__header{display:none}.mdl-layout--fixed-header>.mdl-layout__header{display:-webkit-flex;display:-ms-flexbox;display:flex}}.mdl-layout__header--transparent.mdl-layout__header--transparent{background-color:transparent;box-shadow:none}.mdl-layout__header--seamed,.mdl-layout__header--scroll{box-shadow:none}.mdl-layout__header--waterfall{box-shadow:none;overflow:hidden}.mdl-layout__header--waterfall.is-casting-shadow{box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-layout__header-row{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;box-sizing:border-box;-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:64px;margin:0;padding:0 40px 0 80px}@media screen and (max-width:1024px){.mdl-layout__header-row{height:56px;padding:0 16px 0 72px}}.mdl-layout__header-row>*{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0}.mdl-layout__header--scroll .mdl-layout__header-row{width:100%}.mdl-layout__header-row .mdl-navigation{margin:0;padding:0;height:64px;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}@media screen and (max-width:1024px){.mdl-layout__header-row .mdl-navigation{height:56px}}.mdl-layout__header-row .mdl-navigation__link{display:block;color:#fff;line-height:64px;padding:0 24px}@media screen and (max-width:1024px){.mdl-layout__header-row .mdl-navigation__link{line-height:56px;padding:0 16px}}.mdl-layout__obfuscator{background-color:transparent;position:absolute;top:0;left:0;height:100%;width:100%;z-index:4;visibility:hidden;-webkit-transition-property:background-color;transition-property:background-color;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-layout__obfuscator.is-visible{background-color:rgba(0,0,0,.5);visibility:visible}.mdl-layout__content{-ms-flex:0 1 auto;display:inline-block;overflow-y:auto;overflow-x:hidden;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;z-index:1;-webkit-overflow-scrolling:touch}.mdl-layout--fixed-drawer>.mdl-layout__content{margin-left:240px}.mdl-layout__container.has-scrolling-header .mdl-layout__content{overflow:visible}@media screen and (max-width:1024px){.mdl-layout--fixed-drawer>.mdl-layout__content{margin-left:0}.mdl-layout__container.has-scrolling-header .mdl-layout__content{overflow-y:auto;overflow-x:hidden}}.mdl-layout__tab-bar{height:96px;margin:0;width:calc(100% - 112px);padding:0 0 0 56px;display:-webkit-flex;display:-ms-flexbox;display:flex;background-color:#3f51b5;overflow-y:hidden;overflow-x:scroll}.mdl-layout__tab-bar::-webkit-scrollbar{display:none}@media screen and (max-width:1024px){.mdl-layout__tab-bar{width:calc(100% - 60px);padding:0 0 0 60px}}.mdl-layout--fixed-tabs .mdl-layout__tab-bar{padding:0;overflow:hidden;width:100%}.mdl-layout__tab-bar-container{position:relative;height:48px;width:100%;border:none;margin:0;z-index:2;-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;overflow:hidden}.mdl-layout__container>.mdl-layout__tab-bar-container{position:absolute;top:0;left:0}.mdl-layout__tab-bar-button{display:inline-block;position:absolute;top:0;height:48px;width:56px;z-index:4;text-align:center;background-color:#3f51b5;color:transparent;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}@media screen and (max-width:1024px){.mdl-layout__tab-bar-button{display:none;width:60px}}.mdl-layout--fixed-tabs .mdl-layout__tab-bar-button{display:none}.mdl-layout__tab-bar-button .material-icons{line-height:48px}.mdl-layout__tab-bar-button.is-active{color:#fff}.mdl-layout__tab-bar-left-button{left:0}.mdl-layout__tab-bar-right-button{right:0}.mdl-layout__tab{margin:0;border:none;padding:0 24px;float:left;position:relative;display:block;-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;text-decoration:none;height:48px;line-height:48px;text-align:center;font-weight:500;font-size:14px;text-transform:uppercase;color:rgba(255,255,255,.6);overflow:hidden}@media screen and (max-width:1024px){.mdl-layout__tab{padding:0 12px}}.mdl-layout--fixed-tabs .mdl-layout__tab{float:none;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;padding:0}.mdl-layout.is-upgraded .mdl-layout__tab.is-active{color:#fff}.mdl-layout.is-upgraded .mdl-layout__tab.is-active::after{height:2px;width:100%;display:block;content:" ";bottom:0;left:0;position:absolute;background:#ff4081;-webkit-animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;-webkit-transition:all 1s cubic-bezier(.4,0,1,1);transition:all 1s cubic-bezier(.4,0,1,1)}.mdl-layout__tab .mdl-layout__tab-ripple-container{display:block;position:absolute;height:100%;width:100%;left:0;top:0;z-index:1;overflow:hidden}.mdl-layout__tab .mdl-layout__tab-ripple-container .mdl-ripple{background-color:#fff}.mdl-layout__tab-panel{display:block}.mdl-layout.is-upgraded .mdl-layout__tab-panel{display:none}.mdl-layout.is-upgraded .mdl-layout__tab-panel.is-active{display:block}.mdl-radio{position:relative;font-size:16px;line-height:24px;display:inline-block;box-sizing:border-box;margin:0;padding-left:0}.mdl-radio.is-upgraded{padding-left:24px}.mdl-radio__button{line-height:24px}.mdl-radio.is-upgraded .mdl-radio__button{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-radio__outer-circle{position:absolute;top:4px;left:0;display:inline-block;box-sizing:border-box;width:16px;height:16px;margin:0;cursor:pointer;border:2px solid rgba(0,0,0,.54);border-radius:50%;z-index:2}.mdl-radio.is-checked .mdl-radio__outer-circle{border:2px solid #3f51b5}.mdl-radio.is-disabled .mdl-radio__outer-circle{border:2px solid rgba(0,0,0,.26);cursor:auto}.mdl-radio__inner-circle{position:absolute;z-index:1;margin:0;top:8px;left:4px;box-sizing:border-box;width:8px;height:8px;cursor:pointer;-webkit-transition-duration:.28s;transition-duration:.28s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:-webkit-transform;transition-property:transform;-webkit-transform:scale3d(0,0,0);transform:scale3d(0,0,0);border-radius:50%;background:#3f51b5}.mdl-radio.is-checked .mdl-radio__inner-circle{-webkit-transform:scale3d(1,1,1);transform:scale3d(1,1,1)}.mdl-radio.is-disabled .mdl-radio__inner-circle{background:rgba(0,0,0,.26);cursor:auto}.mdl-radio.is-focused .mdl-radio__inner-circle{box-shadow:0 0 0 10px rgba(0,0,0,.1)}.mdl-radio__label{cursor:pointer}.mdl-radio.is-disabled .mdl-radio__label{color:rgba(0,0,0,.26);cursor:auto}.mdl-radio__ripple-container{position:absolute;z-index:2;top:-9px;left:-13px;box-sizing:border-box;width:42px;height:42px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000)}.mdl-radio__ripple-container .mdl-ripple{background:#3f51b5}.mdl-radio.is-disabled .mdl-radio__ripple-container{cursor:auto}.mdl-radio.is-disabled .mdl-radio__ripple-container .mdl-ripple{background:0 0}_:-ms-input-placeholder,:root .mdl-slider.mdl-slider.is-upgraded{-ms-appearance:none;height:32px;margin:0}.mdl-slider{width:calc(100% - 40px);margin:0 20px}.mdl-slider.is-upgraded{-webkit-appearance:none;-moz-appearance:none;appearance:none;height:2px;background:0 0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;outline:0;padding:0;color:#3f51b5;-webkit-align-self:center;-ms-flex-item-align:center;align-self:center;z-index:1;cursor:pointer}.mdl-slider.is-upgraded::-moz-focus-outer{border:0}.mdl-slider.is-upgraded::-ms-tooltip{display:none}.mdl-slider.is-upgraded::-webkit-slider-runnable-track{background:0 0}.mdl-slider.is-upgraded::-moz-range-track{background:0 0;border:none}.mdl-slider.is-upgraded::-ms-track{background:0 0;color:transparent;height:2px;width:100%;border:none}.mdl-slider.is-upgraded::-ms-fill-lower{padding:0;background:linear-gradient(to right,transparent,transparent 16px,#3f51b5 16px,#3f51b5 0)}.mdl-slider.is-upgraded::-ms-fill-upper{padding:0;background:linear-gradient(to left,transparent,transparent 16px,rgba(0,0,0,.26)16px,rgba(0,0,0,.26)0)}.mdl-slider.is-upgraded::-webkit-slider-thumb{-webkit-appearance:none;width:12px;height:12px;box-sizing:border-box;border-radius:50%;background:#3f51b5;border:none;-webkit-transition:-webkit-transform .18s cubic-bezier(.4,0,.2,1),border .18s cubic-bezier(.4,0,.2,1),box-shadow .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1);transition:transform .18s cubic-bezier(.4,0,.2,1),border .18s cubic-bezier(.4,0,.2,1),box-shadow .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1)}.mdl-slider.is-upgraded::-moz-range-thumb{-moz-appearance:none;width:12px;height:12px;box-sizing:border-box;border-radius:50%;background-image:none;background:#3f51b5;border:none}.mdl-slider.is-upgraded:focus:not(:active)::-webkit-slider-thumb{box-shadow:0 0 0 10px rgba(63,81,181,.26)}.mdl-slider.is-upgraded:focus:not(:active)::-moz-range-thumb{box-shadow:0 0 0 10px rgba(63,81,181,.26)}.mdl-slider.is-upgraded:active::-webkit-slider-thumb{background-image:none;background:#3f51b5;-webkit-transform:scale(1.5);transform:scale(1.5)}.mdl-slider.is-upgraded:active::-moz-range-thumb{background-image:none;background:#3f51b5;transform:scale(1.5)}.mdl-slider.is-upgraded::-ms-thumb{width:32px;height:32px;border:none;border-radius:50%;background:#3f51b5;-ms-transform:scale(.375);transform:scale(.375);transition:transform .18s cubic-bezier(.4,0,.2,1),background .28s cubic-bezier(.4,0,.2,1)}.mdl-slider.is-upgraded:focus:not(:active)::-ms-thumb{background:radial-gradient(circle closest-side,#3f51b5 0%,#3f51b5 37.5%,rgba(63,81,181,.26)37.5%,rgba(63,81,181,.26)100%);-ms-transform:scale(1);transform:scale(1)}.mdl-slider.is-upgraded:active::-ms-thumb{background:#3f51b5;-ms-transform:scale(.5625);transform:scale(.5625)}.mdl-slider.is-upgraded.is-lowest-value::-webkit-slider-thumb{border:2px solid rgba(0,0,0,.26);background:0 0}.mdl-slider.is-upgraded.is-lowest-value::-moz-range-thumb{border:2px solid rgba(0,0,0,.26);background:0 0}.mdl-slider.is-upgraded.is-lowest-value+.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-webkit-slider-thumb{box-shadow:0 0 0 10px rgba(0,0,0,.12);background:rgba(0,0,0,.12)}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-moz-range-thumb{box-shadow:0 0 0 10px rgba(0,0,0,.12);background:rgba(0,0,0,.12)}.mdl-slider.is-upgraded.is-lowest-value:active::-webkit-slider-thumb{border:1.6px solid rgba(0,0,0,.26);-webkit-transform:scale(1.5);transform:scale(1.5)}.mdl-slider.is-upgraded.is-lowest-value:active+.mdl-slider__background-flex>.mdl-slider__background-upper{left:9px}.mdl-slider.is-upgraded.is-lowest-value:active::-moz-range-thumb{border:1.5px solid rgba(0,0,0,.26);transform:scale(1.5)}.mdl-slider.is-upgraded.is-lowest-value::-ms-thumb{background:radial-gradient(circle closest-side,transparent 0%,transparent 66.67%,rgba(0,0,0,.26)66.67%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded.is-lowest-value:focus:not(:active)::-ms-thumb{background:radial-gradient(circle closest-side,rgba(0,0,0,.12)0%,rgba(0,0,0,.12)25%,rgba(0,0,0,.26)25%,rgba(0,0,0,.26)37.5%,rgba(0,0,0,.12)37.5%,rgba(0,0,0,.12)100%);-ms-transform:scale(1);transform:scale(1)}.mdl-slider.is-upgraded.is-lowest-value:active::-ms-thumb{-ms-transform:scale(.5625);transform:scale(.5625);background:radial-gradient(circle closest-side,transparent 0%,transparent 77.78%,rgba(0,0,0,.26)77.78%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded.is-lowest-value::-ms-fill-lower{background:0 0}.mdl-slider.is-upgraded.is-lowest-value::-ms-fill-upper{margin-left:6px}.mdl-slider.is-upgraded.is-lowest-value:active::-ms-fill-upper{margin-left:9px}.mdl-slider.is-upgraded:disabled:focus::-webkit-slider-thumb,.mdl-slider.is-upgraded:disabled:active::-webkit-slider-thumb,.mdl-slider.is-upgraded:disabled::-webkit-slider-thumb{-webkit-transform:scale(.667);transform:scale(.667);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded:disabled:focus::-moz-range-thumb,.mdl-slider.is-upgraded:disabled:active::-moz-range-thumb,.mdl-slider.is-upgraded:disabled::-moz-range-thumb{transform:scale(.667);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded:disabled+.mdl-slider__background-flex>.mdl-slider__background-lower{background-color:rgba(0,0,0,.26);left:-6px}.mdl-slider.is-upgraded:disabled+.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-webkit-slider-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-webkit-slider-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-webkit-slider-thumb{border:3px solid rgba(0,0,0,.26);background:0 0;-webkit-transform:scale(.667);transform:scale(.667)}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-moz-range-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-moz-range-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-moz-range-thumb{border:3px solid rgba(0,0,0,.26);background:0 0;transform:scale(.667)}.mdl-slider.is-upgraded.is-lowest-value:disabled:active+.mdl-slider__background-flex>.mdl-slider__background-upper{left:6px}.mdl-slider.is-upgraded:disabled:focus::-ms-thumb,.mdl-slider.is-upgraded:disabled:active::-ms-thumb,.mdl-slider.is-upgraded:disabled::-ms-thumb{-ms-transform:scale(.25);transform:scale(.25);background:rgba(0,0,0,.26)}.mdl-slider.is-upgraded.is-lowest-value:disabled:focus::-ms-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-ms-thumb,.mdl-slider.is-upgraded.is-lowest-value:disabled::-ms-thumb{-ms-transform:scale(.25);transform:scale(.25);background:radial-gradient(circle closest-side,transparent 0%,transparent 50%,rgba(0,0,0,.26)50%,rgba(0,0,0,.26)100%)}.mdl-slider.is-upgraded:disabled::-ms-fill-lower{margin-right:6px;background:linear-gradient(to right,transparent,transparent 25px,rgba(0,0,0,.26)25px,rgba(0,0,0,.26)0)}.mdl-slider.is-upgraded:disabled::-ms-fill-upper{margin-left:6px}.mdl-slider.is-upgraded.is-lowest-value:disabled:active::-ms-fill-upper{margin-left:6px}.mdl-slider__ie-container{height:18px;overflow:visible;border:none;margin:none;padding:none}.mdl-slider__container{height:18px;position:relative;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row}.mdl-slider__container,.mdl-slider__background-flex{background:0 0;display:-webkit-flex;display:-ms-flexbox;display:flex}.mdl-slider__background-flex{position:absolute;height:2px;width:calc(100% - 52px);top:50%;left:0;margin:0 26px;overflow:hidden;border:0;padding:0;-webkit-transform:translate(0,-1px);-ms-transform:translate(0,-1px);transform:translate(0,-1px)}.mdl-slider__background-lower{background:#3f51b5}.mdl-slider__background-lower,.mdl-slider__background-upper{-webkit-box-flex:0;-webkit-flex:0;-ms-flex:0;flex:0;position:relative;border:0;padding:0}.mdl-slider__background-upper{background:rgba(0,0,0,.26);-webkit-transition:left .18s cubic-bezier(.4,0,.2,1);transition:left .18s cubic-bezier(.4,0,.2,1)}.mdl-spinner{display:inline-block;position:relative;width:28px;height:28px}.mdl-spinner:not(.is-upgraded).is-active:after{content:"Loading..."}.mdl-spinner.is-upgraded.is-active{-webkit-animation:mdl-spinner__container-rotate 1568.23529412ms linear infinite;animation:mdl-spinner__container-rotate 1568.23529412ms linear infinite}@-webkit-keyframes mdl-spinner__container-rotate{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes mdl-spinner__container-rotate{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.mdl-spinner__layer{position:absolute;width:100%;height:100%;opacity:0}.mdl-spinner__layer-1{border-color:#42a5f5}.mdl-spinner--single-color .mdl-spinner__layer-1{border-color:#3f51b5}.mdl-spinner.is-active .mdl-spinner__layer-1{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-1-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-1-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-2{border-color:#f44336}.mdl-spinner--single-color .mdl-spinner__layer-2{border-color:#3f51b5}.mdl-spinner.is-active .mdl-spinner__layer-2{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-2-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-2-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-3{border-color:#fdd835}.mdl-spinner--single-color .mdl-spinner__layer-3{border-color:#3f51b5}.mdl-spinner.is-active .mdl-spinner__layer-3{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-3-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-3-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__layer-4{border-color:#4caf50}.mdl-spinner--single-color .mdl-spinner__layer-4{border-color:#3f51b5}.mdl-spinner.is-active .mdl-spinner__layer-4{-webkit-animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-4-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__fill-unfill-rotate 5332ms cubic-bezier(.4,0,.2,1)infinite both,mdl-spinner__layer-4-fade-in-out 5332ms cubic-bezier(.4,0,.2,1)infinite both}@-webkit-keyframes mdl-spinner__fill-unfill-rotate{12.5%{-webkit-transform:rotate(135deg);transform:rotate(135deg)}25%{-webkit-transform:rotate(270deg);transform:rotate(270deg)}37.5%{-webkit-transform:rotate(405deg);transform:rotate(405deg)}50%{-webkit-transform:rotate(540deg);transform:rotate(540deg)}62.5%{-webkit-transform:rotate(675deg);transform:rotate(675deg)}75%{-webkit-transform:rotate(810deg);transform:rotate(810deg)}87.5%{-webkit-transform:rotate(945deg);transform:rotate(945deg)}to{-webkit-transform:rotate(1080deg);transform:rotate(1080deg)}}@keyframes mdl-spinner__fill-unfill-rotate{12.5%{-webkit-transform:rotate(135deg);transform:rotate(135deg)}25%{-webkit-transform:rotate(270deg);transform:rotate(270deg)}37.5%{-webkit-transform:rotate(405deg);transform:rotate(405deg)}50%{-webkit-transform:rotate(540deg);transform:rotate(540deg)}62.5%{-webkit-transform:rotate(675deg);transform:rotate(675deg)}75%{-webkit-transform:rotate(810deg);transform:rotate(810deg)}87.5%{-webkit-transform:rotate(945deg);transform:rotate(945deg)}to{-webkit-transform:rotate(1080deg);transform:rotate(1080deg)}}@-webkit-keyframes mdl-spinner__layer-1-fade-in-out{from,25%{opacity:.99}26%,89%{opacity:0}90%,100%{opacity:.99}}@keyframes mdl-spinner__layer-1-fade-in-out{from,25%{opacity:.99}26%,89%{opacity:0}90%,100%{opacity:.99}}@-webkit-keyframes mdl-spinner__layer-2-fade-in-out{from,15%{opacity:0}25%,50%{opacity:.99}51%{opacity:0}}@keyframes mdl-spinner__layer-2-fade-in-out{from,15%{opacity:0}25%,50%{opacity:.99}51%{opacity:0}}@-webkit-keyframes mdl-spinner__layer-3-fade-in-out{from,40%{opacity:0}50%,75%{opacity:.99}76%{opacity:0}}@keyframes mdl-spinner__layer-3-fade-in-out{from,40%{opacity:0}50%,75%{opacity:.99}76%{opacity:0}}@-webkit-keyframes mdl-spinner__layer-4-fade-in-out{from,65%{opacity:0}75%,90%{opacity:.99}100%{opacity:0}}@keyframes mdl-spinner__layer-4-fade-in-out{from,65%{opacity:0}75%,90%{opacity:.99}100%{opacity:0}}.mdl-spinner__gap-patch{position:absolute;box-sizing:border-box;top:0;left:45%;width:10%;height:100%;overflow:hidden;border-color:inherit}.mdl-spinner__gap-patch .mdl-spinner__circle{width:1000%;left:-450%}.mdl-spinner__circle-clipper{display:inline-block;position:relative;width:50%;height:100%;overflow:hidden;border-color:inherit}.mdl-spinner__circle-clipper .mdl-spinner__circle{width:200%}.mdl-spinner__circle{box-sizing:border-box;height:100%;border-width:3px;border-style:solid;border-color:inherit;border-bottom-color:transparent!important;border-radius:50%;-webkit-animation:none;animation:none;position:absolute;top:0;right:0;bottom:0;left:0}.mdl-spinner__left .mdl-spinner__circle{border-right-color:transparent!important;-webkit-transform:rotate(129deg);-ms-transform:rotate(129deg);transform:rotate(129deg)}.mdl-spinner.is-active .mdl-spinner__left .mdl-spinner__circle{-webkit-animation:mdl-spinner__left-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__left-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both}.mdl-spinner__right .mdl-spinner__circle{left:-100%;border-left-color:transparent!important;-webkit-transform:rotate(-129deg);-ms-transform:rotate(-129deg);transform:rotate(-129deg)}.mdl-spinner.is-active .mdl-spinner__right .mdl-spinner__circle{-webkit-animation:mdl-spinner__right-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both;animation:mdl-spinner__right-spin 1333ms cubic-bezier(.4,0,.2,1)infinite both}@-webkit-keyframes mdl-spinner__left-spin{from{-webkit-transform:rotate(130deg);transform:rotate(130deg)}50%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(130deg);transform:rotate(130deg)}}@keyframes mdl-spinner__left-spin{from{-webkit-transform:rotate(130deg);transform:rotate(130deg)}50%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(130deg);transform:rotate(130deg)}}@-webkit-keyframes mdl-spinner__right-spin{from{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}50%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}to{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}}@keyframes mdl-spinner__right-spin{from{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}50%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}to{-webkit-transform:rotate(-130deg);transform:rotate(-130deg)}}.mdl-switch{position:relative;z-index:1;vertical-align:middle;display:inline-block;box-sizing:border-box;width:100%;height:24px;margin:0;padding:0;overflow:visible;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-switch.is-upgraded{padding-left:28px}.mdl-switch__input{line-height:24px}.mdl-switch.is-upgraded .mdl-switch__input{position:absolute;width:0;height:0;margin:0;padding:0;opacity:0;-ms-appearance:none;-moz-appearance:none;-webkit-appearance:none;appearance:none;border:none}.mdl-switch__track{background:rgba(0,0,0,.26);position:absolute;left:0;top:5px;height:14px;width:36px;border-radius:14px;cursor:pointer}.mdl-switch.is-checked .mdl-switch__track{background:rgba(63,81,181,.5)}.mdl-switch.is-disabled .mdl-switch__track{background:rgba(0,0,0,.12);cursor:auto}.mdl-switch__thumb{background:#fafafa;position:absolute;left:0;top:2px;height:20px;width:20px;border-radius:50%;cursor:pointer;box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);-webkit-transition-duration:.28s;transition-duration:.28s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);-webkit-transition-property:left;transition-property:left}.mdl-switch.is-checked .mdl-switch__thumb{background:#3f51b5;left:16px;box-shadow:0 3px 4px 0 rgba(0,0,0,.14),0 3px 3px -2px rgba(0,0,0,.2),0 1px 8px 0 rgba(0,0,0,.12)}.mdl-switch.is-disabled .mdl-switch__thumb{background:#bdbdbd;cursor:auto}.mdl-switch__focus-helper{position:absolute;top:50%;left:50%;-webkit-transform:translate(-4px,-4px);-ms-transform:translate(-4px,-4px);transform:translate(-4px,-4px);display:inline-block;box-sizing:border-box;width:8px;height:8px;border-radius:50%;background-color:transparent}.mdl-switch.is-focused .mdl-switch__focus-helper{box-shadow:0 0 0 20px rgba(0,0,0,.1);background-color:rgba(0,0,0,.1)}.mdl-switch.is-focused.is-checked .mdl-switch__focus-helper{box-shadow:0 0 0 20px rgba(63,81,181,.26);background-color:rgba(63,81,181,.26)}.mdl-switch__label{position:relative;cursor:pointer;font-size:16px;line-height:24px;margin:0;left:24px}.mdl-switch.is-disabled .mdl-switch__label{color:#bdbdbd;cursor:auto}.mdl-switch__ripple-container{position:absolute;z-index:2;top:-12px;left:-14px;box-sizing:border-box;width:48px;height:48px;border-radius:50%;cursor:pointer;overflow:hidden;-webkit-mask-image:-webkit-radial-gradient(circle,#fff,#000);-webkit-transition-duration:.4s;transition-duration:.4s;-webkit-transition-timing-function:step-end;transition-timing-function:step-end;-webkit-transition-property:left;transition-property:left}.mdl-switch__ripple-container .mdl-ripple{background:#3f51b5}.mdl-switch.is-disabled .mdl-switch__ripple-container{cursor:auto}.mdl-switch.is-disabled .mdl-switch__ripple-container .mdl-ripple{background:0 0}.mdl-switch.is-checked .mdl-switch__ripple-container{cursor:auto;left:2px}.mdl-tabs{display:block;width:100%}.mdl-tabs__tab-bar{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-content:space-between;-ms-flex-line-pack:justify;align-content:space-between;-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;height:48px;padding:0;margin:0;border-bottom:1px solid #e0e0e0}.mdl-tabs__tab{margin:0;border:none;padding:0 24px;float:left;position:relative;display:block;color:red;text-decoration:none;height:48px;line-height:48px;text-align:center;font-weight:500;font-size:14px;text-transform:uppercase;color:rgba(0,0,0,.54);overflow:hidden}.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active{color:rgba(0,0,0,.87)}.mdl-tabs.is-upgraded .mdl-tabs__tab.is-active:after{height:2px;width:100%;display:block;content:" ";bottom:0;left:0;position:absolute;background:#3f51b5;-webkit-animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;animation:border-expand .2s cubic-bezier(.4,0,.4,1).01s alternate forwards;-webkit-transition:all 1s cubic-bezier(.4,0,1,1);transition:all 1s cubic-bezier(.4,0,1,1)}.mdl-tabs__tab .mdl-tabs__ripple-container{display:block;position:absolute;height:100%;width:100%;left:0;top:0;z-index:1;overflow:hidden}.mdl-tabs__tab .mdl-tabs__ripple-container .mdl-ripple{background:#3f51b5}.mdl-tabs__panel{display:block}.mdl-tabs.is-upgraded .mdl-tabs__panel{display:none}.mdl-tabs.is-upgraded .mdl-tabs__panel.is-active{display:block}@-webkit-keyframes border-expand{0%{opacity:0;width:0}100%{opacity:1;width:100%}}@keyframes border-expand{0%{opacity:0;width:0}100%{opacity:1;width:100%}}.mdl-textfield{position:relative;font-size:16px;display:inline-block;box-sizing:border-box;width:300px;max-width:100%;margin:0;padding:20px 0}.mdl-textfield .mdl-button{position:absolute;bottom:20px}.mdl-textfield--align-right{text-align:right}.mdl-textfield--full-width{width:100%}.mdl-textfield--expandable{min-width:32px;width:auto;min-height:32px}.mdl-textfield__input{border:none;border-bottom:1px solid rgba(0,0,0,.12);display:block;font-size:16px;margin:0;padding:4px 0;width:100%;background:0 0;text-align:left;color:inherit}.mdl-textfield.is-focused .mdl-textfield__input{outline:none}.mdl-textfield.is-invalid .mdl-textfield__input{border-color:#de3226;box-shadow:none}.mdl-textfield.is-disabled .mdl-textfield__input{background-color:transparent;border-bottom:1px dotted rgba(0,0,0,.12);color:rgba(0,0,0,.26)}.mdl-textfield textarea.mdl-textfield__input{display:block}.mdl-textfield__label{bottom:0;color:rgba(0,0,0,.26);font-size:16px;left:0;right:0;pointer-events:none;position:absolute;display:block;top:24px;width:100%;overflow:hidden;white-space:nowrap;text-align:left}.mdl-textfield.is-dirty .mdl-textfield__label{visibility:hidden}.mdl-textfield--floating-label .mdl-textfield__label{-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1)}.mdl-textfield.is-disabled.is-disabled .mdl-textfield__label{color:rgba(0,0,0,.26)}.mdl-textfield--floating-label.is-focused .mdl-textfield__label,.mdl-textfield--floating-label.is-dirty .mdl-textfield__label{color:#3f51b5;font-size:12px;top:4px;visibility:visible}.mdl-textfield--floating-label.is-focused .mdl-textfield__expandable-holder .mdl-textfield__label,.mdl-textfield--floating-label.is-dirty .mdl-textfield__expandable-holder .mdl-textfield__label{top:-16px}.mdl-textfield--floating-label.is-invalid .mdl-textfield__label{color:#de3226;font-size:12px}.mdl-textfield__label:after{background-color:#3f51b5;bottom:20px;content:'';height:2px;left:45%;position:absolute;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);visibility:hidden;width:10px}.mdl-textfield.is-focused .mdl-textfield__label:after{left:0;visibility:visible;width:100%}.mdl-textfield.is-invalid .mdl-textfield__label:after{background-color:#de3226}.mdl-textfield__error{color:#de3226;position:absolute;font-size:12px;margin-top:3px;visibility:hidden;display:block}.mdl-textfield.is-invalid .mdl-textfield__error{visibility:visible}.mdl-textfield__expandable-holder{position:relative;margin-left:32px;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(.4,0,.2,1);display:inline-block;max-width:.1px}.mdl-textfield.is-focused .mdl-textfield__expandable-holder,.mdl-textfield.is-dirty .mdl-textfield__expandable-holder{max-width:600px}.mdl-textfield__expandable-holder .mdl-textfield__label:after{bottom:0}.mdl-tooltip{-webkit-transform:scale(0);-ms-transform:scale(0);transform:scale(0);-webkit-transform-origin:top center;-ms-transform-origin:top center;transform-origin:top center;will-change:transform;z-index:999;background:rgba(97,97,97,.9);border-radius:2px;color:#fff;display:inline-block;font-size:10px;font-weight:500;line-height:14px;max-width:170px;position:fixed;top:-500px;left:-500px;padding:8px;text-align:center}.mdl-tooltip.is-active{-webkit-animation:pulse 200ms cubic-bezier(0,0,.2,1)forwards;animation:pulse 200ms cubic-bezier(0,0,.2,1)forwards}.mdl-tooltip--large{line-height:14px;font-size:14px;padding:16px}@-webkit-keyframes pulse{0%{-webkit-transform:scale(0);transform:scale(0);opacity:0}50%{-webkit-transform:scale(.99);transform:scale(.99)}100%{-webkit-transform:scale(1);transform:scale(1);opacity:1;visibility:visible}}@keyframes pulse{0%{-webkit-transform:scale(0);transform:scale(0);opacity:0}50%{-webkit-transform:scale(.99);transform:scale(.99)}100%{-webkit-transform:scale(1);transform:scale(1);opacity:1;visibility:visible}}.mdl-shadow--2dp{box-shadow:0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12)}.mdl-shadow--3dp{box-shadow:0 3px 4px 0 rgba(0,0,0,.14),0 3px 3px -2px rgba(0,0,0,.2),0 1px 8px 0 rgba(0,0,0,.12)}.mdl-shadow--4dp{box-shadow:0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12),0 2px 4px -1px rgba(0,0,0,.2)}.mdl-shadow--6dp{box-shadow:0 6px 10px 0 rgba(0,0,0,.14),0 1px 18px 0 rgba(0,0,0,.12),0 3px 5px -1px rgba(0,0,0,.2)}.mdl-shadow--8dp{box-shadow:0 8px 10px 1px rgba(0,0,0,.14),0 3px 14px 2px rgba(0,0,0,.12),0 5px 5px -3px rgba(0,0,0,.2)}.mdl-shadow--16dp{box-shadow:0 16px 24px 2px rgba(0,0,0,.14),0 6px 30px 5px rgba(0,0,0,.12),0 8px 10px -5px rgba(0,0,0,.2)}.mdl-grid{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;margin:0 auto;-webkit-box-align:stretch;-webkit-align-items:stretch;-ms-flex-align:stretch;align-items:stretch}.mdl-grid.mdl-grid--no-spacing{padding:0}.mdl-cell{box-sizing:border-box}.mdl-cell--top{-webkit-align-self:flex-start;-ms-flex-item-align:start;align-self:flex-start}.mdl-cell--middle{-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.mdl-cell--bottom{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end}.mdl-cell--stretch{-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch}.mdl-grid.mdl-grid--no-spacing>.mdl-cell{margin:0}@media (max-width:479px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:100%}.mdl-cell--hide-phone{display:none!important}.mdl-cell--1-col,.mdl-cell--1-col-phone.mdl-cell--1-col-phone{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-phone.mdl-cell--1-col-phone{width:25%}.mdl-cell--2-col,.mdl-cell--2-col-phone.mdl-cell--2-col-phone{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-phone.mdl-cell--2-col-phone{width:50%}.mdl-cell--3-col,.mdl-cell--3-col-phone.mdl-cell--3-col-phone{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-phone.mdl-cell--3-col-phone{width:75%}.mdl-cell--4-col,.mdl-cell--4-col-phone.mdl-cell--4-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-phone.mdl-cell--4-col-phone{width:100%}.mdl-cell--5-col,.mdl-cell--5-col-phone.mdl-cell--5-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-phone.mdl-cell--5-col-phone{width:100%}.mdl-cell--6-col,.mdl-cell--6-col-phone.mdl-cell--6-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-phone.mdl-cell--6-col-phone{width:100%}.mdl-cell--7-col,.mdl-cell--7-col-phone.mdl-cell--7-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-phone.mdl-cell--7-col-phone{width:100%}.mdl-cell--8-col,.mdl-cell--8-col-phone.mdl-cell--8-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-phone.mdl-cell--8-col-phone{width:100%}.mdl-cell--9-col,.mdl-cell--9-col-phone.mdl-cell--9-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-phone.mdl-cell--9-col-phone{width:100%}.mdl-cell--10-col,.mdl-cell--10-col-phone.mdl-cell--10-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-phone.mdl-cell--10-col-phone{width:100%}.mdl-cell--11-col,.mdl-cell--11-col-phone.mdl-cell--11-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-phone.mdl-cell--11-col-phone{width:100%}.mdl-cell--12-col,.mdl-cell--12-col-phone.mdl-cell--12-col-phone{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-phone.mdl-cell--12-col-phone{width:100%}}@media (min-width:480px) and (max-width:839px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:50%}.mdl-cell--hide-tablet{display:none!important}.mdl-cell--1-col,.mdl-cell--1-col-tablet.mdl-cell--1-col-tablet{width:calc(12.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-tablet.mdl-cell--1-col-tablet{width:12.5%}.mdl-cell--2-col,.mdl-cell--2-col-tablet.mdl-cell--2-col-tablet{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-tablet.mdl-cell--2-col-tablet{width:25%}.mdl-cell--3-col,.mdl-cell--3-col-tablet.mdl-cell--3-col-tablet{width:calc(37.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-tablet.mdl-cell--3-col-tablet{width:37.5%}.mdl-cell--4-col,.mdl-cell--4-col-tablet.mdl-cell--4-col-tablet{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-tablet.mdl-cell--4-col-tablet{width:50%}.mdl-cell--5-col,.mdl-cell--5-col-tablet.mdl-cell--5-col-tablet{width:calc(62.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-tablet.mdl-cell--5-col-tablet{width:62.5%}.mdl-cell--6-col,.mdl-cell--6-col-tablet.mdl-cell--6-col-tablet{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-tablet.mdl-cell--6-col-tablet{width:75%}.mdl-cell--7-col,.mdl-cell--7-col-tablet.mdl-cell--7-col-tablet{width:calc(87.5% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-tablet.mdl-cell--7-col-tablet{width:87.5%}.mdl-cell--8-col,.mdl-cell--8-col-tablet.mdl-cell--8-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-tablet.mdl-cell--8-col-tablet{width:100%}.mdl-cell--9-col,.mdl-cell--9-col-tablet.mdl-cell--9-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-tablet.mdl-cell--9-col-tablet{width:100%}.mdl-cell--10-col,.mdl-cell--10-col-tablet.mdl-cell--10-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-tablet.mdl-cell--10-col-tablet{width:100%}.mdl-cell--11-col,.mdl-cell--11-col-tablet.mdl-cell--11-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-tablet.mdl-cell--11-col-tablet{width:100%}.mdl-cell--12-col,.mdl-cell--12-col-tablet.mdl-cell--12-col-tablet{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-tablet.mdl-cell--12-col-tablet{width:100%}}@media (min-width:840px){.mdl-grid{padding:8px}.mdl-cell{margin:8px;width:calc(33.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell{width:33.3333333333%}.mdl-cell--hide-desktop{display:none!important}.mdl-cell--1-col,.mdl-cell--1-col-desktop.mdl-cell--1-col-desktop{width:calc(8.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--1-col,.mdl-grid--no-spacing>.mdl-cell--1-col-desktop.mdl-cell--1-col-desktop{width:8.3333333333%}.mdl-cell--2-col,.mdl-cell--2-col-desktop.mdl-cell--2-col-desktop{width:calc(16.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--2-col,.mdl-grid--no-spacing>.mdl-cell--2-col-desktop.mdl-cell--2-col-desktop{width:16.6666666667%}.mdl-cell--3-col,.mdl-cell--3-col-desktop.mdl-cell--3-col-desktop{width:calc(25% - 16px)}.mdl-grid--no-spacing>.mdl-cell--3-col,.mdl-grid--no-spacing>.mdl-cell--3-col-desktop.mdl-cell--3-col-desktop{width:25%}.mdl-cell--4-col,.mdl-cell--4-col-desktop.mdl-cell--4-col-desktop{width:calc(33.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--4-col,.mdl-grid--no-spacing>.mdl-cell--4-col-desktop.mdl-cell--4-col-desktop{width:33.3333333333%}.mdl-cell--5-col,.mdl-cell--5-col-desktop.mdl-cell--5-col-desktop{width:calc(41.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--5-col,.mdl-grid--no-spacing>.mdl-cell--5-col-desktop.mdl-cell--5-col-desktop{width:41.6666666667%}.mdl-cell--6-col,.mdl-cell--6-col-desktop.mdl-cell--6-col-desktop{width:calc(50% - 16px)}.mdl-grid--no-spacing>.mdl-cell--6-col,.mdl-grid--no-spacing>.mdl-cell--6-col-desktop.mdl-cell--6-col-desktop{width:50%}.mdl-cell--7-col,.mdl-cell--7-col-desktop.mdl-cell--7-col-desktop{width:calc(58.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--7-col,.mdl-grid--no-spacing>.mdl-cell--7-col-desktop.mdl-cell--7-col-desktop{width:58.3333333333%}.mdl-cell--8-col,.mdl-cell--8-col-desktop.mdl-cell--8-col-desktop{width:calc(66.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--8-col,.mdl-grid--no-spacing>.mdl-cell--8-col-desktop.mdl-cell--8-col-desktop{width:66.6666666667%}.mdl-cell--9-col,.mdl-cell--9-col-desktop.mdl-cell--9-col-desktop{width:calc(75% - 16px)}.mdl-grid--no-spacing>.mdl-cell--9-col,.mdl-grid--no-spacing>.mdl-cell--9-col-desktop.mdl-cell--9-col-desktop{width:75%}.mdl-cell--10-col,.mdl-cell--10-col-desktop.mdl-cell--10-col-desktop{width:calc(83.3333333333% - 16px)}.mdl-grid--no-spacing>.mdl-cell--10-col,.mdl-grid--no-spacing>.mdl-cell--10-col-desktop.mdl-cell--10-col-desktop{width:83.3333333333%}.mdl-cell--11-col,.mdl-cell--11-col-desktop.mdl-cell--11-col-desktop{width:calc(91.6666666667% - 16px)}.mdl-grid--no-spacing>.mdl-cell--11-col,.mdl-grid--no-spacing>.mdl-cell--11-col-desktop.mdl-cell--11-col-desktop{width:91.6666666667%}.mdl-cell--12-col,.mdl-cell--12-col-desktop.mdl-cell--12-col-desktop{width:calc(100% - 16px)}.mdl-grid--no-spacing>.mdl-cell--12-col,.mdl-grid--no-spacing>.mdl-cell--12-col-desktop.mdl-cell--12-col-desktop{width:100%}}
+/*# sourceMappingURL=material.min.css.map */
diff --git a/themes/material/material.min.js b/themes/material/material.min.js
index fbab3af48..cb9bbca9e 100644
--- a/themes/material/material.min.js
+++ b/themes/material/material.min.js
@@ -1,10 +1,10 @@
 /**
  * material-design-lite - Material Design Components in CSS, JS and HTML
- * @version v1.0.5
+ * @version v1.0.6
  * @license Apache-2.0
  * @copyright 2015 Google, Inc.
  * @link https://github.com/google/material-design-lite
  */
-!function(){"use strict";function e(e,t){if(e){if(t.element_.classList.contains(t.CssClasses_.MDL_JS_RIPPLE_EFFECT)){var s=document.createElement("span");s.classList.add(t.CssClasses_.MDL_RIPPLE_CONTAINER),s.classList.add(t.CssClasses_.MDL_JS_RIPPLE_EFFECT);var i=document.createElement("span");i.classList.add(t.CssClasses_.MDL_RIPPLE),s.appendChild(i),e.appendChild(s)}e.addEventListener("click",function(s){s.preventDefault();var i=e.href.split("#")[1],n=t.element_.querySelector("#"+i);t.resetTabState_(),t.resetPanelState_(),e.classList.add(t.CssClasses_.ACTIVE_CLASS),n.classList.add(t.CssClasses_.ACTIVE_CLASS)})}}function t(e,t,s,i){if(e){if(i.tabBar_.classList.contains(i.CssClasses_.JS_RIPPLE_EFFECT)){var n=document.createElement("span");n.classList.add(i.CssClasses_.RIPPLE_CONTAINER),n.classList.add(i.CssClasses_.JS_RIPPLE_EFFECT);var a=document.createElement("span");a.classList.add(i.CssClasses_.RIPPLE),n.appendChild(a),e.appendChild(n)}e.addEventListener("click",function(n){n.preventDefault();var a=e.href.split("#")[1],l=i.content_.querySelector("#"+a);i.resetTabState_(t),i.resetPanelState_(s),e.classList.add(i.CssClasses_.IS_ACTIVE),l.classList.add(i.CssClasses_.IS_ACTIVE)})}}var s={upgradeDom:function(e,t){},upgradeElement:function(e,t){},upgradeElements:function(e){},upgradeAllRegistered:function(){},registerUpgradedCallback:function(e,t){},register:function(e){},downgradeElements:function(e){}};s=function(){function e(e,t){for(var s=0;s<c.length;s++)if(c[s].className===e)return"undefined"!=typeof t&&(c[s]=t),c[s];return!1}function t(e){var t=e.getAttribute("data-upgraded");return null===t?[""]:t.split(",")}function s(e,s){var i=t(e);return-1!==i.indexOf(s)}function i(t,s){if("undefined"==typeof t&&"undefined"==typeof s)for(var a=0;a<c.length;a++)i(c[a].className,c[a].cssClass);else{var l=t;if("undefined"==typeof s){var o=e(l);o&&(s=o.cssClass)}for(var r=document.querySelectorAll("."+s),d=0;d<r.length;d++)n(r[d],l)}}function n(i,n){if(!("object"==typeof i&&i instanceof Element))throw new Error("Invalid argument provided to upgrade MDL element.");var a=t(i),l=[];if(n)s(i,n)||l.push(e(n));else{var o=i.classList;c.forEach(function(e){o.contains(e.cssClass)&&-1===l.indexOf(e)&&!s(i,e.className)&&l.push(e)})}for(var r,d=0,_=l.length;_>d;d++){if(r=l[d],!r)throw new Error("Unable to find a registered component for the given class.");a.push(r.className),i.setAttribute("data-upgraded",a.join(","));var h=new r.classConstructor(i);h[C]=r,p.push(h);for(var u=0,m=r.callbacks.length;m>u;u++)r.callbacks[u](i);r.widget&&(i[r.className]=h);var E=document.createEvent("Events");E.initEvent("mdl-componentupgraded",!0,!0),i.dispatchEvent(E)}}function a(e){Array.isArray(e)||(e="function"==typeof e.item?Array.prototype.slice.call(e):[e]);for(var t,s=0,i=e.length;i>s;s++)t=e[s],t instanceof HTMLElement&&(n(t),t.children.length>0&&a(t.children))}function l(t){var s="undefined"==typeof t.widget&&"undefined"==typeof t.widget,i=!0;s||(i=t.widget||t.widget);var n={classConstructor:t.constructor||t.constructor,className:t.classAsString||t.classAsString,cssClass:t.cssClass||t.cssClass,widget:i,callbacks:[]};if(c.forEach(function(e){if(e.cssClass===n.cssClass)throw new Error("The provided cssClass has already been registered: "+e.cssClass);if(e.className===n.className)throw new Error("The provided className has already been registered")}),t.constructor.prototype.hasOwnProperty(C))throw new Error("MDL component classes must not have "+C+" defined as a property.");var a=e(t.classAsString,n);a||c.push(n)}function o(t,s){var i=e(t);i&&i.callbacks.push(s)}function r(){for(var e=0;e<c.length;e++)i(c[e].className)}function d(e){for(var t=0;t<p.length;t++){var s=p[t];if(s.element_===e)return s}}function _(e){if(e&&e[C].classConstructor.prototype.hasOwnProperty(u)){e[u]();var t=p.indexOf(e);p.splice(t,1);var s=e.element_.getAttribute("data-upgraded").split(","),i=s.indexOf(e[C].classAsString);s.splice(i,1),e.element_.setAttribute("data-upgraded",s.join(","));var n=document.createEvent("Events");n.initEvent("mdl-componentdowngraded",!0,!0),e.element_.dispatchEvent(n)}}function h(e){var t=function(e){_(d(e))};if(e instanceof Array||e instanceof NodeList)for(var s=0;s<e.length;s++)t(e[s]);else{if(!(e instanceof Node))throw new Error("Invalid argument provided to downgrade MDL nodes.");t(e)}}var c=[],p=[],u="mdlDowngrade_",C="mdlComponentConfigInternal_";return{upgradeDom:i,upgradeElement:n,upgradeElements:a,upgradeAllRegistered:r,registerUpgradedCallback:o,register:l,downgradeElements:h}}(),s.ComponentConfigPublic,s.ComponentConfig,s.Component,s.upgradeDom=s.upgradeDom,s.upgradeElement=s.upgradeElement,s.upgradeElements=s.upgradeElements,s.upgradeAllRegistered=s.upgradeAllRegistered,s.registerUpgradedCallback=s.registerUpgradedCallback,s.register=s.register,s.downgradeElements=s.downgradeElements,window.componentHandler=s,window.componentHandler=s,window.addEventListener("load",function(){"classList"in document.createElement("div")&&"querySelector"in document&&"addEventListener"in window&&Array.prototype.forEach?(document.documentElement.classList.add("mdl-js"),s.upgradeAllRegistered()):(s.upgradeElement=function(){},s.register=function(){})}),Date.now||(Date.now=function(){return(new Date).getTime()},Date.now=Date.now);for(var i=["webkit","moz"],n=0;n<i.length&&!window.requestAnimationFrame;++n){var a=i[n];window.requestAnimationFrame=window[a+"RequestAnimationFrame"],window.cancelAnimationFrame=window[a+"CancelAnimationFrame"]||window[a+"CancelRequestAnimationFrame"],window.requestAnimationFrame=window.requestAnimationFrame,window.cancelAnimationFrame=window.cancelAnimationFrame}if(/iP(ad|hone|od).*OS 6/.test(window.navigator.userAgent)||!window.requestAnimationFrame||!window.cancelAnimationFrame){var l=0;window.requestAnimationFrame=function(e){var t=Date.now(),s=Math.max(l+16,t);return setTimeout(function(){e(l=s)},s-t)},window.cancelAnimationFrame=clearTimeout,window.requestAnimationFrame=window.requestAnimationFrame,window.cancelAnimationFrame=window.cancelAnimationFrame}var o=function(e){this.element_=e,this.init()};window.MaterialButton=o,o.prototype.Constant_={},o.prototype.CssClasses_={RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_CONTAINER:"mdl-button__ripple-container",RIPPLE:"mdl-ripple"},o.prototype.blurHandler_=function(e){e&&this.element_.blur()},o.prototype.disable=function(){this.element_.disabled=!0},o.prototype.disable=o.prototype.disable,o.prototype.enable=function(){this.element_.disabled=!1},o.prototype.enable=o.prototype.enable,o.prototype.init=function(){if(this.element_){if(this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT)){var e=document.createElement("span");e.classList.add(this.CssClasses_.RIPPLE_CONTAINER),this.rippleElement_=document.createElement("span"),this.rippleElement_.classList.add(this.CssClasses_.RIPPLE),e.appendChild(this.rippleElement_),this.boundRippleBlurHandler=this.blurHandler_.bind(this),this.rippleElement_.addEventListener("mouseup",this.boundRippleBlurHandler),this.element_.appendChild(e)}this.boundButtonBlurHandler=this.blurHandler_.bind(this),this.element_.addEventListener("mouseup",this.boundButtonBlurHandler),this.element_.addEventListener("mouseleave",this.boundButtonBlurHandler)}},o.prototype.mdlDowngrade_=function(){this.rippleElement_&&this.rippleElement_.removeEventListener("mouseup",this.boundRippleBlurHandler),this.element_.removeEventListener("mouseup",this.boundButtonBlurHandler),this.element_.removeEventListener("mouseleave",this.boundButtonBlurHandler)},s.register({constructor:o,classAsString:"MaterialButton",cssClass:"mdl-js-button",widget:!0});var r=function(e){this.element_=e,this.init()};window.MaterialCheckbox=r,r.prototype.Constant_={TINY_TIMEOUT:.001},r.prototype.CssClasses_={INPUT:"mdl-checkbox__input",BOX_OUTLINE:"mdl-checkbox__box-outline",FOCUS_HELPER:"mdl-checkbox__focus-helper",TICK_OUTLINE:"mdl-checkbox__tick-outline",RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE_CONTAINER:"mdl-checkbox__ripple-container",RIPPLE_CENTER:"mdl-ripple--center",RIPPLE:"mdl-ripple",IS_FOCUSED:"is-focused",IS_DISABLED:"is-disabled",IS_CHECKED:"is-checked",IS_UPGRADED:"is-upgraded"},r.prototype.onChange_=function(e){this.updateClasses_()},r.prototype.onFocus_=function(e){this.element_.classList.add(this.CssClasses_.IS_FOCUSED)},r.prototype.onBlur_=function(e){this.element_.classList.remove(this.CssClasses_.IS_FOCUSED)},r.prototype.onMouseUp_=function(e){this.blur_()},r.prototype.updateClasses_=function(){this.checkDisabled(),this.checkToggleState()},r.prototype.blur_=function(){window.setTimeout(function(){this.inputElement_.blur()}.bind(this),this.Constant_.TINY_TIMEOUT)},r.prototype.checkToggleState=function(){this.inputElement_.checked?this.element_.classList.add(this.CssClasses_.IS_CHECKED):this.element_.classList.remove(this.CssClasses_.IS_CHECKED)},r.prototype.checkToggleState=r.prototype.checkToggleState,r.prototype.checkDisabled=function(){this.inputElement_.disabled?this.element_.classList.add(this.CssClasses_.IS_DISABLED):this.element_.classList.remove(this.CssClasses_.IS_DISABLED)},r.prototype.checkDisabled=r.prototype.checkDisabled,r.prototype.disable=function(){this.inputElement_.disabled=!0,this.updateClasses_()},r.prototype.disable=r.prototype.disable,r.prototype.enable=function(){this.inputElement_.disabled=!1,this.updateClasses_()},r.prototype.enable=r.prototype.enable,r.prototype.check=function(){this.inputElement_.checked=!0,this.updateClasses_()},r.prototype.check=r.prototype.check,r.prototype.uncheck=function(){this.inputElement_.checked=!1,this.updateClasses_()},r.prototype.uncheck=r.prototype.uncheck,r.prototype.init=function(){if(this.element_){this.inputElement_=this.element_.querySelector("."+this.CssClasses_.INPUT);var e=document.createElement("span");e.classList.add(this.CssClasses_.BOX_OUTLINE);var t=document.createElement("span");t.classList.add(this.CssClasses_.FOCUS_HELPER);var s=document.createElement("span");if(s.classList.add(this.CssClasses_.TICK_OUTLINE),e.appendChild(s),this.element_.appendChild(t),this.element_.appendChild(e),this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT)){this.element_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS),this.rippleContainerElement_=document.createElement("span"),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CONTAINER),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_EFFECT),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CENTER),this.boundRippleMouseUp=this.onMouseUp_.bind(this),this.rippleContainerElement_.addEventListener("mouseup",this.boundRippleMouseUp);var i=document.createElement("span");i.classList.add(this.CssClasses_.RIPPLE),this.rippleContainerElement_.appendChild(i),this.element_.appendChild(this.rippleContainerElement_)}this.boundInputOnChange=this.onChange_.bind(this),this.boundInputOnFocus=this.onFocus_.bind(this),this.boundInputOnBlur=this.onBlur_.bind(this),this.boundElementMouseUp=this.onMouseUp_.bind(this),this.inputElement_.addEventListener("change",this.boundInputOnChange),this.inputElement_.addEventListener("focus",this.boundInputOnFocus),this.inputElement_.addEventListener("blur",this.boundInputOnBlur),this.element_.addEventListener("mouseup",this.boundElementMouseUp),this.updateClasses_(),this.element_.classList.add(this.CssClasses_.IS_UPGRADED)}},r.prototype.mdlDowngrade_=function(){this.rippleContainerElement_&&this.rippleContainerElement_.removeEventListener("mouseup",this.boundRippleMouseUp),this.inputElement_.removeEventListener("change",this.boundInputOnChange),this.inputElement_.removeEventListener("focus",this.boundInputOnFocus),this.inputElement_.removeEventListener("blur",this.boundInputOnBlur),this.element_.removeEventListener("mouseup",this.boundElementMouseUp)},s.register({constructor:r,classAsString:"MaterialCheckbox",cssClass:"mdl-js-checkbox",widget:!0});var d=function(e){this.element_=e,this.init()};window.MaterialIconToggle=d,d.prototype.Constant_={TINY_TIMEOUT:.001},d.prototype.CssClasses_={INPUT:"mdl-icon-toggle__input",JS_RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE_CONTAINER:"mdl-icon-toggle__ripple-container",RIPPLE_CENTER:"mdl-ripple--center",RIPPLE:"mdl-ripple",IS_FOCUSED:"is-focused",IS_DISABLED:"is-disabled",IS_CHECKED:"is-checked"},d.prototype.onChange_=function(e){this.updateClasses_()},d.prototype.onFocus_=function(e){this.element_.classList.add(this.CssClasses_.IS_FOCUSED)},d.prototype.onBlur_=function(e){this.element_.classList.remove(this.CssClasses_.IS_FOCUSED)},d.prototype.onMouseUp_=function(e){this.blur_()},d.prototype.updateClasses_=function(){this.checkDisabled(),this.checkToggleState()},d.prototype.blur_=function(){window.setTimeout(function(){this.inputElement_.blur()}.bind(this),this.Constant_.TINY_TIMEOUT)},d.prototype.checkToggleState=function(){this.inputElement_.checked?this.element_.classList.add(this.CssClasses_.IS_CHECKED):this.element_.classList.remove(this.CssClasses_.IS_CHECKED)},d.prototype.checkToggleState=d.prototype.checkToggleState,d.prototype.checkDisabled=function(){this.inputElement_.disabled?this.element_.classList.add(this.CssClasses_.IS_DISABLED):this.element_.classList.remove(this.CssClasses_.IS_DISABLED)},d.prototype.checkDisabled=d.prototype.checkDisabled,d.prototype.disable=function(){this.inputElement_.disabled=!0,this.updateClasses_()},d.prototype.disable=d.prototype.disable,d.prototype.enable=function(){this.inputElement_.disabled=!1,this.updateClasses_()},d.prototype.enable=d.prototype.enable,d.prototype.check=function(){this.inputElement_.checked=!0,this.updateClasses_()},d.prototype.check=d.prototype.check,d.prototype.uncheck=function(){this.inputElement_.checked=!1,this.updateClasses_()},d.prototype.uncheck=d.prototype.uncheck,d.prototype.init=function(){if(this.element_){if(this.inputElement_=this.element_.querySelector("."+this.CssClasses_.INPUT),this.element_.classList.contains(this.CssClasses_.JS_RIPPLE_EFFECT)){this.element_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS),this.rippleContainerElement_=document.createElement("span"),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CONTAINER),this.rippleContainerElement_.classList.add(this.CssClasses_.JS_RIPPLE_EFFECT),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CENTER),this.boundRippleMouseUp=this.onMouseUp_.bind(this),this.rippleContainerElement_.addEventListener("mouseup",this.boundRippleMouseUp);var e=document.createElement("span");e.classList.add(this.CssClasses_.RIPPLE),this.rippleContainerElement_.appendChild(e),this.element_.appendChild(this.rippleContainerElement_)}this.boundInputOnChange=this.onChange_.bind(this),this.boundInputOnFocus=this.onFocus_.bind(this),this.boundInputOnBlur=this.onBlur_.bind(this),this.boundElementOnMouseUp=this.onMouseUp_.bind(this),this.inputElement_.addEventListener("change",this.boundInputOnChange),this.inputElement_.addEventListener("focus",this.boundInputOnFocus),this.inputElement_.addEventListener("blur",this.boundInputOnBlur),this.element_.addEventListener("mouseup",this.boundElementOnMouseUp),this.updateClasses_(),this.element_.classList.add("is-upgraded")}},d.prototype.mdlDowngrade_=function(){this.rippleContainerElement_&&this.rippleContainerElement_.removeEventListener("mouseup",this.boundRippleMouseUp),this.inputElement_.removeEventListener("change",this.boundInputOnChange),this.inputElement_.removeEventListener("focus",this.boundInputOnFocus),this.inputElement_.removeEventListener("blur",this.boundInputOnBlur),this.element_.removeEventListener("mouseup",this.boundElementOnMouseUp)},s.register({constructor:d,classAsString:"MaterialIconToggle",cssClass:"mdl-js-icon-toggle",widget:!0});var _=function(e){this.element_=e,this.init()};window.MaterialMenu=_,_.prototype.Constant_={TRANSITION_DURATION_SECONDS:.3,TRANSITION_DURATION_FRACTION:.8,CLOSE_TIMEOUT:150},_.prototype.Keycodes_={ENTER:13,ESCAPE:27,SPACE:32,UP_ARROW:38,DOWN_ARROW:40},_.prototype.CssClasses_={CONTAINER:"mdl-menu__container",OUTLINE:"mdl-menu__outline",ITEM:"mdl-menu__item",ITEM_RIPPLE_CONTAINER:"mdl-menu__item-ripple-container",RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE:"mdl-ripple",IS_UPGRADED:"is-upgraded",IS_VISIBLE:"is-visible",IS_ANIMATING:"is-animating",BOTTOM_LEFT:"mdl-menu--bottom-left",BOTTOM_RIGHT:"mdl-menu--bottom-right",TOP_LEFT:"mdl-menu--top-left",TOP_RIGHT:"mdl-menu--top-right",UNALIGNED:"mdl-menu--unaligned"},_.prototype.init=function(){if(this.element_){var e=document.createElement("div");e.classList.add(this.CssClasses_.CONTAINER),this.element_.parentElement.insertBefore(e,this.element_),this.element_.parentElement.removeChild(this.element_),e.appendChild(this.element_),this.container_=e;var t=document.createElement("div");t.classList.add(this.CssClasses_.OUTLINE),this.outline_=t,e.insertBefore(t,this.element_);var s=this.element_.getAttribute("for"),i=null;s&&(i=document.getElementById(s),i&&(this.forElement_=i,i.addEventListener("click",this.handleForClick_.bind(this)),i.addEventListener("keydown",this.handleForKeyboardEvent_.bind(this))));var n=this.element_.querySelectorAll("."+this.CssClasses_.ITEM);this.boundItemKeydown=this.handleItemKeyboardEvent_.bind(this),this.boundItemClick=this.handleItemClick_.bind(this);for(var a=0;a<n.length;a++)n[a].addEventListener("click",this.boundItemClick),n[a].tabIndex="-1",n[a].addEventListener("keydown",this.boundItemKeydown);if(this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT))for(this.element_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS),a=0;a<n.length;a++){var l=n[a],o=document.createElement("span");o.classList.add(this.CssClasses_.ITEM_RIPPLE_CONTAINER);var r=document.createElement("span");r.classList.add(this.CssClasses_.RIPPLE),o.appendChild(r),l.appendChild(o),l.classList.add(this.CssClasses_.RIPPLE_EFFECT)}this.element_.classList.contains(this.CssClasses_.BOTTOM_LEFT)&&this.outline_.classList.add(this.CssClasses_.BOTTOM_LEFT),this.element_.classList.contains(this.CssClasses_.BOTTOM_RIGHT)&&this.outline_.classList.add(this.CssClasses_.BOTTOM_RIGHT),this.element_.classList.contains(this.CssClasses_.TOP_LEFT)&&this.outline_.classList.add(this.CssClasses_.TOP_LEFT),this.element_.classList.contains(this.CssClasses_.TOP_RIGHT)&&this.outline_.classList.add(this.CssClasses_.TOP_RIGHT),this.element_.classList.contains(this.CssClasses_.UNALIGNED)&&this.outline_.classList.add(this.CssClasses_.UNALIGNED),e.classList.add(this.CssClasses_.IS_UPGRADED)}},_.prototype.handleForClick_=function(e){if(this.element_&&this.forElement_){var t=this.forElement_.getBoundingClientRect(),s=this.forElement_.parentElement.getBoundingClientRect();this.element_.classList.contains(this.CssClasses_.UNALIGNED)||(this.element_.classList.contains(this.CssClasses_.BOTTOM_RIGHT)?(this.container_.style.right=s.right-t.right+"px",this.container_.style.top=this.forElement_.offsetTop+this.forElement_.offsetHeight+"px"):this.element_.classList.contains(this.CssClasses_.TOP_LEFT)?(this.container_.style.left=this.forElement_.offsetLeft+"px",this.container_.style.bottom=s.bottom-t.top+"px"):this.element_.classList.contains(this.CssClasses_.TOP_RIGHT)?(this.container_.style.right=s.right-t.right+"px",this.container_.style.bottom=s.bottom-t.top+"px"):(this.container_.style.left=this.forElement_.offsetLeft+"px",this.container_.style.top=this.forElement_.offsetTop+this.forElement_.offsetHeight+"px"))}this.toggle(e)},_.prototype.handleForKeyboardEvent_=function(e){if(this.element_&&this.container_&&this.forElement_){var t=this.element_.querySelectorAll("."+this.CssClasses_.ITEM+":not([disabled])");t&&t.length>0&&this.container_.classList.contains(this.CssClasses_.IS_VISIBLE)&&(e.keyCode===this.Keycodes_.UP_ARROW?(e.preventDefault(),t[t.length-1].focus()):e.keyCode===this.Keycodes_.DOWN_ARROW&&(e.preventDefault(),t[0].focus()))}},_.prototype.handleItemKeyboardEvent_=function(e){if(this.element_&&this.container_){var t=this.element_.querySelectorAll("."+this.CssClasses_.ITEM+":not([disabled])");if(t&&t.length>0&&this.container_.classList.contains(this.CssClasses_.IS_VISIBLE)){var s=Array.prototype.slice.call(t).indexOf(e.target);if(e.keyCode===this.Keycodes_.UP_ARROW)e.preventDefault(),s>0?t[s-1].focus():t[t.length-1].focus();else if(e.keyCode===this.Keycodes_.DOWN_ARROW)e.preventDefault(),t.length>s+1?t[s+1].focus():t[0].focus();else if(e.keyCode===this.Keycodes_.SPACE||e.keyCode===this.Keycodes_.ENTER){e.preventDefault();var i=new MouseEvent("mousedown");e.target.dispatchEvent(i),i=new MouseEvent("mouseup"),e.target.dispatchEvent(i),e.target.click()}else e.keyCode===this.Keycodes_.ESCAPE&&(e.preventDefault(),this.hide())}}},_.prototype.handleItemClick_=function(e){null!==e.target.getAttribute("disabled")?e.stopPropagation():(this.closing_=!0,window.setTimeout(function(e){this.hide(),this.closing_=!1}.bind(this),this.Constant_.CLOSE_TIMEOUT))},_.prototype.applyClip_=function(e,t){this.element_.classList.contains(this.CssClasses_.UNALIGNED)?this.element_.style.clip="":this.element_.classList.contains(this.CssClasses_.BOTTOM_RIGHT)?this.element_.style.clip="rect(0 "+t+"px 0 "+t+"px)":this.element_.classList.contains(this.CssClasses_.TOP_LEFT)?this.element_.style.clip="rect("+e+"px 0 "+e+"px 0)":this.element_.classList.contains(this.CssClasses_.TOP_RIGHT)?this.element_.style.clip="rect("+e+"px "+t+"px "+e+"px "+t+"px)":this.element_.style.clip=""},_.prototype.addAnimationEndListener_=function(){var e=function(){this.element_.removeEventListener("transitionend",e),this.element_.removeEventListener("webkitTransitionEnd",e),this.element_.classList.remove(this.CssClasses_.IS_ANIMATING)}.bind(this);this.element_.addEventListener("transitionend",e),this.element_.addEventListener("webkitTransitionEnd",e)},_.prototype.show=function(e){if(this.element_&&this.container_&&this.outline_){var t=this.element_.getBoundingClientRect().height,s=this.element_.getBoundingClientRect().width;this.container_.style.width=s+"px",this.container_.style.height=t+"px",this.outline_.style.width=s+"px",this.outline_.style.height=t+"px";for(var i=this.Constant_.TRANSITION_DURATION_SECONDS*this.Constant_.TRANSITION_DURATION_FRACTION,n=this.element_.querySelectorAll("."+this.CssClasses_.ITEM),a=0;a<n.length;a++){var l=null;l=this.element_.classList.contains(this.CssClasses_.TOP_LEFT)||this.element_.classList.contains(this.CssClasses_.TOP_RIGHT)?(t-n[a].offsetTop-n[a].offsetHeight)/t*i+"s":n[a].offsetTop/t*i+"s",n[a].style.transitionDelay=l}this.applyClip_(t,s),window.requestAnimationFrame(function(){this.element_.classList.add(this.CssClasses_.IS_ANIMATING),this.element_.style.clip="rect(0 "+s+"px "+t+"px 0)",this.container_.classList.add(this.CssClasses_.IS_VISIBLE)}.bind(this)),this.addAnimationEndListener_();var o=function(t){t===e||this.closing_||(document.removeEventListener("click",o),this.hide())}.bind(this);document.addEventListener("click",o)}},_.prototype.show=_.prototype.show,_.prototype.hide=function(){if(this.element_&&this.container_&&this.outline_){for(var e=this.element_.querySelectorAll("."+this.CssClasses_.ITEM),t=0;t<e.length;t++)e[t].style.transitionDelay=null;var s=this.element_.getBoundingClientRect().height,i=this.element_.getBoundingClientRect().width;this.element_.classList.add(this.CssClasses_.IS_ANIMATING),this.applyClip_(s,i),this.container_.classList.remove(this.CssClasses_.IS_VISIBLE),this.addAnimationEndListener_()}},_.prototype.hide=_.prototype.hide,_.prototype.toggle=function(e){this.container_.classList.contains(this.CssClasses_.IS_VISIBLE)?this.hide():this.show(e)},_.prototype.toggle=_.prototype.toggle,_.prototype.mdlDowngrade_=function(){for(var e=this.element_.querySelectorAll("."+this.CssClasses_.ITEM),t=0;t<e.length;t++)e[t].removeEventListener("click",this.boundItemClick),e[t].removeEventListener("keydown",this.boundItemKeydown)},s.register({constructor:_,classAsString:"MaterialMenu",cssClass:"mdl-js-menu",widget:!0});var h=function(e){this.element_=e,this.init()};window.MaterialProgress=h,h.prototype.Constant_={},h.prototype.CssClasses_={INDETERMINATE_CLASS:"mdl-progress__indeterminate"},h.prototype.setProgress=function(e){this.element_.classList.contains(this.CssClasses_.INDETERMINATE_CLASS)||(this.progressbar_.style.width=e+"%")},h.prototype.setProgress=h.prototype.setProgress,h.prototype.setBuffer=function(e){this.bufferbar_.style.width=e+"%",this.auxbar_.style.width=100-e+"%"},h.prototype.setBuffer=h.prototype.setBuffer,h.prototype.init=function(){if(this.element_){var e=document.createElement("div");e.className="progressbar bar bar1",this.element_.appendChild(e),this.progressbar_=e,e=document.createElement("div"),e.className="bufferbar bar bar2",this.element_.appendChild(e),this.bufferbar_=e,e=document.createElement("div"),e.className="auxbar bar bar3",this.element_.appendChild(e),this.auxbar_=e,this.progressbar_.style.width="0%",this.bufferbar_.style.width="100%",this.auxbar_.style.width="0%",this.element_.classList.add("is-upgraded")}},h.prototype.mdlDowngrade_=function(){for(;this.element_.firstChild;)this.element_.removeChild(this.element_.firstChild)},s.register({constructor:h,classAsString:"MaterialProgress",cssClass:"mdl-js-progress",widget:!0});var c=function(e){this.element_=e,this.init()};window.MaterialRadio=c,c.prototype.Constant_={TINY_TIMEOUT:.001},c.prototype.CssClasses_={IS_FOCUSED:"is-focused",IS_DISABLED:"is-disabled",IS_CHECKED:"is-checked",IS_UPGRADED:"is-upgraded",JS_RADIO:"mdl-js-radio",RADIO_BTN:"mdl-radio__button",RADIO_OUTER_CIRCLE:"mdl-radio__outer-circle",RADIO_INNER_CIRCLE:"mdl-radio__inner-circle",RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE_CONTAINER:"mdl-radio__ripple-container",RIPPLE_CENTER:"mdl-ripple--center",RIPPLE:"mdl-ripple"},c.prototype.onChange_=function(e){for(var t=document.getElementsByClassName(this.CssClasses_.JS_RADIO),s=0;s<t.length;s++){var i=t[s].querySelector("."+this.CssClasses_.RADIO_BTN);i.getAttribute("name")===this.btnElement_.getAttribute("name")&&t[s].MaterialRadio.updateClasses_()}},c.prototype.onFocus_=function(e){this.element_.classList.add(this.CssClasses_.IS_FOCUSED)},c.prototype.onBlur_=function(e){this.element_.classList.remove(this.CssClasses_.IS_FOCUSED)},c.prototype.onMouseup_=function(e){this.blur_()},c.prototype.updateClasses_=function(){this.checkDisabled(),this.checkToggleState()},c.prototype.blur_=function(){window.setTimeout(function(){this.btnElement_.blur()}.bind(this),this.Constant_.TINY_TIMEOUT)},c.prototype.checkDisabled=function(){this.btnElement_.disabled?this.element_.classList.add(this.CssClasses_.IS_DISABLED):this.element_.classList.remove(this.CssClasses_.IS_DISABLED)},c.prototype.checkDisabled=c.prototype.checkDisabled,c.prototype.checkToggleState=function(){this.btnElement_.checked?this.element_.classList.add(this.CssClasses_.IS_CHECKED):this.element_.classList.remove(this.CssClasses_.IS_CHECKED)},c.prototype.checkToggleState=c.prototype.checkToggleState,c.prototype.disable=function(){this.btnElement_.disabled=!0,this.updateClasses_()},c.prototype.disable=c.prototype.disable,c.prototype.enable=function(){this.btnElement_.disabled=!1,this.updateClasses_()},c.prototype.enable=c.prototype.enable,c.prototype.check=function(){this.btnElement_.checked=!0,this.updateClasses_()},c.prototype.check=c.prototype.check,c.prototype.uncheck=function(){this.btnElement_.checked=!1,this.updateClasses_()},c.prototype.uncheck=c.prototype.uncheck,c.prototype.init=function(){if(this.element_){this.btnElement_=this.element_.querySelector("."+this.CssClasses_.RADIO_BTN);var e=document.createElement("span");e.classList.add(this.CssClasses_.RADIO_OUTER_CIRCLE);var t=document.createElement("span");t.classList.add(this.CssClasses_.RADIO_INNER_CIRCLE),this.element_.appendChild(e),this.element_.appendChild(t);var s;if(this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT)){this.element_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS),s=document.createElement("span"),s.classList.add(this.CssClasses_.RIPPLE_CONTAINER),s.classList.add(this.CssClasses_.RIPPLE_EFFECT),s.classList.add(this.CssClasses_.RIPPLE_CENTER),s.addEventListener("mouseup",this.onMouseup_.bind(this));var i=document.createElement("span");i.classList.add(this.CssClasses_.RIPPLE),s.appendChild(i),this.element_.appendChild(s)}this.btnElement_.addEventListener("change",this.onChange_.bind(this)),this.btnElement_.addEventListener("focus",this.onFocus_.bind(this)),this.btnElement_.addEventListener("blur",this.onBlur_.bind(this)),this.element_.addEventListener("mouseup",this.onMouseup_.bind(this)),this.updateClasses_(),this.element_.classList.add(this.CssClasses_.IS_UPGRADED)}},s.register({constructor:c,classAsString:"MaterialRadio",cssClass:"mdl-js-radio",widget:!0});var p=function(e){this.element_=e,this.isIE_=window.navigator.msPointerEnabled,this.init()};window.MaterialSlider=p,p.prototype.Constant_={},p.prototype.CssClasses_={IE_CONTAINER:"mdl-slider__ie-container",SLIDER_CONTAINER:"mdl-slider__container",BACKGROUND_FLEX:"mdl-slider__background-flex",BACKGROUND_LOWER:"mdl-slider__background-lower",BACKGROUND_UPPER:"mdl-slider__background-upper",IS_LOWEST_VALUE:"is-lowest-value",IS_UPGRADED:"is-upgraded"},p.prototype.onInput_=function(e){this.updateValueStyles_()},p.prototype.onChange_=function(e){this.updateValueStyles_()},p.prototype.onMouseUp_=function(e){e.target.blur()},p.prototype.onContainerMouseDown_=function(e){if(e.target===this.element_.parentElement){e.preventDefault();var t=new MouseEvent("mousedown",{target:e.target,buttons:e.buttons,clientX:e.clientX,clientY:this.element_.getBoundingClientRect().y});this.element_.dispatchEvent(t)}},p.prototype.updateValueStyles_=function(){var e=(this.element_.value-this.element_.min)/(this.element_.max-this.element_.min);0===e?this.element_.classList.add(this.CssClasses_.IS_LOWEST_VALUE):this.element_.classList.remove(this.CssClasses_.IS_LOWEST_VALUE),this.isIE_||(this.backgroundLower_.style.flex=e,this.backgroundLower_.style.webkitFlex=e,this.backgroundUpper_.style.flex=1-e,this.backgroundUpper_.style.webkitFlex=1-e)},p.prototype.disable=function(){this.element_.disabled=!0},p.prototype.disable=p.prototype.disable,p.prototype.enable=function(){this.element_.disabled=!1},p.prototype.enable=p.prototype.enable,p.prototype.change=function(e){"undefined"!=typeof e&&(this.element_.value=e),this.updateValueStyles_()},p.prototype.change=p.prototype.change,p.prototype.init=function(){if(this.element_){if(this.isIE_){var e=document.createElement("div");e.classList.add(this.CssClasses_.IE_CONTAINER),this.element_.parentElement.insertBefore(e,this.element_),this.element_.parentElement.removeChild(this.element_),e.appendChild(this.element_)}else{var t=document.createElement("div");t.classList.add(this.CssClasses_.SLIDER_CONTAINER),this.element_.parentElement.insertBefore(t,this.element_),this.element_.parentElement.removeChild(this.element_),t.appendChild(this.element_);var s=document.createElement("div");s.classList.add(this.CssClasses_.BACKGROUND_FLEX),t.appendChild(s),this.backgroundLower_=document.createElement("div"),this.backgroundLower_.classList.add(this.CssClasses_.BACKGROUND_LOWER),s.appendChild(this.backgroundLower_),this.backgroundUpper_=document.createElement("div"),this.backgroundUpper_.classList.add(this.CssClasses_.BACKGROUND_UPPER),s.appendChild(this.backgroundUpper_)}this.boundInputHandler=this.onInput_.bind(this),this.boundChangeHandler=this.onChange_.bind(this),this.boundMouseUpHandler=this.onMouseUp_.bind(this),this.boundContainerMouseDownHandler=this.onContainerMouseDown_.bind(this),this.element_.addEventListener("input",this.boundInputHandler),this.element_.addEventListener("change",this.boundChangeHandler),this.element_.addEventListener("mouseup",this.boundMouseUpHandler),this.element_.parentElement.addEventListener("mousedown",this.boundContainerMouseDownHandler),
-this.updateValueStyles_(),this.element_.classList.add(this.CssClasses_.IS_UPGRADED)}},p.prototype.mdlDowngrade_=function(){this.element_.removeEventListener("input",this.boundInputHandler),this.element_.removeEventListener("change",this.boundChangeHandler),this.element_.removeEventListener("mouseup",this.boundMouseUpHandler),this.element_.parentElement.removeEventListener("mousedown",this.boundContainerMouseDownHandler)},s.register({constructor:p,classAsString:"MaterialSlider",cssClass:"mdl-js-slider",widget:!0});var u=function(e){this.element_=e,this.init()};window.MaterialSpinner=u,u.prototype.Constant_={MDL_SPINNER_LAYER_COUNT:4},u.prototype.CssClasses_={MDL_SPINNER_LAYER:"mdl-spinner__layer",MDL_SPINNER_CIRCLE_CLIPPER:"mdl-spinner__circle-clipper",MDL_SPINNER_CIRCLE:"mdl-spinner__circle",MDL_SPINNER_GAP_PATCH:"mdl-spinner__gap-patch",MDL_SPINNER_LEFT:"mdl-spinner__left",MDL_SPINNER_RIGHT:"mdl-spinner__right"},u.prototype.createLayer=function(e){var t=document.createElement("div");t.classList.add(this.CssClasses_.MDL_SPINNER_LAYER),t.classList.add(this.CssClasses_.MDL_SPINNER_LAYER+"-"+e);var s=document.createElement("div");s.classList.add(this.CssClasses_.MDL_SPINNER_CIRCLE_CLIPPER),s.classList.add(this.CssClasses_.MDL_SPINNER_LEFT);var i=document.createElement("div");i.classList.add(this.CssClasses_.MDL_SPINNER_GAP_PATCH);var n=document.createElement("div");n.classList.add(this.CssClasses_.MDL_SPINNER_CIRCLE_CLIPPER),n.classList.add(this.CssClasses_.MDL_SPINNER_RIGHT);for(var a=[s,i,n],l=0;l<a.length;l++){var o=document.createElement("div");o.classList.add(this.CssClasses_.MDL_SPINNER_CIRCLE),a[l].appendChild(o)}t.appendChild(s),t.appendChild(i),t.appendChild(n),this.element_.appendChild(t)},u.prototype.createLayer=u.prototype.createLayer,u.prototype.stop=function(){this.element_.classList.remove("is-active")},u.prototype.stop=u.prototype.stop,u.prototype.start=function(){this.element_.classList.add("is-active")},u.prototype.start=u.prototype.start,u.prototype.init=function(){if(this.element_){for(var e=1;e<=this.Constant_.MDL_SPINNER_LAYER_COUNT;e++)this.createLayer(e);this.element_.classList.add("is-upgraded")}},s.register({constructor:u,classAsString:"MaterialSpinner",cssClass:"mdl-js-spinner",widget:!0});var C=function(e){this.element_=e,this.init()};window.MaterialSwitch=C,C.prototype.Constant_={TINY_TIMEOUT:.001},C.prototype.CssClasses_={INPUT:"mdl-switch__input",TRACK:"mdl-switch__track",THUMB:"mdl-switch__thumb",FOCUS_HELPER:"mdl-switch__focus-helper",RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE_CONTAINER:"mdl-switch__ripple-container",RIPPLE_CENTER:"mdl-ripple--center",RIPPLE:"mdl-ripple",IS_FOCUSED:"is-focused",IS_DISABLED:"is-disabled",IS_CHECKED:"is-checked"},C.prototype.onChange_=function(e){this.updateClasses_()},C.prototype.onFocus_=function(e){this.element_.classList.add(this.CssClasses_.IS_FOCUSED)},C.prototype.onBlur_=function(e){this.element_.classList.remove(this.CssClasses_.IS_FOCUSED)},C.prototype.onMouseUp_=function(e){this.blur_()},C.prototype.updateClasses_=function(){this.checkDisabled(),this.checkToggleState()},C.prototype.blur_=function(){window.setTimeout(function(){this.inputElement_.blur()}.bind(this),this.Constant_.TINY_TIMEOUT)},C.prototype.checkDisabled=function(){this.inputElement_.disabled?this.element_.classList.add(this.CssClasses_.IS_DISABLED):this.element_.classList.remove(this.CssClasses_.IS_DISABLED)},C.prototype.checkDisabled=C.prototype.checkDisabled,C.prototype.checkToggleState=function(){this.inputElement_.checked?this.element_.classList.add(this.CssClasses_.IS_CHECKED):this.element_.classList.remove(this.CssClasses_.IS_CHECKED)},C.prototype.checkToggleState=C.prototype.checkToggleState,C.prototype.disable=function(){this.inputElement_.disabled=!0,this.updateClasses_()},C.prototype.disable=C.prototype.disable,C.prototype.enable=function(){this.inputElement_.disabled=!1,this.updateClasses_()},C.prototype.enable=C.prototype.enable,C.prototype.on=function(){this.inputElement_.checked=!0,this.updateClasses_()},C.prototype.on=C.prototype.on,C.prototype.off=function(){this.inputElement_.checked=!1,this.updateClasses_()},C.prototype.off=C.prototype.off,C.prototype.init=function(){if(this.element_){this.inputElement_=this.element_.querySelector("."+this.CssClasses_.INPUT);var e=document.createElement("div");e.classList.add(this.CssClasses_.TRACK);var t=document.createElement("div");t.classList.add(this.CssClasses_.THUMB);var s=document.createElement("span");if(s.classList.add(this.CssClasses_.FOCUS_HELPER),t.appendChild(s),this.element_.appendChild(e),this.element_.appendChild(t),this.boundMouseUpHandler=this.onMouseUp_.bind(this),this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT)){this.element_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS),this.rippleContainerElement_=document.createElement("span"),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CONTAINER),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_EFFECT),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CENTER),this.rippleContainerElement_.addEventListener("mouseup",this.boundMouseUpHandler);var i=document.createElement("span");i.classList.add(this.CssClasses_.RIPPLE),this.rippleContainerElement_.appendChild(i),this.element_.appendChild(this.rippleContainerElement_)}this.boundChangeHandler=this.onChange_.bind(this),this.boundFocusHandler=this.onFocus_.bind(this),this.boundBlurHandler=this.onBlur_.bind(this),this.inputElement_.addEventListener("change",this.boundChangeHandler),this.inputElement_.addEventListener("focus",this.boundFocusHandler),this.inputElement_.addEventListener("blur",this.boundBlurHandler),this.element_.addEventListener("mouseup",this.boundMouseUpHandler),this.updateClasses_(),this.element_.classList.add("is-upgraded")}},C.prototype.mdlDowngrade_=function(){this.rippleContainerElement_&&this.rippleContainerElement_.removeEventListener("mouseup",this.boundMouseUpHandler),this.inputElement_.removeEventListener("change",this.boundChangeHandler),this.inputElement_.removeEventListener("focus",this.boundFocusHandler),this.inputElement_.removeEventListener("blur",this.boundBlurHandler),this.element_.removeEventListener("mouseup",this.boundMouseUpHandler)},s.register({constructor:C,classAsString:"MaterialSwitch",cssClass:"mdl-js-switch",widget:!0});var m=function(e){this.element_=e,this.init()};window.MaterialTabs=m,m.prototype.Constant_={},m.prototype.CssClasses_={TAB_CLASS:"mdl-tabs__tab",PANEL_CLASS:"mdl-tabs__panel",ACTIVE_CLASS:"is-active",UPGRADED_CLASS:"is-upgraded",MDL_JS_RIPPLE_EFFECT:"mdl-js-ripple-effect",MDL_RIPPLE_CONTAINER:"mdl-tabs__ripple-container",MDL_RIPPLE:"mdl-ripple",MDL_JS_RIPPLE_EFFECT_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events"},m.prototype.initTabs_=function(){this.element_.classList.contains(this.CssClasses_.MDL_JS_RIPPLE_EFFECT)&&this.element_.classList.add(this.CssClasses_.MDL_JS_RIPPLE_EFFECT_IGNORE_EVENTS),this.tabs_=this.element_.querySelectorAll("."+this.CssClasses_.TAB_CLASS),this.panels_=this.element_.querySelectorAll("."+this.CssClasses_.PANEL_CLASS);for(var t=0;t<this.tabs_.length;t++)new e(this.tabs_[t],this);this.element_.classList.add(this.CssClasses_.UPGRADED_CLASS)},m.prototype.resetTabState_=function(){for(var e=0;e<this.tabs_.length;e++)this.tabs_[e].classList.remove(this.CssClasses_.ACTIVE_CLASS)},m.prototype.resetPanelState_=function(){for(var e=0;e<this.panels_.length;e++)this.panels_[e].classList.remove(this.CssClasses_.ACTIVE_CLASS)},m.prototype.init=function(){this.element_&&this.initTabs_()},s.register({constructor:m,classAsString:"MaterialTabs",cssClass:"mdl-js-tabs"});var E=function(e){this.element_=e,this.maxRows=this.Constant_.NO_MAX_ROWS,this.init()};window.MaterialTextfield=E,E.prototype.Constant_={NO_MAX_ROWS:-1,MAX_ROWS_ATTRIBUTE:"maxrows"},E.prototype.CssClasses_={LABEL:"mdl-textfield__label",INPUT:"mdl-textfield__input",IS_DIRTY:"is-dirty",IS_FOCUSED:"is-focused",IS_DISABLED:"is-disabled",IS_INVALID:"is-invalid",IS_UPGRADED:"is-upgraded"},E.prototype.onKeyDown_=function(e){var t=e.target.value.split("\n").length;13===e.keyCode&&t>=this.maxRows&&e.preventDefault()},E.prototype.onFocus_=function(e){this.element_.classList.add(this.CssClasses_.IS_FOCUSED)},E.prototype.onBlur_=function(e){this.element_.classList.remove(this.CssClasses_.IS_FOCUSED)},E.prototype.updateClasses_=function(){this.checkDisabled(),this.checkValidity(),this.checkDirty()},E.prototype.checkDisabled=function(){this.input_.disabled?this.element_.classList.add(this.CssClasses_.IS_DISABLED):this.element_.classList.remove(this.CssClasses_.IS_DISABLED)},E.prototype.checkDisabled=E.prototype.checkDisabled,E.prototype.checkValidity=function(){this.input_.validity.valid?this.element_.classList.remove(this.CssClasses_.IS_INVALID):this.element_.classList.add(this.CssClasses_.IS_INVALID)},E.prototype.checkValidity=E.prototype.checkValidity,E.prototype.checkDirty=function(){this.input_.value&&this.input_.value.length>0?this.element_.classList.add(this.CssClasses_.IS_DIRTY):this.element_.classList.remove(this.CssClasses_.IS_DIRTY)},E.prototype.checkDirty=E.prototype.checkDirty,E.prototype.disable=function(){this.input_.disabled=!0,this.updateClasses_()},E.prototype.disable=E.prototype.disable,E.prototype.enable=function(){this.input_.disabled=!1,this.updateClasses_()},E.prototype.enable=E.prototype.enable,E.prototype.change=function(e){e?this.input_.value=e:this.input_.value="",this.updateClasses_()},E.prototype.change=E.prototype.change,E.prototype.init=function(){this.element_&&(this.label_=this.element_.querySelector("."+this.CssClasses_.LABEL),this.input_=this.element_.querySelector("."+this.CssClasses_.INPUT),this.input_&&(this.input_.hasAttribute(this.Constant_.MAX_ROWS_ATTRIBUTE)&&(this.maxRows=parseInt(this.input_.getAttribute(this.Constant_.MAX_ROWS_ATTRIBUTE),10),isNaN(this.maxRows)&&(this.maxRows=this.Constant_.NO_MAX_ROWS)),this.boundUpdateClassesHandler=this.updateClasses_.bind(this),this.boundFocusHandler=this.onFocus_.bind(this),this.boundBlurHandler=this.onBlur_.bind(this),this.input_.addEventListener("input",this.boundUpdateClassesHandler),this.input_.addEventListener("focus",this.boundFocusHandler),this.input_.addEventListener("blur",this.boundBlurHandler),this.maxRows!==this.Constant_.NO_MAX_ROWS&&(this.boundKeyDownHandler=this.onKeyDown_.bind(this),this.input_.addEventListener("keydown",this.boundKeyDownHandler)),this.updateClasses_(),this.element_.classList.add(this.CssClasses_.IS_UPGRADED)))},E.prototype.mdlDowngrade_=function(){this.input_.removeEventListener("input",this.boundUpdateClassesHandler),this.input_.removeEventListener("focus",this.boundFocusHandler),this.input_.removeEventListener("blur",this.boundBlurHandler),this.boundKeyDownHandler&&this.input_.removeEventListener("keydown",this.boundKeyDownHandler)},s.register({constructor:E,classAsString:"MaterialTextfield",cssClass:"mdl-js-textfield",widget:!0});var L=function(e){this.element_=e,this.init()};window.MaterialTooltip=L,L.prototype.Constant_={},L.prototype.CssClasses_={IS_ACTIVE:"is-active"},L.prototype.handleMouseEnter_=function(e){e.stopPropagation();var t=e.target.getBoundingClientRect(),s=t.left+t.width/2,i=-1*(this.element_.offsetWidth/2);0>s+i?(this.element_.style.left=0,this.element_.style.marginLeft=0):(this.element_.style.left=s+"px",this.element_.style.marginLeft=i+"px"),this.element_.style.top=t.top+t.height+10+"px",this.element_.classList.add(this.CssClasses_.IS_ACTIVE),window.addEventListener("scroll",this.boundMouseLeaveHandler,!1),window.addEventListener("touchmove",this.boundMouseLeaveHandler,!1)},L.prototype.handleMouseLeave_=function(e){e.stopPropagation(),this.element_.classList.remove(this.CssClasses_.IS_ACTIVE),window.removeEventListener("scroll",this.boundMouseLeaveHandler),window.removeEventListener("touchmove",this.boundMouseLeaveHandler,!1)},L.prototype.init=function(){if(this.element_){var e=this.element_.getAttribute("for");e&&(this.forElement_=document.getElementById(e)),this.forElement_&&(this.forElement_.getAttribute("tabindex")||this.forElement_.setAttribute("tabindex","0"),this.boundMouseEnterHandler=this.handleMouseEnter_.bind(this),this.boundMouseLeaveHandler=this.handleMouseLeave_.bind(this),this.forElement_.addEventListener("mouseenter",this.boundMouseEnterHandler,!1),this.forElement_.addEventListener("click",this.boundMouseEnterHandler,!1),this.forElement_.addEventListener("blur",this.boundMouseLeaveHandler),this.forElement_.addEventListener("touchstart",this.boundMouseEnterHandler,!1),this.forElement_.addEventListener("mouseleave",this.boundMouseLeaveHandler))}},L.prototype.mdlDowngrade_=function(){this.forElement_&&(this.forElement_.removeEventListener("mouseenter",this.boundMouseEnterHandler,!1),this.forElement_.removeEventListener("click",this.boundMouseEnterHandler,!1),this.forElement_.removeEventListener("touchstart",this.boundMouseEnterHandler,!1),this.forElement_.removeEventListener("mouseleave",this.boundMouseLeaveHandler))},s.register({constructor:L,classAsString:"MaterialTooltip",cssClass:"mdl-tooltip"});var I=function(e){this.element_=e,this.init()};window.MaterialLayout=I,I.prototype.Constant_={MAX_WIDTH:"(max-width: 1024px)",TAB_SCROLL_PIXELS:100,MENU_ICON:"menu",CHEVRON_LEFT:"chevron_left",CHEVRON_RIGHT:"chevron_right"},I.prototype.Mode_={STANDARD:0,SEAMED:1,WATERFALL:2,SCROLL:3},I.prototype.CssClasses_={CONTAINER:"mdl-layout__container",HEADER:"mdl-layout__header",DRAWER:"mdl-layout__drawer",CONTENT:"mdl-layout__content",DRAWER_BTN:"mdl-layout__drawer-button",ICON:"material-icons",JS_RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_CONTAINER:"mdl-layout__tab-ripple-container",RIPPLE:"mdl-ripple",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",HEADER_SEAMED:"mdl-layout__header--seamed",HEADER_WATERFALL:"mdl-layout__header--waterfall",HEADER_SCROLL:"mdl-layout__header--scroll",FIXED_HEADER:"mdl-layout--fixed-header",OBFUSCATOR:"mdl-layout__obfuscator",TAB_BAR:"mdl-layout__tab-bar",TAB_CONTAINER:"mdl-layout__tab-bar-container",TAB:"mdl-layout__tab",TAB_BAR_BUTTON:"mdl-layout__tab-bar-button",TAB_BAR_LEFT_BUTTON:"mdl-layout__tab-bar-left-button",TAB_BAR_RIGHT_BUTTON:"mdl-layout__tab-bar-right-button",PANEL:"mdl-layout__tab-panel",HAS_DRAWER:"has-drawer",HAS_TABS:"has-tabs",HAS_SCROLLING_HEADER:"has-scrolling-header",CASTING_SHADOW:"is-casting-shadow",IS_COMPACT:"is-compact",IS_SMALL_SCREEN:"is-small-screen",IS_DRAWER_OPEN:"is-visible",IS_ACTIVE:"is-active",IS_UPGRADED:"is-upgraded",IS_ANIMATING:"is-animating",ON_LARGE_SCREEN:"mdl-layout--large-screen-only",ON_SMALL_SCREEN:"mdl-layout--small-screen-only"},I.prototype.contentScrollHandler_=function(){this.header_.classList.contains(this.CssClasses_.IS_ANIMATING)||(this.content_.scrollTop>0&&!this.header_.classList.contains(this.CssClasses_.IS_COMPACT)?(this.header_.classList.add(this.CssClasses_.CASTING_SHADOW),this.header_.classList.add(this.CssClasses_.IS_COMPACT),this.header_.classList.add(this.CssClasses_.IS_ANIMATING)):this.content_.scrollTop<=0&&this.header_.classList.contains(this.CssClasses_.IS_COMPACT)&&(this.header_.classList.remove(this.CssClasses_.CASTING_SHADOW),this.header_.classList.remove(this.CssClasses_.IS_COMPACT),this.header_.classList.add(this.CssClasses_.IS_ANIMATING)))},I.prototype.screenSizeHandler_=function(){this.screenSizeMediaQuery_.matches?this.element_.classList.add(this.CssClasses_.IS_SMALL_SCREEN):(this.element_.classList.remove(this.CssClasses_.IS_SMALL_SCREEN),this.drawer_&&this.drawer_.classList.remove(this.CssClasses_.IS_DRAWER_OPEN))},I.prototype.drawerToggleHandler_=function(){this.drawer_.classList.toggle(this.CssClasses_.IS_DRAWER_OPEN)},I.prototype.headerTransitionEndHandler_=function(){this.header_.classList.remove(this.CssClasses_.IS_ANIMATING)},I.prototype.headerClickHandler_=function(){this.header_.classList.contains(this.CssClasses_.IS_COMPACT)&&(this.header_.classList.remove(this.CssClasses_.IS_COMPACT),this.header_.classList.add(this.CssClasses_.IS_ANIMATING))},I.prototype.resetTabState_=function(e){for(var t=0;t<e.length;t++)e[t].classList.remove(this.CssClasses_.IS_ACTIVE)},I.prototype.resetPanelState_=function(e){for(var t=0;t<e.length;t++)e[t].classList.remove(this.CssClasses_.IS_ACTIVE)},I.prototype.init=function(){if(this.element_){var e=document.createElement("div");e.classList.add(this.CssClasses_.CONTAINER),this.element_.parentElement.insertBefore(e,this.element_),this.element_.parentElement.removeChild(this.element_),e.appendChild(this.element_);for(var s=this.element_.childNodes,i=0;i<s.length;i++){var n=s[i];n.classList&&n.classList.contains(this.CssClasses_.HEADER)&&(this.header_=n),n.classList&&n.classList.contains(this.CssClasses_.DRAWER)&&(this.drawer_=n),n.classList&&n.classList.contains(this.CssClasses_.CONTENT)&&(this.content_=n)}this.header_&&(this.tabBar_=this.header_.querySelector("."+this.CssClasses_.TAB_BAR));var a=this.Mode_.STANDARD;this.screenSizeMediaQuery_=window.matchMedia(this.Constant_.MAX_WIDTH),this.screenSizeMediaQuery_.addListener(this.screenSizeHandler_.bind(this)),this.screenSizeHandler_(),this.header_&&(this.header_.classList.contains(this.CssClasses_.HEADER_SEAMED)?a=this.Mode_.SEAMED:this.header_.classList.contains(this.CssClasses_.HEADER_WATERFALL)?(a=this.Mode_.WATERFALL,this.header_.addEventListener("transitionend",this.headerTransitionEndHandler_.bind(this)),this.header_.addEventListener("click",this.headerClickHandler_.bind(this))):this.header_.classList.contains(this.CssClasses_.HEADER_SCROLL)&&(a=this.Mode_.SCROLL,e.classList.add(this.CssClasses_.HAS_SCROLLING_HEADER)),a===this.Mode_.STANDARD?(this.header_.classList.add(this.CssClasses_.CASTING_SHADOW),this.tabBar_&&this.tabBar_.classList.add(this.CssClasses_.CASTING_SHADOW)):a===this.Mode_.SEAMED||a===this.Mode_.SCROLL?(this.header_.classList.remove(this.CssClasses_.CASTING_SHADOW),this.tabBar_&&this.tabBar_.classList.remove(this.CssClasses_.CASTING_SHADOW)):a===this.Mode_.WATERFALL&&(this.content_.addEventListener("scroll",this.contentScrollHandler_.bind(this)),this.contentScrollHandler_()));var l=function(e){e.preventDefault()};if(this.drawer_){var o=this.element_.querySelector("."+this.CssClasses_.DRAWER_BTN);if("undefined"==typeof o||null===o){o=document.createElement("div"),o.classList.add(this.CssClasses_.DRAWER_BTN);var r=document.createElement("i");r.classList.add(this.CssClasses_.ICON),r.textContent=this.Constant_.MENU_ICON,o.appendChild(r)}this.drawer_.classList.contains(this.CssClasses_.ON_LARGE_SCREEN)?o.classList.add(this.CssClasses_.ON_LARGE_SCREEN):this.drawer_.classList.contains(this.CssClasses_.ON_SMALL_SCREEN)&&o.classList.add(this.CssClasses_.ON_SMALL_SCREEN),o.addEventListener("click",this.drawerToggleHandler_.bind(this)),this.element_.classList.add(this.CssClasses_.HAS_DRAWER),this.drawer_.addEventListener("mousewheel",l),this.element_.classList.contains(this.CssClasses_.FIXED_HEADER)?this.header_.insertBefore(o,this.header_.firstChild):this.element_.insertBefore(o,this.content_);var d=document.createElement("div");d.classList.add(this.CssClasses_.OBFUSCATOR),this.element_.appendChild(d),d.addEventListener("click",this.drawerToggleHandler_.bind(this)),d.addEventListener("mousewheel",l)}if(this.header_&&this.tabBar_){this.element_.classList.add(this.CssClasses_.HAS_TABS);var _=document.createElement("div");_.classList.add(this.CssClasses_.TAB_CONTAINER),this.header_.insertBefore(_,this.tabBar_),this.header_.removeChild(this.tabBar_);var h=document.createElement("div");h.classList.add(this.CssClasses_.TAB_BAR_BUTTON),h.classList.add(this.CssClasses_.TAB_BAR_LEFT_BUTTON);var c=document.createElement("i");c.classList.add(this.CssClasses_.ICON),c.textContent=this.Constant_.CHEVRON_LEFT,h.appendChild(c),h.addEventListener("click",function(){this.tabBar_.scrollLeft-=this.Constant_.TAB_SCROLL_PIXELS}.bind(this));var p=document.createElement("div");p.classList.add(this.CssClasses_.TAB_BAR_BUTTON),p.classList.add(this.CssClasses_.TAB_BAR_RIGHT_BUTTON);var u=document.createElement("i");u.classList.add(this.CssClasses_.ICON),u.textContent=this.Constant_.CHEVRON_RIGHT,p.appendChild(u),p.addEventListener("click",function(){this.tabBar_.scrollLeft+=this.Constant_.TAB_SCROLL_PIXELS}.bind(this)),_.appendChild(h),_.appendChild(this.tabBar_),_.appendChild(p);var C=function(){this.tabBar_.scrollLeft>0?h.classList.add(this.CssClasses_.IS_ACTIVE):h.classList.remove(this.CssClasses_.IS_ACTIVE),this.tabBar_.scrollLeft<this.tabBar_.scrollWidth-this.tabBar_.offsetWidth?p.classList.add(this.CssClasses_.IS_ACTIVE):p.classList.remove(this.CssClasses_.IS_ACTIVE)}.bind(this);this.tabBar_.addEventListener("scroll",C),C(),this.tabBar_.classList.contains(this.CssClasses_.JS_RIPPLE_EFFECT)&&this.tabBar_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS);for(var m=this.tabBar_.querySelectorAll("."+this.CssClasses_.TAB),E=this.content_.querySelectorAll("."+this.CssClasses_.PANEL),L=0;L<m.length;L++)new t(m[L],m,E,this)}this.element_.classList.add(this.CssClasses_.IS_UPGRADED)}},s.register({constructor:I,classAsString:"MaterialLayout",cssClass:"mdl-js-layout"});var f=function(e){this.element_=e,this.init()};window.MaterialDataTable=f,f.prototype.Constant_={},f.prototype.CssClasses_={DATA_TABLE:"mdl-data-table",SELECTABLE:"mdl-data-table--selectable",IS_SELECTED:"is-selected",IS_UPGRADED:"is-upgraded"},f.prototype.selectRow_=function(e,t,s){return t?function(){e.checked?t.classList.add(this.CssClasses_.IS_SELECTED):t.classList.remove(this.CssClasses_.IS_SELECTED)}.bind(this):s?function(){var t,i;if(e.checked)for(t=0;t<s.length;t++)i=s[t].querySelector("td").querySelector(".mdl-checkbox"),i.MaterialCheckbox.check(),s[t].classList.add(this.CssClasses_.IS_SELECTED);else for(t=0;t<s.length;t++)i=s[t].querySelector("td").querySelector(".mdl-checkbox"),i.MaterialCheckbox.uncheck(),s[t].classList.remove(this.CssClasses_.IS_SELECTED)}.bind(this):void 0},f.prototype.createCheckbox_=function(e,t){var i=document.createElement("label");i.classList.add("mdl-checkbox"),i.classList.add("mdl-js-checkbox"),i.classList.add("mdl-js-ripple-effect"),i.classList.add("mdl-data-table__select");var n=document.createElement("input");return n.type="checkbox",n.classList.add("mdl-checkbox__input"),e?n.addEventListener("change",this.selectRow_(n,e)):t&&n.addEventListener("change",this.selectRow_(n,null,t)),i.appendChild(n),s.upgradeElement(i,"MaterialCheckbox"),i},f.prototype.init=function(){if(this.element_){var e=this.element_.querySelector("th"),t=this.element_.querySelector("tbody").querySelectorAll("tr");if(this.element_.classList.contains(this.CssClasses_.SELECTABLE)){var s=document.createElement("th"),i=this.createCheckbox_(null,t);s.appendChild(i),e.parentElement.insertBefore(s,e);for(var n=0;n<t.length;n++){var a=t[n].querySelector("td");if(a){var l=document.createElement("td"),o=this.createCheckbox_(t[n]);l.appendChild(o),t[n].insertBefore(l,a)}}}this.element_.classList.add(this.CssClasses_.IS_UPGRADED)}},s.register({constructor:f,classAsString:"MaterialDataTable",cssClass:"mdl-js-data-table"});var b=function(e){this.element_=e,this.init()};window.MaterialRipple=b,b.prototype.Constant_={INITIAL_SCALE:"scale(0.0001, 0.0001)",INITIAL_SIZE:"1px",INITIAL_OPACITY:"0.4",FINAL_OPACITY:"0",FINAL_SCALE:""},b.prototype.CssClasses_={RIPPLE_CENTER:"mdl-ripple--center",RIPPLE_EFFECT_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE:"mdl-ripple",IS_ANIMATING:"is-animating",IS_VISIBLE:"is-visible"},b.prototype.downHandler_=function(e){if(!this.rippleElement_.style.width&&!this.rippleElement_.style.height){var t=this.element_.getBoundingClientRect();this.boundHeight=t.height,this.boundWidth=t.width,this.rippleSize_=2*Math.sqrt(t.width*t.width+t.height*t.height)+2,this.rippleElement_.style.width=this.rippleSize_+"px",this.rippleElement_.style.height=this.rippleSize_+"px"}if(this.rippleElement_.classList.add(this.CssClasses_.IS_VISIBLE),"mousedown"===e.type&&this.ignoringMouseDown_)this.ignoringMouseDown_=!1;else{"touchstart"===e.type&&(this.ignoringMouseDown_=!0);var s=this.getFrameCount();if(s>0)return;this.setFrameCount(1);var i,n,a=e.currentTarget.getBoundingClientRect();if(0===e.clientX&&0===e.clientY)i=Math.round(a.width/2),n=Math.round(a.height/2);else{var l=e.clientX?e.clientX:e.touches[0].clientX,o=e.clientY?e.clientY:e.touches[0].clientY;i=Math.round(l-a.left),n=Math.round(o-a.top)}this.setRippleXY(i,n),this.setRippleStyles(!0),window.requestAnimationFrame(this.animFrameHandler.bind(this))}},b.prototype.upHandler_=function(e){e&&2!==e.detail&&this.rippleElement_.classList.remove(this.CssClasses_.IS_VISIBLE),window.setTimeout(function(){this.rippleElement_.classList.remove(this.CssClasses_.IS_VISIBLE)}.bind(this),0)},b.prototype.init=function(){if(this.element_){var e=this.element_.classList.contains(this.CssClasses_.RIPPLE_CENTER);this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT_IGNORE_EVENTS)||(this.rippleElement_=this.element_.querySelector("."+this.CssClasses_.RIPPLE),this.frameCount_=0,this.rippleSize_=0,this.x_=0,this.y_=0,this.ignoringMouseDown_=!1,this.boundDownHandler=this.downHandler_.bind(this),this.element_.addEventListener("mousedown",this.boundDownHandler),this.element_.addEventListener("touchstart",this.boundDownHandler),this.boundUpHandler=this.upHandler_.bind(this),this.element_.addEventListener("mouseup",this.boundUpHandler),this.element_.addEventListener("mouseleave",this.boundUpHandler),this.element_.addEventListener("touchend",this.boundUpHandler),this.element_.addEventListener("blur",this.boundUpHandler),this.getFrameCount=function(){return this.frameCount_},this.setFrameCount=function(e){this.frameCount_=e},this.getRippleElement=function(){return this.rippleElement_},this.setRippleXY=function(e,t){this.x_=e,this.y_=t},this.setRippleStyles=function(t){if(null!==this.rippleElement_){var s,i,n,a="translate("+this.x_+"px, "+this.y_+"px)";t?(i=this.Constant_.INITIAL_SCALE,n=this.Constant_.INITIAL_SIZE):(i=this.Constant_.FINAL_SCALE,n=this.rippleSize_+"px",e&&(a="translate("+this.boundWidth/2+"px, "+this.boundHeight/2+"px)")),s="translate(-50%, -50%) "+a+i,this.rippleElement_.style.webkitTransform=s,this.rippleElement_.style.msTransform=s,this.rippleElement_.style.transform=s,t?this.rippleElement_.classList.remove(this.CssClasses_.IS_ANIMATING):this.rippleElement_.classList.add(this.CssClasses_.IS_ANIMATING)}},this.animFrameHandler=function(){this.frameCount_-->0?window.requestAnimationFrame(this.animFrameHandler.bind(this)):this.setRippleStyles(!1)})}},b.prototype.mdlDowngrade_=function(){this.element_.removeEventListener("mousedown",this.boundDownHandler),this.element_.removeEventListener("touchstart",this.boundDownHandler),this.element_.removeEventListener("mouseup",this.boundUpHandler),this.element_.removeEventListener("mouseleave",this.boundUpHandler),this.element_.removeEventListener("touchend",this.boundUpHandler),this.element_.removeEventListener("blur",this.boundUpHandler)},s.register({constructor:b,classAsString:"MaterialRipple",cssClass:"mdl-js-ripple-effect",widget:!1})}();
+!function(){"use strict";function e(e,t){if(e){if(t.element_.classList.contains(t.CssClasses_.MDL_JS_RIPPLE_EFFECT)){var s=document.createElement("span");s.classList.add(t.CssClasses_.MDL_RIPPLE_CONTAINER),s.classList.add(t.CssClasses_.MDL_JS_RIPPLE_EFFECT);var i=document.createElement("span");i.classList.add(t.CssClasses_.MDL_RIPPLE),s.appendChild(i),e.appendChild(s)}e.addEventListener("click",function(s){s.preventDefault();var i=e.href.split("#")[1],n=t.element_.querySelector("#"+i);t.resetTabState_(),t.resetPanelState_(),e.classList.add(t.CssClasses_.ACTIVE_CLASS),n.classList.add(t.CssClasses_.ACTIVE_CLASS)})}}function t(e,t,s,i){if(i.tabBar_.classList.contains(i.CssClasses_.JS_RIPPLE_EFFECT)){var n=document.createElement("span");n.classList.add(i.CssClasses_.RIPPLE_CONTAINER),n.classList.add(i.CssClasses_.JS_RIPPLE_EFFECT);var a=document.createElement("span");a.classList.add(i.CssClasses_.RIPPLE),n.appendChild(a),e.appendChild(n)}e.addEventListener("click",function(n){n.preventDefault();var a=e.href.split("#")[1],l=i.content_.querySelector("#"+a);i.resetTabState_(t),i.resetPanelState_(s),e.classList.add(i.CssClasses_.IS_ACTIVE),l.classList.add(i.CssClasses_.IS_ACTIVE)})}var s={upgradeDom:function(e,t){},upgradeElement:function(e,t){},upgradeElements:function(e){},upgradeAllRegistered:function(){},registerUpgradedCallback:function(e,t){},register:function(e){},downgradeElements:function(e){}};s=function(){function e(e,t){for(var s=0;s<p.length;s++)if(p[s].className===e)return"undefined"!=typeof t&&(p[s]=t),p[s];return!1}function t(e){var t=e.getAttribute("data-upgraded");return null===t?[""]:t.split(",")}function s(e,s){var i=t(e);return-1!==i.indexOf(s)}function i(t,s){if("undefined"==typeof t&&"undefined"==typeof s)for(var a=0;a<p.length;a++)i(p[a].className,p[a].cssClass);else{var l=t;if("undefined"==typeof s){var o=e(l);o&&(s=o.cssClass)}for(var r=document.querySelectorAll("."+s),d=0;d<r.length;d++)n(r[d],l)}}function n(i,n){if(!("object"==typeof i&&i instanceof Element))throw new Error("Invalid argument provided to upgrade MDL element.");var a=t(i),l=[];if(n)s(i,n)||l.push(e(n));else{var o=i.classList;p.forEach(function(e){o.contains(e.cssClass)&&-1===l.indexOf(e)&&!s(i,e.className)&&l.push(e)})}for(var r,d=0,_=l.length;_>d;d++){if(r=l[d],!r)throw new Error("Unable to find a registered component for the given class.");a.push(r.className),i.setAttribute("data-upgraded",a.join(","));var h=new r.classConstructor(i);h[C]=r,c.push(h);for(var u=0,m=r.callbacks.length;m>u;u++)r.callbacks[u](i);r.widget&&(i[r.className]=h);var E=document.createEvent("Events");E.initEvent("mdl-componentupgraded",!0,!0),i.dispatchEvent(E)}}function a(e){Array.isArray(e)||(e="function"==typeof e.item?Array.prototype.slice.call(e):[e]);for(var t,s=0,i=e.length;i>s;s++)t=e[s],t instanceof HTMLElement&&(n(t),t.children.length>0&&a(t.children))}function l(t){var s="undefined"==typeof t.widget&&"undefined"==typeof t.widget,i=!0;s||(i=t.widget||t.widget);var n={classConstructor:t.constructor||t.constructor,className:t.classAsString||t.classAsString,cssClass:t.cssClass||t.cssClass,widget:i,callbacks:[]};if(p.forEach(function(e){if(e.cssClass===n.cssClass)throw new Error("The provided cssClass has already been registered: "+e.cssClass);if(e.className===n.className)throw new Error("The provided className has already been registered")}),t.constructor.prototype.hasOwnProperty(C))throw new Error("MDL component classes must not have "+C+" defined as a property.");var a=e(t.classAsString,n);a||p.push(n)}function o(t,s){var i=e(t);i&&i.callbacks.push(s)}function r(){for(var e=0;e<p.length;e++)i(p[e].className)}function d(e){for(var t=0;t<c.length;t++){var s=c[t];if(s.element_===e)return s}}function _(e){if(e&&e[C].classConstructor.prototype.hasOwnProperty(u)){e[u]();var t=c.indexOf(e);c.splice(t,1);var s=e.element_.getAttribute("data-upgraded").split(","),i=s.indexOf(e[C].classAsString);s.splice(i,1),e.element_.setAttribute("data-upgraded",s.join(","));var n=document.createEvent("Events");n.initEvent("mdl-componentdowngraded",!0,!0),e.element_.dispatchEvent(n)}}function h(e){var t=function(e){_(d(e))};if(e instanceof Array||e instanceof NodeList)for(var s=0;s<e.length;s++)t(e[s]);else{if(!(e instanceof Node))throw new Error("Invalid argument provided to downgrade MDL nodes.");t(e)}}var p=[],c=[],u="mdlDowngrade",C="mdlComponentConfigInternal_";return{upgradeDom:i,upgradeElement:n,upgradeElements:a,upgradeAllRegistered:r,registerUpgradedCallback:o,register:l,downgradeElements:h}}(),s.ComponentConfigPublic,s.ComponentConfig,s.Component,s.upgradeDom=s.upgradeDom,s.upgradeElement=s.upgradeElement,s.upgradeElements=s.upgradeElements,s.upgradeAllRegistered=s.upgradeAllRegistered,s.registerUpgradedCallback=s.registerUpgradedCallback,s.register=s.register,s.downgradeElements=s.downgradeElements,window.componentHandler=s,window.componentHandler=s,window.addEventListener("load",function(){"classList"in document.createElement("div")&&"querySelector"in document&&"addEventListener"in window&&Array.prototype.forEach?(document.documentElement.classList.add("mdl-js"),s.upgradeAllRegistered()):(s.upgradeElement=function(){},s.register=function(){})}),Date.now||(Date.now=function(){return(new Date).getTime()},Date.now=Date.now);for(var i=["webkit","moz"],n=0;n<i.length&&!window.requestAnimationFrame;++n){var a=i[n];window.requestAnimationFrame=window[a+"RequestAnimationFrame"],window.cancelAnimationFrame=window[a+"CancelAnimationFrame"]||window[a+"CancelRequestAnimationFrame"],window.requestAnimationFrame=window.requestAnimationFrame,window.cancelAnimationFrame=window.cancelAnimationFrame}if(/iP(ad|hone|od).*OS 6/.test(window.navigator.userAgent)||!window.requestAnimationFrame||!window.cancelAnimationFrame){var l=0;window.requestAnimationFrame=function(e){var t=Date.now(),s=Math.max(l+16,t);return setTimeout(function(){e(l=s)},s-t)},window.cancelAnimationFrame=clearTimeout,window.requestAnimationFrame=window.requestAnimationFrame,window.cancelAnimationFrame=window.cancelAnimationFrame}var o=function(e){this.element_=e,this.init()};window.MaterialButton=o,o.prototype.Constant_={},o.prototype.CssClasses_={RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_CONTAINER:"mdl-button__ripple-container",RIPPLE:"mdl-ripple"},o.prototype.blurHandler_=function(e){e&&this.element_.blur()},o.prototype.disable=function(){this.element_.disabled=!0},o.prototype.disable=o.prototype.disable,o.prototype.enable=function(){this.element_.disabled=!1},o.prototype.enable=o.prototype.enable,o.prototype.init=function(){if(this.element_){if(this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT)){var e=document.createElement("span");e.classList.add(this.CssClasses_.RIPPLE_CONTAINER),this.rippleElement_=document.createElement("span"),this.rippleElement_.classList.add(this.CssClasses_.RIPPLE),e.appendChild(this.rippleElement_),this.boundRippleBlurHandler=this.blurHandler_.bind(this),this.rippleElement_.addEventListener("mouseup",this.boundRippleBlurHandler),this.element_.appendChild(e)}this.boundButtonBlurHandler=this.blurHandler_.bind(this),this.element_.addEventListener("mouseup",this.boundButtonBlurHandler),this.element_.addEventListener("mouseleave",this.boundButtonBlurHandler)}},o.prototype.mdlDowngrade_=function(){this.rippleElement_&&this.rippleElement_.removeEventListener("mouseup",this.boundRippleBlurHandler),this.element_.removeEventListener("mouseup",this.boundButtonBlurHandler),this.element_.removeEventListener("mouseleave",this.boundButtonBlurHandler)},o.prototype.mdlDowngrade=o.prototype.mdlDowngrade_,o.prototype.mdlDowngrade=o.prototype.mdlDowngrade,s.register({constructor:o,classAsString:"MaterialButton",cssClass:"mdl-js-button",widget:!0});var r=function(e){this.element_=e,this.init()};window.MaterialCheckbox=r,r.prototype.Constant_={TINY_TIMEOUT:.001},r.prototype.CssClasses_={INPUT:"mdl-checkbox__input",BOX_OUTLINE:"mdl-checkbox__box-outline",FOCUS_HELPER:"mdl-checkbox__focus-helper",TICK_OUTLINE:"mdl-checkbox__tick-outline",RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE_CONTAINER:"mdl-checkbox__ripple-container",RIPPLE_CENTER:"mdl-ripple--center",RIPPLE:"mdl-ripple",IS_FOCUSED:"is-focused",IS_DISABLED:"is-disabled",IS_CHECKED:"is-checked",IS_UPGRADED:"is-upgraded"},r.prototype.onChange_=function(e){this.updateClasses_()},r.prototype.onFocus_=function(e){this.element_.classList.add(this.CssClasses_.IS_FOCUSED)},r.prototype.onBlur_=function(e){this.element_.classList.remove(this.CssClasses_.IS_FOCUSED)},r.prototype.onMouseUp_=function(e){this.blur_()},r.prototype.updateClasses_=function(){this.checkDisabled(),this.checkToggleState()},r.prototype.blur_=function(){window.setTimeout(function(){this.inputElement_.blur()}.bind(this),this.Constant_.TINY_TIMEOUT)},r.prototype.checkToggleState=function(){this.inputElement_.checked?this.element_.classList.add(this.CssClasses_.IS_CHECKED):this.element_.classList.remove(this.CssClasses_.IS_CHECKED)},r.prototype.checkToggleState=r.prototype.checkToggleState,r.prototype.checkDisabled=function(){this.inputElement_.disabled?this.element_.classList.add(this.CssClasses_.IS_DISABLED):this.element_.classList.remove(this.CssClasses_.IS_DISABLED)},r.prototype.checkDisabled=r.prototype.checkDisabled,r.prototype.disable=function(){this.inputElement_.disabled=!0,this.updateClasses_()},r.prototype.disable=r.prototype.disable,r.prototype.enable=function(){this.inputElement_.disabled=!1,this.updateClasses_()},r.prototype.enable=r.prototype.enable,r.prototype.check=function(){this.inputElement_.checked=!0,this.updateClasses_()},r.prototype.check=r.prototype.check,r.prototype.uncheck=function(){this.inputElement_.checked=!1,this.updateClasses_()},r.prototype.uncheck=r.prototype.uncheck,r.prototype.init=function(){if(this.element_){this.inputElement_=this.element_.querySelector("."+this.CssClasses_.INPUT);var e=document.createElement("span");e.classList.add(this.CssClasses_.BOX_OUTLINE);var t=document.createElement("span");t.classList.add(this.CssClasses_.FOCUS_HELPER);var s=document.createElement("span");if(s.classList.add(this.CssClasses_.TICK_OUTLINE),e.appendChild(s),this.element_.appendChild(t),this.element_.appendChild(e),this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT)){this.element_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS),this.rippleContainerElement_=document.createElement("span"),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CONTAINER),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_EFFECT),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CENTER),this.boundRippleMouseUp=this.onMouseUp_.bind(this),this.rippleContainerElement_.addEventListener("mouseup",this.boundRippleMouseUp);var i=document.createElement("span");i.classList.add(this.CssClasses_.RIPPLE),this.rippleContainerElement_.appendChild(i),this.element_.appendChild(this.rippleContainerElement_)}this.boundInputOnChange=this.onChange_.bind(this),this.boundInputOnFocus=this.onFocus_.bind(this),this.boundInputOnBlur=this.onBlur_.bind(this),this.boundElementMouseUp=this.onMouseUp_.bind(this),this.inputElement_.addEventListener("change",this.boundInputOnChange),this.inputElement_.addEventListener("focus",this.boundInputOnFocus),this.inputElement_.addEventListener("blur",this.boundInputOnBlur),this.element_.addEventListener("mouseup",this.boundElementMouseUp),this.updateClasses_(),this.element_.classList.add(this.CssClasses_.IS_UPGRADED)}},r.prototype.mdlDowngrade_=function(){this.rippleContainerElement_&&this.rippleContainerElement_.removeEventListener("mouseup",this.boundRippleMouseUp),this.inputElement_.removeEventListener("change",this.boundInputOnChange),this.inputElement_.removeEventListener("focus",this.boundInputOnFocus),this.inputElement_.removeEventListener("blur",this.boundInputOnBlur),this.element_.removeEventListener("mouseup",this.boundElementMouseUp)},r.prototype.mdlDowngrade=r.prototype.mdlDowngrade_,r.prototype.mdlDowngrade=r.prototype.mdlDowngrade,s.register({constructor:r,classAsString:"MaterialCheckbox",cssClass:"mdl-js-checkbox",widget:!0});var d=function(e){this.element_=e,this.init()};window.MaterialIconToggle=d,d.prototype.Constant_={TINY_TIMEOUT:.001},d.prototype.CssClasses_={INPUT:"mdl-icon-toggle__input",JS_RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE_CONTAINER:"mdl-icon-toggle__ripple-container",RIPPLE_CENTER:"mdl-ripple--center",RIPPLE:"mdl-ripple",IS_FOCUSED:"is-focused",IS_DISABLED:"is-disabled",IS_CHECKED:"is-checked"},d.prototype.onChange_=function(e){this.updateClasses_()},d.prototype.onFocus_=function(e){this.element_.classList.add(this.CssClasses_.IS_FOCUSED)},d.prototype.onBlur_=function(e){this.element_.classList.remove(this.CssClasses_.IS_FOCUSED)},d.prototype.onMouseUp_=function(e){this.blur_()},d.prototype.updateClasses_=function(){this.checkDisabled(),this.checkToggleState()},d.prototype.blur_=function(){window.setTimeout(function(){this.inputElement_.blur()}.bind(this),this.Constant_.TINY_TIMEOUT)},d.prototype.checkToggleState=function(){this.inputElement_.checked?this.element_.classList.add(this.CssClasses_.IS_CHECKED):this.element_.classList.remove(this.CssClasses_.IS_CHECKED)},d.prototype.checkToggleState=d.prototype.checkToggleState,d.prototype.checkDisabled=function(){this.inputElement_.disabled?this.element_.classList.add(this.CssClasses_.IS_DISABLED):this.element_.classList.remove(this.CssClasses_.IS_DISABLED)},d.prototype.checkDisabled=d.prototype.checkDisabled,d.prototype.disable=function(){this.inputElement_.disabled=!0,this.updateClasses_()},d.prototype.disable=d.prototype.disable,d.prototype.enable=function(){this.inputElement_.disabled=!1,this.updateClasses_()},d.prototype.enable=d.prototype.enable,d.prototype.check=function(){this.inputElement_.checked=!0,this.updateClasses_()},d.prototype.check=d.prototype.check,d.prototype.uncheck=function(){this.inputElement_.checked=!1,this.updateClasses_()},d.prototype.uncheck=d.prototype.uncheck,d.prototype.init=function(){if(this.element_){if(this.inputElement_=this.element_.querySelector("."+this.CssClasses_.INPUT),this.element_.classList.contains(this.CssClasses_.JS_RIPPLE_EFFECT)){this.element_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS),this.rippleContainerElement_=document.createElement("span"),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CONTAINER),this.rippleContainerElement_.classList.add(this.CssClasses_.JS_RIPPLE_EFFECT),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CENTER),this.boundRippleMouseUp=this.onMouseUp_.bind(this),this.rippleContainerElement_.addEventListener("mouseup",this.boundRippleMouseUp);var e=document.createElement("span");e.classList.add(this.CssClasses_.RIPPLE),this.rippleContainerElement_.appendChild(e),this.element_.appendChild(this.rippleContainerElement_)}this.boundInputOnChange=this.onChange_.bind(this),this.boundInputOnFocus=this.onFocus_.bind(this),this.boundInputOnBlur=this.onBlur_.bind(this),this.boundElementOnMouseUp=this.onMouseUp_.bind(this),this.inputElement_.addEventListener("change",this.boundInputOnChange),this.inputElement_.addEventListener("focus",this.boundInputOnFocus),this.inputElement_.addEventListener("blur",this.boundInputOnBlur),this.element_.addEventListener("mouseup",this.boundElementOnMouseUp),this.updateClasses_(),this.element_.classList.add("is-upgraded")}},d.prototype.mdlDowngrade_=function(){this.rippleContainerElement_&&this.rippleContainerElement_.removeEventListener("mouseup",this.boundRippleMouseUp),this.inputElement_.removeEventListener("change",this.boundInputOnChange),this.inputElement_.removeEventListener("focus",this.boundInputOnFocus),this.inputElement_.removeEventListener("blur",this.boundInputOnBlur),this.element_.removeEventListener("mouseup",this.boundElementOnMouseUp)},d.prototype.mdlDowngrade=d.prototype.mdlDowngrade_,d.prototype.mdlDowngrade=d.prototype.mdlDowngrade,s.register({constructor:d,classAsString:"MaterialIconToggle",cssClass:"mdl-js-icon-toggle",widget:!0});var _=function(e){this.element_=e,this.init()};window.MaterialMenu=_,_.prototype.Constant_={TRANSITION_DURATION_SECONDS:.3,TRANSITION_DURATION_FRACTION:.8,CLOSE_TIMEOUT:150},_.prototype.Keycodes_={ENTER:13,ESCAPE:27,SPACE:32,UP_ARROW:38,DOWN_ARROW:40},_.prototype.CssClasses_={CONTAINER:"mdl-menu__container",OUTLINE:"mdl-menu__outline",ITEM:"mdl-menu__item",ITEM_RIPPLE_CONTAINER:"mdl-menu__item-ripple-container",RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE:"mdl-ripple",IS_UPGRADED:"is-upgraded",IS_VISIBLE:"is-visible",IS_ANIMATING:"is-animating",BOTTOM_LEFT:"mdl-menu--bottom-left",BOTTOM_RIGHT:"mdl-menu--bottom-right",TOP_LEFT:"mdl-menu--top-left",TOP_RIGHT:"mdl-menu--top-right",UNALIGNED:"mdl-menu--unaligned"},_.prototype.init=function(){if(this.element_){var e=document.createElement("div");e.classList.add(this.CssClasses_.CONTAINER),this.element_.parentElement.insertBefore(e,this.element_),this.element_.parentElement.removeChild(this.element_),e.appendChild(this.element_),this.container_=e;var t=document.createElement("div");t.classList.add(this.CssClasses_.OUTLINE),this.outline_=t,e.insertBefore(t,this.element_);var s=this.element_.getAttribute("for"),i=null;s&&(i=document.getElementById(s),i&&(this.forElement_=i,i.addEventListener("click",this.handleForClick_.bind(this)),i.addEventListener("keydown",this.handleForKeyboardEvent_.bind(this))));var n=this.element_.querySelectorAll("."+this.CssClasses_.ITEM);this.boundItemKeydown_=this.handleItemKeyboardEvent_.bind(this),this.boundItemClick_=this.handleItemClick_.bind(this);for(var a=0;a<n.length;a++)n[a].addEventListener("click",this.boundItemClick_),n[a].tabIndex="-1",n[a].addEventListener("keydown",this.boundItemKeydown_);if(this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT))for(this.element_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS),a=0;a<n.length;a++){var l=n[a],o=document.createElement("span");o.classList.add(this.CssClasses_.ITEM_RIPPLE_CONTAINER);var r=document.createElement("span");r.classList.add(this.CssClasses_.RIPPLE),o.appendChild(r),l.appendChild(o),l.classList.add(this.CssClasses_.RIPPLE_EFFECT)}this.element_.classList.contains(this.CssClasses_.BOTTOM_LEFT)&&this.outline_.classList.add(this.CssClasses_.BOTTOM_LEFT),this.element_.classList.contains(this.CssClasses_.BOTTOM_RIGHT)&&this.outline_.classList.add(this.CssClasses_.BOTTOM_RIGHT),this.element_.classList.contains(this.CssClasses_.TOP_LEFT)&&this.outline_.classList.add(this.CssClasses_.TOP_LEFT),this.element_.classList.contains(this.CssClasses_.TOP_RIGHT)&&this.outline_.classList.add(this.CssClasses_.TOP_RIGHT),this.element_.classList.contains(this.CssClasses_.UNALIGNED)&&this.outline_.classList.add(this.CssClasses_.UNALIGNED),e.classList.add(this.CssClasses_.IS_UPGRADED)}},_.prototype.handleForClick_=function(e){if(this.element_&&this.forElement_){var t=this.forElement_.getBoundingClientRect(),s=this.forElement_.parentElement.getBoundingClientRect();this.element_.classList.contains(this.CssClasses_.UNALIGNED)||(this.element_.classList.contains(this.CssClasses_.BOTTOM_RIGHT)?(this.container_.style.right=s.right-t.right+"px",this.container_.style.top=this.forElement_.offsetTop+this.forElement_.offsetHeight+"px"):this.element_.classList.contains(this.CssClasses_.TOP_LEFT)?(this.container_.style.left=this.forElement_.offsetLeft+"px",this.container_.style.bottom=s.bottom-t.top+"px"):this.element_.classList.contains(this.CssClasses_.TOP_RIGHT)?(this.container_.style.right=s.right-t.right+"px",this.container_.style.bottom=s.bottom-t.top+"px"):(this.container_.style.left=this.forElement_.offsetLeft+"px",this.container_.style.top=this.forElement_.offsetTop+this.forElement_.offsetHeight+"px"))}this.toggle(e)},_.prototype.handleForKeyboardEvent_=function(e){if(this.element_&&this.container_&&this.forElement_){var t=this.element_.querySelectorAll("."+this.CssClasses_.ITEM+":not([disabled])");t&&t.length>0&&this.container_.classList.contains(this.CssClasses_.IS_VISIBLE)&&(e.keyCode===this.Keycodes_.UP_ARROW?(e.preventDefault(),t[t.length-1].focus()):e.keyCode===this.Keycodes_.DOWN_ARROW&&(e.preventDefault(),t[0].focus()))}},_.prototype.handleItemKeyboardEvent_=function(e){if(this.element_&&this.container_){var t=this.element_.querySelectorAll("."+this.CssClasses_.ITEM+":not([disabled])");if(t&&t.length>0&&this.container_.classList.contains(this.CssClasses_.IS_VISIBLE)){var s=Array.prototype.slice.call(t).indexOf(e.target);if(e.keyCode===this.Keycodes_.UP_ARROW)e.preventDefault(),s>0?t[s-1].focus():t[t.length-1].focus();else if(e.keyCode===this.Keycodes_.DOWN_ARROW)e.preventDefault(),t.length>s+1?t[s+1].focus():t[0].focus();else if(e.keyCode===this.Keycodes_.SPACE||e.keyCode===this.Keycodes_.ENTER){e.preventDefault();var i=new MouseEvent("mousedown");e.target.dispatchEvent(i),i=new MouseEvent("mouseup"),e.target.dispatchEvent(i),e.target.click()}else e.keyCode===this.Keycodes_.ESCAPE&&(e.preventDefault(),this.hide())}}},_.prototype.handleItemClick_=function(e){e.target.hasAttribute("disabled")?e.stopPropagation():(this.closing_=!0,window.setTimeout(function(e){this.hide(),this.closing_=!1}.bind(this),this.Constant_.CLOSE_TIMEOUT))},_.prototype.applyClip_=function(e,t){this.element_.classList.contains(this.CssClasses_.UNALIGNED)?this.element_.style.clip="":this.element_.classList.contains(this.CssClasses_.BOTTOM_RIGHT)?this.element_.style.clip="rect(0 "+t+"px 0 "+t+"px)":this.element_.classList.contains(this.CssClasses_.TOP_LEFT)?this.element_.style.clip="rect("+e+"px 0 "+e+"px 0)":this.element_.classList.contains(this.CssClasses_.TOP_RIGHT)?this.element_.style.clip="rect("+e+"px "+t+"px "+e+"px "+t+"px)":this.element_.style.clip=""},_.prototype.addAnimationEndListener_=function(){var e=function(){this.element_.removeEventListener("transitionend",e),this.element_.removeEventListener("webkitTransitionEnd",e),this.element_.classList.remove(this.CssClasses_.IS_ANIMATING)}.bind(this);this.element_.addEventListener("transitionend",e),this.element_.addEventListener("webkitTransitionEnd",e)},_.prototype.show=function(e){if(this.element_&&this.container_&&this.outline_){var t=this.element_.getBoundingClientRect().height,s=this.element_.getBoundingClientRect().width;this.container_.style.width=s+"px",this.container_.style.height=t+"px",this.outline_.style.width=s+"px",this.outline_.style.height=t+"px";for(var i=this.Constant_.TRANSITION_DURATION_SECONDS*this.Constant_.TRANSITION_DURATION_FRACTION,n=this.element_.querySelectorAll("."+this.CssClasses_.ITEM),a=0;a<n.length;a++){var l=null;l=this.element_.classList.contains(this.CssClasses_.TOP_LEFT)||this.element_.classList.contains(this.CssClasses_.TOP_RIGHT)?(t-n[a].offsetTop-n[a].offsetHeight)/t*i+"s":n[a].offsetTop/t*i+"s",n[a].style.transitionDelay=l}this.applyClip_(t,s),window.requestAnimationFrame(function(){this.element_.classList.add(this.CssClasses_.IS_ANIMATING),this.element_.style.clip="rect(0 "+s+"px "+t+"px 0)",this.container_.classList.add(this.CssClasses_.IS_VISIBLE)}.bind(this)),this.addAnimationEndListener_();var o=function(t){t===e||this.closing_||t.target.parentNode===this.element_||(document.removeEventListener("click",o),this.hide())}.bind(this);document.addEventListener("click",o)}},_.prototype.show=_.prototype.show,_.prototype.hide=function(){if(this.element_&&this.container_&&this.outline_){for(var e=this.element_.querySelectorAll("."+this.CssClasses_.ITEM),t=0;t<e.length;t++)e[t].style.transitionDelay=null;var s=this.element_.getBoundingClientRect(),i=s.height,n=s.width;this.element_.classList.add(this.CssClasses_.IS_ANIMATING),this.applyClip_(i,n),this.container_.classList.remove(this.CssClasses_.IS_VISIBLE),this.addAnimationEndListener_()}},_.prototype.hide=_.prototype.hide,_.prototype.toggle=function(e){this.container_.classList.contains(this.CssClasses_.IS_VISIBLE)?this.hide():this.show(e)},_.prototype.toggle=_.prototype.toggle,_.prototype.mdlDowngrade_=function(){for(var e=this.element_.querySelectorAll("."+this.CssClasses_.ITEM),t=0;t<e.length;t++)e[t].removeEventListener("click",this.boundItemClick_),e[t].removeEventListener("keydown",this.boundItemKeydown_)},_.prototype.mdlDowngrade=_.prototype.mdlDowngrade_,_.prototype.mdlDowngrade=_.prototype.mdlDowngrade,s.register({constructor:_,classAsString:"MaterialMenu",cssClass:"mdl-js-menu",widget:!0});var h=function(e){this.element_=e,this.init()};window.MaterialProgress=h,h.prototype.Constant_={},h.prototype.CssClasses_={INDETERMINATE_CLASS:"mdl-progress__indeterminate"},h.prototype.setProgress=function(e){this.element_.classList.contains(this.CssClasses_.INDETERMINATE_CLASS)||(this.progressbar_.style.width=e+"%")},h.prototype.setProgress=h.prototype.setProgress,h.prototype.setBuffer=function(e){this.bufferbar_.style.width=e+"%",this.auxbar_.style.width=100-e+"%"},h.prototype.setBuffer=h.prototype.setBuffer,h.prototype.init=function(){if(this.element_){var e=document.createElement("div");e.className="progressbar bar bar1",this.element_.appendChild(e),this.progressbar_=e,e=document.createElement("div"),e.className="bufferbar bar bar2",this.element_.appendChild(e),this.bufferbar_=e,e=document.createElement("div"),e.className="auxbar bar bar3",this.element_.appendChild(e),this.auxbar_=e,this.progressbar_.style.width="0%",this.bufferbar_.style.width="100%",this.auxbar_.style.width="0%",this.element_.classList.add("is-upgraded")}},h.prototype.mdlDowngrade_=function(){for(;this.element_.firstChild;)this.element_.removeChild(this.element_.firstChild)},h.prototype.mdlDowngrade=h.prototype.mdlDowngrade_,h.prototype.mdlDowngrade=h.prototype.mdlDowngrade,s.register({constructor:h,classAsString:"MaterialProgress",cssClass:"mdl-js-progress",widget:!0});var p=function(e){this.element_=e,this.init()};window.MaterialRadio=p,p.prototype.Constant_={TINY_TIMEOUT:.001},p.prototype.CssClasses_={IS_FOCUSED:"is-focused",IS_DISABLED:"is-disabled",IS_CHECKED:"is-checked",IS_UPGRADED:"is-upgraded",JS_RADIO:"mdl-js-radio",RADIO_BTN:"mdl-radio__button",RADIO_OUTER_CIRCLE:"mdl-radio__outer-circle",RADIO_INNER_CIRCLE:"mdl-radio__inner-circle",RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE_CONTAINER:"mdl-radio__ripple-container",RIPPLE_CENTER:"mdl-ripple--center",RIPPLE:"mdl-ripple"},p.prototype.onChange_=function(e){for(var t=document.getElementsByClassName(this.CssClasses_.JS_RADIO),s=0;s<t.length;s++){var i=t[s].querySelector("."+this.CssClasses_.RADIO_BTN);i.getAttribute("name")===this.btnElement_.getAttribute("name")&&t[s].MaterialRadio.updateClasses_()}},p.prototype.onFocus_=function(e){this.element_.classList.add(this.CssClasses_.IS_FOCUSED)},p.prototype.onBlur_=function(e){this.element_.classList.remove(this.CssClasses_.IS_FOCUSED)},p.prototype.onMouseup_=function(e){this.blur_()},p.prototype.updateClasses_=function(){this.checkDisabled(),this.checkToggleState()},p.prototype.blur_=function(){window.setTimeout(function(){this.btnElement_.blur()}.bind(this),this.Constant_.TINY_TIMEOUT)},p.prototype.checkDisabled=function(){this.btnElement_.disabled?this.element_.classList.add(this.CssClasses_.IS_DISABLED):this.element_.classList.remove(this.CssClasses_.IS_DISABLED)},p.prototype.checkDisabled=p.prototype.checkDisabled,p.prototype.checkToggleState=function(){this.btnElement_.checked?this.element_.classList.add(this.CssClasses_.IS_CHECKED):this.element_.classList.remove(this.CssClasses_.IS_CHECKED)},p.prototype.checkToggleState=p.prototype.checkToggleState,p.prototype.disable=function(){this.btnElement_.disabled=!0,this.updateClasses_()},p.prototype.disable=p.prototype.disable,p.prototype.enable=function(){this.btnElement_.disabled=!1,this.updateClasses_()},p.prototype.enable=p.prototype.enable,p.prototype.check=function(){this.btnElement_.checked=!0,this.updateClasses_()},p.prototype.check=p.prototype.check,p.prototype.uncheck=function(){this.btnElement_.checked=!1,this.updateClasses_()},p.prototype.uncheck=p.prototype.uncheck,p.prototype.init=function(){if(this.element_){this.btnElement_=this.element_.querySelector("."+this.CssClasses_.RADIO_BTN),this.boundChangeHandler_=this.onChange_.bind(this),this.boundFocusHandler_=this.onChange_.bind(this),this.boundBlurHandler_=this.onBlur_.bind(this),this.boundMouseUpHandler_=this.onMouseup_.bind(this);var e=document.createElement("span");e.classList.add(this.CssClasses_.RADIO_OUTER_CIRCLE);var t=document.createElement("span");t.classList.add(this.CssClasses_.RADIO_INNER_CIRCLE),this.element_.appendChild(e),this.element_.appendChild(t);var s;if(this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT)){this.element_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS),s=document.createElement("span"),s.classList.add(this.CssClasses_.RIPPLE_CONTAINER),s.classList.add(this.CssClasses_.RIPPLE_EFFECT),s.classList.add(this.CssClasses_.RIPPLE_CENTER),s.addEventListener("mouseup",this.boundMouseUpHandler_);var i=document.createElement("span");i.classList.add(this.CssClasses_.RIPPLE),s.appendChild(i),this.element_.appendChild(s)}this.btnElement_.addEventListener("change",this.boundChangeHandler_),this.btnElement_.addEventListener("focus",this.boundFocusHandler_),this.btnElement_.addEventListener("blur",this.boundBlurHandler_),this.element_.addEventListener("mouseup",this.boundMouseUpHandler_),this.updateClasses_(),this.element_.classList.add(this.CssClasses_.IS_UPGRADED)}},p.prototype.mdlDowngrade_=function(){var e=this.element_.querySelector("."+this.CssClasses_.RIPPLE_CONTAINER);this.btnElement_.removeEventListener("change",this.boundChangeHandler_),this.btnElement_.removeEventListener("focus",this.boundFocusHandler_),this.btnElement_.removeEventListener("blur",this.boundBlurHandler_),this.element_.removeEventListener("mouseup",this.boundMouseUpHandler_),e&&(e.removeEventListener("mouseup",this.boundMouseUpHandler_),this.element_.removeChild(e))},p.prototype.mdlDowngrade=p.prototype.mdlDowngrade_,p.prototype.mdlDowngrade=p.prototype.mdlDowngrade,s.register({constructor:p,classAsString:"MaterialRadio",cssClass:"mdl-js-radio",widget:!0});var c=function(e){this.element_=e,this.isIE_=window.navigator.msPointerEnabled,this.init()};window.MaterialSlider=c,c.prototype.Constant_={},c.prototype.CssClasses_={IE_CONTAINER:"mdl-slider__ie-container",SLIDER_CONTAINER:"mdl-slider__container",BACKGROUND_FLEX:"mdl-slider__background-flex",BACKGROUND_LOWER:"mdl-slider__background-lower",BACKGROUND_UPPER:"mdl-slider__background-upper",IS_LOWEST_VALUE:"is-lowest-value",IS_UPGRADED:"is-upgraded"},c.prototype.onInput_=function(e){this.updateValueStyles_()},c.prototype.onChange_=function(e){this.updateValueStyles_()},c.prototype.onMouseUp_=function(e){e.target.blur()},c.prototype.onContainerMouseDown_=function(e){if(e.target===this.element_.parentElement){e.preventDefault();var t=new MouseEvent("mousedown",{target:e.target,buttons:e.buttons,clientX:e.clientX,clientY:this.element_.getBoundingClientRect().y});this.element_.dispatchEvent(t)}},c.prototype.updateValueStyles_=function(){var e=(this.element_.value-this.element_.min)/(this.element_.max-this.element_.min);0===e?this.element_.classList.add(this.CssClasses_.IS_LOWEST_VALUE):this.element_.classList.remove(this.CssClasses_.IS_LOWEST_VALUE),this.isIE_||(this.backgroundLower_.style.flex=e,this.backgroundLower_.style.webkitFlex=e,this.backgroundUpper_.style.flex=1-e,this.backgroundUpper_.style.webkitFlex=1-e)},c.prototype.disable=function(){this.element_.disabled=!0},c.prototype.disable=c.prototype.disable,c.prototype.enable=function(){this.element_.disabled=!1},c.prototype.enable=c.prototype.enable,c.prototype.change=function(e){"undefined"!=typeof e&&(this.element_.value=e),this.updateValueStyles_()},c.prototype.change=c.prototype.change,c.prototype.init=function(){if(this.element_){if(this.isIE_){var e=document.createElement("div");e.classList.add(this.CssClasses_.IE_CONTAINER),
+this.element_.parentElement.insertBefore(e,this.element_),this.element_.parentElement.removeChild(this.element_),e.appendChild(this.element_)}else{var t=document.createElement("div");t.classList.add(this.CssClasses_.SLIDER_CONTAINER),this.element_.parentElement.insertBefore(t,this.element_),this.element_.parentElement.removeChild(this.element_),t.appendChild(this.element_);var s=document.createElement("div");s.classList.add(this.CssClasses_.BACKGROUND_FLEX),t.appendChild(s),this.backgroundLower_=document.createElement("div"),this.backgroundLower_.classList.add(this.CssClasses_.BACKGROUND_LOWER),s.appendChild(this.backgroundLower_),this.backgroundUpper_=document.createElement("div"),this.backgroundUpper_.classList.add(this.CssClasses_.BACKGROUND_UPPER),s.appendChild(this.backgroundUpper_)}this.boundInputHandler=this.onInput_.bind(this),this.boundChangeHandler=this.onChange_.bind(this),this.boundMouseUpHandler=this.onMouseUp_.bind(this),this.boundContainerMouseDownHandler=this.onContainerMouseDown_.bind(this),this.element_.addEventListener("input",this.boundInputHandler),this.element_.addEventListener("change",this.boundChangeHandler),this.element_.addEventListener("mouseup",this.boundMouseUpHandler),this.element_.parentElement.addEventListener("mousedown",this.boundContainerMouseDownHandler),this.updateValueStyles_(),this.element_.classList.add(this.CssClasses_.IS_UPGRADED)}},c.prototype.mdlDowngrade_=function(){this.element_.removeEventListener("input",this.boundInputHandler),this.element_.removeEventListener("change",this.boundChangeHandler),this.element_.removeEventListener("mouseup",this.boundMouseUpHandler),this.element_.parentElement.removeEventListener("mousedown",this.boundContainerMouseDownHandler)},c.prototype.mdlDowngrade=c.prototype.mdlDowngrade_,c.prototype.mdlDowngrade=c.prototype.mdlDowngrade,s.register({constructor:c,classAsString:"MaterialSlider",cssClass:"mdl-js-slider",widget:!0});var u=function(e){this.element_=e,this.init()};window.MaterialSpinner=u,u.prototype.Constant_={MDL_SPINNER_LAYER_COUNT:4},u.prototype.CssClasses_={MDL_SPINNER_LAYER:"mdl-spinner__layer",MDL_SPINNER_CIRCLE_CLIPPER:"mdl-spinner__circle-clipper",MDL_SPINNER_CIRCLE:"mdl-spinner__circle",MDL_SPINNER_GAP_PATCH:"mdl-spinner__gap-patch",MDL_SPINNER_LEFT:"mdl-spinner__left",MDL_SPINNER_RIGHT:"mdl-spinner__right"},u.prototype.createLayer=function(e){var t=document.createElement("div");t.classList.add(this.CssClasses_.MDL_SPINNER_LAYER),t.classList.add(this.CssClasses_.MDL_SPINNER_LAYER+"-"+e);var s=document.createElement("div");s.classList.add(this.CssClasses_.MDL_SPINNER_CIRCLE_CLIPPER),s.classList.add(this.CssClasses_.MDL_SPINNER_LEFT);var i=document.createElement("div");i.classList.add(this.CssClasses_.MDL_SPINNER_GAP_PATCH);var n=document.createElement("div");n.classList.add(this.CssClasses_.MDL_SPINNER_CIRCLE_CLIPPER),n.classList.add(this.CssClasses_.MDL_SPINNER_RIGHT);for(var a=[s,i,n],l=0;l<a.length;l++){var o=document.createElement("div");o.classList.add(this.CssClasses_.MDL_SPINNER_CIRCLE),a[l].appendChild(o)}t.appendChild(s),t.appendChild(i),t.appendChild(n),this.element_.appendChild(t)},u.prototype.createLayer=u.prototype.createLayer,u.prototype.stop=function(){this.element_.classList.remove("is-active")},u.prototype.stop=u.prototype.stop,u.prototype.start=function(){this.element_.classList.add("is-active")},u.prototype.start=u.prototype.start,u.prototype.init=function(){if(this.element_){for(var e=1;e<=this.Constant_.MDL_SPINNER_LAYER_COUNT;e++)this.createLayer(e);this.element_.classList.add("is-upgraded")}},s.register({constructor:u,classAsString:"MaterialSpinner",cssClass:"mdl-js-spinner",widget:!0});var C=function(e){this.element_=e,this.init()};window.MaterialSwitch=C,C.prototype.Constant_={TINY_TIMEOUT:.001},C.prototype.CssClasses_={INPUT:"mdl-switch__input",TRACK:"mdl-switch__track",THUMB:"mdl-switch__thumb",FOCUS_HELPER:"mdl-switch__focus-helper",RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE_CONTAINER:"mdl-switch__ripple-container",RIPPLE_CENTER:"mdl-ripple--center",RIPPLE:"mdl-ripple",IS_FOCUSED:"is-focused",IS_DISABLED:"is-disabled",IS_CHECKED:"is-checked"},C.prototype.onChange_=function(e){this.updateClasses_()},C.prototype.onFocus_=function(e){this.element_.classList.add(this.CssClasses_.IS_FOCUSED)},C.prototype.onBlur_=function(e){this.element_.classList.remove(this.CssClasses_.IS_FOCUSED)},C.prototype.onMouseUp_=function(e){this.blur_()},C.prototype.updateClasses_=function(){this.checkDisabled(),this.checkToggleState()},C.prototype.blur_=function(){window.setTimeout(function(){this.inputElement_.blur()}.bind(this),this.Constant_.TINY_TIMEOUT)},C.prototype.checkDisabled=function(){this.inputElement_.disabled?this.element_.classList.add(this.CssClasses_.IS_DISABLED):this.element_.classList.remove(this.CssClasses_.IS_DISABLED)},C.prototype.checkDisabled=C.prototype.checkDisabled,C.prototype.checkToggleState=function(){this.inputElement_.checked?this.element_.classList.add(this.CssClasses_.IS_CHECKED):this.element_.classList.remove(this.CssClasses_.IS_CHECKED)},C.prototype.checkToggleState=C.prototype.checkToggleState,C.prototype.disable=function(){this.inputElement_.disabled=!0,this.updateClasses_()},C.prototype.disable=C.prototype.disable,C.prototype.enable=function(){this.inputElement_.disabled=!1,this.updateClasses_()},C.prototype.enable=C.prototype.enable,C.prototype.on=function(){this.inputElement_.checked=!0,this.updateClasses_()},C.prototype.on=C.prototype.on,C.prototype.off=function(){this.inputElement_.checked=!1,this.updateClasses_()},C.prototype.off=C.prototype.off,C.prototype.init=function(){if(this.element_){this.inputElement_=this.element_.querySelector("."+this.CssClasses_.INPUT);var e=document.createElement("div");e.classList.add(this.CssClasses_.TRACK);var t=document.createElement("div");t.classList.add(this.CssClasses_.THUMB);var s=document.createElement("span");if(s.classList.add(this.CssClasses_.FOCUS_HELPER),t.appendChild(s),this.element_.appendChild(e),this.element_.appendChild(t),this.boundMouseUpHandler=this.onMouseUp_.bind(this),this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT)){this.element_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS),this.rippleContainerElement_=document.createElement("span"),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CONTAINER),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_EFFECT),this.rippleContainerElement_.classList.add(this.CssClasses_.RIPPLE_CENTER),this.rippleContainerElement_.addEventListener("mouseup",this.boundMouseUpHandler);var i=document.createElement("span");i.classList.add(this.CssClasses_.RIPPLE),this.rippleContainerElement_.appendChild(i),this.element_.appendChild(this.rippleContainerElement_)}this.boundChangeHandler=this.onChange_.bind(this),this.boundFocusHandler=this.onFocus_.bind(this),this.boundBlurHandler=this.onBlur_.bind(this),this.inputElement_.addEventListener("change",this.boundChangeHandler),this.inputElement_.addEventListener("focus",this.boundFocusHandler),this.inputElement_.addEventListener("blur",this.boundBlurHandler),this.element_.addEventListener("mouseup",this.boundMouseUpHandler),this.updateClasses_(),this.element_.classList.add("is-upgraded")}},C.prototype.mdlDowngrade_=function(){this.rippleContainerElement_&&this.rippleContainerElement_.removeEventListener("mouseup",this.boundMouseUpHandler),this.inputElement_.removeEventListener("change",this.boundChangeHandler),this.inputElement_.removeEventListener("focus",this.boundFocusHandler),this.inputElement_.removeEventListener("blur",this.boundBlurHandler),this.element_.removeEventListener("mouseup",this.boundMouseUpHandler)},C.prototype.mdlDowngrade=C.prototype.mdlDowngrade_,C.prototype.mdlDowngrade=C.prototype.mdlDowngrade,s.register({constructor:C,classAsString:"MaterialSwitch",cssClass:"mdl-js-switch",widget:!0});var m=function(e){this.element_=e,this.init()};window.MaterialTabs=m,m.prototype.Constant_={},m.prototype.CssClasses_={TAB_CLASS:"mdl-tabs__tab",PANEL_CLASS:"mdl-tabs__panel",ACTIVE_CLASS:"is-active",UPGRADED_CLASS:"is-upgraded",MDL_JS_RIPPLE_EFFECT:"mdl-js-ripple-effect",MDL_RIPPLE_CONTAINER:"mdl-tabs__ripple-container",MDL_RIPPLE:"mdl-ripple",MDL_JS_RIPPLE_EFFECT_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events"},m.prototype.initTabs_=function(){this.element_.classList.contains(this.CssClasses_.MDL_JS_RIPPLE_EFFECT)&&this.element_.classList.add(this.CssClasses_.MDL_JS_RIPPLE_EFFECT_IGNORE_EVENTS),this.tabs_=this.element_.querySelectorAll("."+this.CssClasses_.TAB_CLASS),this.panels_=this.element_.querySelectorAll("."+this.CssClasses_.PANEL_CLASS);for(var t=0;t<this.tabs_.length;t++)new e(this.tabs_[t],this);this.element_.classList.add(this.CssClasses_.UPGRADED_CLASS)},m.prototype.resetTabState_=function(){for(var e=0;e<this.tabs_.length;e++)this.tabs_[e].classList.remove(this.CssClasses_.ACTIVE_CLASS)},m.prototype.resetPanelState_=function(){for(var e=0;e<this.panels_.length;e++)this.panels_[e].classList.remove(this.CssClasses_.ACTIVE_CLASS)},m.prototype.init=function(){this.element_&&this.initTabs_()},s.register({constructor:m,classAsString:"MaterialTabs",cssClass:"mdl-js-tabs"});var E=function(e){this.element_=e,this.maxRows=this.Constant_.NO_MAX_ROWS,this.init()};window.MaterialTextfield=E,E.prototype.Constant_={NO_MAX_ROWS:-1,MAX_ROWS_ATTRIBUTE:"maxrows"},E.prototype.CssClasses_={LABEL:"mdl-textfield__label",INPUT:"mdl-textfield__input",IS_DIRTY:"is-dirty",IS_FOCUSED:"is-focused",IS_DISABLED:"is-disabled",IS_INVALID:"is-invalid",IS_UPGRADED:"is-upgraded"},E.prototype.onKeyDown_=function(e){var t=e.target.value.split("\n").length;13===e.keyCode&&t>=this.maxRows&&e.preventDefault()},E.prototype.onFocus_=function(e){this.element_.classList.add(this.CssClasses_.IS_FOCUSED)},E.prototype.onBlur_=function(e){this.element_.classList.remove(this.CssClasses_.IS_FOCUSED)},E.prototype.updateClasses_=function(){this.checkDisabled(),this.checkValidity(),this.checkDirty()},E.prototype.checkDisabled=function(){this.input_.disabled?this.element_.classList.add(this.CssClasses_.IS_DISABLED):this.element_.classList.remove(this.CssClasses_.IS_DISABLED)},E.prototype.checkDisabled=E.prototype.checkDisabled,E.prototype.checkValidity=function(){this.input_.validity&&(this.input_.validity.valid?this.element_.classList.remove(this.CssClasses_.IS_INVALID):this.element_.classList.add(this.CssClasses_.IS_INVALID))},E.prototype.checkValidity=E.prototype.checkValidity,E.prototype.checkDirty=function(){this.input_.value&&this.input_.value.length>0?this.element_.classList.add(this.CssClasses_.IS_DIRTY):this.element_.classList.remove(this.CssClasses_.IS_DIRTY)},E.prototype.checkDirty=E.prototype.checkDirty,E.prototype.disable=function(){this.input_.disabled=!0,this.updateClasses_()},E.prototype.disable=E.prototype.disable,E.prototype.enable=function(){this.input_.disabled=!1,this.updateClasses_()},E.prototype.enable=E.prototype.enable,E.prototype.change=function(e){this.input_.value=e||"",this.updateClasses_()},E.prototype.change=E.prototype.change,E.prototype.init=function(){if(this.element_&&(this.label_=this.element_.querySelector("."+this.CssClasses_.LABEL),this.input_=this.element_.querySelector("."+this.CssClasses_.INPUT),this.input_)){this.input_.hasAttribute(this.Constant_.MAX_ROWS_ATTRIBUTE)&&(this.maxRows=parseInt(this.input_.getAttribute(this.Constant_.MAX_ROWS_ATTRIBUTE),10),isNaN(this.maxRows)&&(this.maxRows=this.Constant_.NO_MAX_ROWS)),this.boundUpdateClassesHandler=this.updateClasses_.bind(this),this.boundFocusHandler=this.onFocus_.bind(this),this.boundBlurHandler=this.onBlur_.bind(this),this.input_.addEventListener("input",this.boundUpdateClassesHandler),this.input_.addEventListener("focus",this.boundFocusHandler),this.input_.addEventListener("blur",this.boundBlurHandler),this.maxRows!==this.Constant_.NO_MAX_ROWS&&(this.boundKeyDownHandler=this.onKeyDown_.bind(this),this.input_.addEventListener("keydown",this.boundKeyDownHandler));var e=this.element_.classList.contains(this.CssClasses_.IS_INVALID);this.updateClasses_(),this.element_.classList.add(this.CssClasses_.IS_UPGRADED),e&&this.element_.classList.add(this.CssClasses_.IS_INVALID)}},E.prototype.mdlDowngrade_=function(){this.input_.removeEventListener("input",this.boundUpdateClassesHandler),this.input_.removeEventListener("focus",this.boundFocusHandler),this.input_.removeEventListener("blur",this.boundBlurHandler),this.boundKeyDownHandler&&this.input_.removeEventListener("keydown",this.boundKeyDownHandler)},E.prototype.mdlDowngrade=E.prototype.mdlDowngrade_,E.prototype.mdlDowngrade=E.prototype.mdlDowngrade,s.register({constructor:E,classAsString:"MaterialTextfield",cssClass:"mdl-js-textfield",widget:!0});var L=function(e){this.element_=e,this.init()};window.MaterialTooltip=L,L.prototype.Constant_={},L.prototype.CssClasses_={IS_ACTIVE:"is-active"},L.prototype.handleMouseEnter_=function(e){e.stopPropagation();var t=e.target.getBoundingClientRect(),s=t.left+t.width/2,i=-1*(this.element_.offsetWidth/2);0>s+i?(this.element_.style.left=0,this.element_.style.marginLeft=0):(this.element_.style.left=s+"px",this.element_.style.marginLeft=i+"px"),this.element_.style.top=t.top+t.height+10+"px",this.element_.classList.add(this.CssClasses_.IS_ACTIVE),window.addEventListener("scroll",this.boundMouseLeaveHandler,!1),window.addEventListener("touchmove",this.boundMouseLeaveHandler,!1)},L.prototype.handleMouseLeave_=function(e){e.stopPropagation(),this.element_.classList.remove(this.CssClasses_.IS_ACTIVE),window.removeEventListener("scroll",this.boundMouseLeaveHandler),window.removeEventListener("touchmove",this.boundMouseLeaveHandler,!1)},L.prototype.init=function(){if(this.element_){var e=this.element_.getAttribute("for");e&&(this.forElement_=document.getElementById(e)),this.forElement_&&(this.forElement_.hasAttribute("tabindex")||this.forElement_.setAttribute("tabindex","0"),this.boundMouseEnterHandler=this.handleMouseEnter_.bind(this),this.boundMouseLeaveHandler=this.handleMouseLeave_.bind(this),this.forElement_.addEventListener("mouseenter",this.boundMouseEnterHandler,!1),this.forElement_.addEventListener("click",this.boundMouseEnterHandler,!1),this.forElement_.addEventListener("blur",this.boundMouseLeaveHandler),this.forElement_.addEventListener("touchstart",this.boundMouseEnterHandler,!1),this.forElement_.addEventListener("mouseleave",this.boundMouseLeaveHandler))}},L.prototype.mdlDowngrade_=function(){this.forElement_&&(this.forElement_.removeEventListener("mouseenter",this.boundMouseEnterHandler,!1),this.forElement_.removeEventListener("click",this.boundMouseEnterHandler,!1),this.forElement_.removeEventListener("touchstart",this.boundMouseEnterHandler,!1),this.forElement_.removeEventListener("mouseleave",this.boundMouseLeaveHandler))},L.prototype.mdlDowngrade=L.prototype.mdlDowngrade_,L.prototype.mdlDowngrade=L.prototype.mdlDowngrade,s.register({constructor:L,classAsString:"MaterialTooltip",cssClass:"mdl-tooltip"});var I=function(e){this.element_=e,this.init()};window.MaterialLayout=I,I.prototype.Constant_={MAX_WIDTH:"(max-width: 1024px)",TAB_SCROLL_PIXELS:100,MENU_ICON:"menu",CHEVRON_LEFT:"chevron_left",CHEVRON_RIGHT:"chevron_right"},I.prototype.Mode_={STANDARD:0,SEAMED:1,WATERFALL:2,SCROLL:3},I.prototype.CssClasses_={CONTAINER:"mdl-layout__container",HEADER:"mdl-layout__header",DRAWER:"mdl-layout__drawer",CONTENT:"mdl-layout__content",DRAWER_BTN:"mdl-layout__drawer-button",ICON:"material-icons",JS_RIPPLE_EFFECT:"mdl-js-ripple-effect",RIPPLE_CONTAINER:"mdl-layout__tab-ripple-container",RIPPLE:"mdl-ripple",RIPPLE_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",HEADER_SEAMED:"mdl-layout__header--seamed",HEADER_WATERFALL:"mdl-layout__header--waterfall",HEADER_SCROLL:"mdl-layout__header--scroll",FIXED_HEADER:"mdl-layout--fixed-header",OBFUSCATOR:"mdl-layout__obfuscator",TAB_BAR:"mdl-layout__tab-bar",TAB_CONTAINER:"mdl-layout__tab-bar-container",TAB:"mdl-layout__tab",TAB_BAR_BUTTON:"mdl-layout__tab-bar-button",TAB_BAR_LEFT_BUTTON:"mdl-layout__tab-bar-left-button",TAB_BAR_RIGHT_BUTTON:"mdl-layout__tab-bar-right-button",PANEL:"mdl-layout__tab-panel",HAS_DRAWER:"has-drawer",HAS_TABS:"has-tabs",HAS_SCROLLING_HEADER:"has-scrolling-header",CASTING_SHADOW:"is-casting-shadow",IS_COMPACT:"is-compact",IS_SMALL_SCREEN:"is-small-screen",IS_DRAWER_OPEN:"is-visible",IS_ACTIVE:"is-active",IS_UPGRADED:"is-upgraded",IS_ANIMATING:"is-animating",ON_LARGE_SCREEN:"mdl-layout--large-screen-only",ON_SMALL_SCREEN:"mdl-layout--small-screen-only"},I.prototype.contentScrollHandler_=function(){this.header_.classList.contains(this.CssClasses_.IS_ANIMATING)||(this.content_.scrollTop>0&&!this.header_.classList.contains(this.CssClasses_.IS_COMPACT)?(this.header_.classList.add(this.CssClasses_.CASTING_SHADOW),this.header_.classList.add(this.CssClasses_.IS_COMPACT),this.header_.classList.add(this.CssClasses_.IS_ANIMATING)):this.content_.scrollTop<=0&&this.header_.classList.contains(this.CssClasses_.IS_COMPACT)&&(this.header_.classList.remove(this.CssClasses_.CASTING_SHADOW),this.header_.classList.remove(this.CssClasses_.IS_COMPACT),this.header_.classList.add(this.CssClasses_.IS_ANIMATING)))},I.prototype.screenSizeHandler_=function(){this.screenSizeMediaQuery_.matches?this.element_.classList.add(this.CssClasses_.IS_SMALL_SCREEN):(this.element_.classList.remove(this.CssClasses_.IS_SMALL_SCREEN),this.drawer_&&(this.drawer_.classList.remove(this.CssClasses_.IS_DRAWER_OPEN),this.obfuscator_.classList.remove(this.CssClasses_.IS_DRAWER_OPEN)))},I.prototype.drawerToggleHandler_=function(){this.drawer_.classList.toggle(this.CssClasses_.IS_DRAWER_OPEN),this.obfuscator_.classList.toggle(this.CssClasses_.IS_DRAWER_OPEN)},I.prototype.headerTransitionEndHandler_=function(){this.header_.classList.remove(this.CssClasses_.IS_ANIMATING)},I.prototype.headerClickHandler_=function(){this.header_.classList.contains(this.CssClasses_.IS_COMPACT)&&(this.header_.classList.remove(this.CssClasses_.IS_COMPACT),this.header_.classList.add(this.CssClasses_.IS_ANIMATING))},I.prototype.resetTabState_=function(e){for(var t=0;t<e.length;t++)e[t].classList.remove(this.CssClasses_.IS_ACTIVE)},I.prototype.resetPanelState_=function(e){for(var t=0;t<e.length;t++)e[t].classList.remove(this.CssClasses_.IS_ACTIVE)},I.prototype.init=function(){if(this.element_){var e=document.createElement("div");e.classList.add(this.CssClasses_.CONTAINER),this.element_.parentElement.insertBefore(e,this.element_),this.element_.parentElement.removeChild(this.element_),e.appendChild(this.element_);for(var s=this.element_.childNodes,i=s.length,n=0;i>n;n++){var a=s[n];a.classList&&a.classList.contains(this.CssClasses_.HEADER)&&(this.header_=a),a.classList&&a.classList.contains(this.CssClasses_.DRAWER)&&(this.drawer_=a),a.classList&&a.classList.contains(this.CssClasses_.CONTENT)&&(this.content_=a)}this.header_&&(this.tabBar_=this.header_.querySelector("."+this.CssClasses_.TAB_BAR));var l=this.Mode_.STANDARD;if(this.header_&&(this.header_.classList.contains(this.CssClasses_.HEADER_SEAMED)?l=this.Mode_.SEAMED:this.header_.classList.contains(this.CssClasses_.HEADER_WATERFALL)?(l=this.Mode_.WATERFALL,this.header_.addEventListener("transitionend",this.headerTransitionEndHandler_.bind(this)),this.header_.addEventListener("click",this.headerClickHandler_.bind(this))):this.header_.classList.contains(this.CssClasses_.HEADER_SCROLL)&&(l=this.Mode_.SCROLL,e.classList.add(this.CssClasses_.HAS_SCROLLING_HEADER)),l===this.Mode_.STANDARD?(this.header_.classList.add(this.CssClasses_.CASTING_SHADOW),this.tabBar_&&this.tabBar_.classList.add(this.CssClasses_.CASTING_SHADOW)):l===this.Mode_.SEAMED||l===this.Mode_.SCROLL?(this.header_.classList.remove(this.CssClasses_.CASTING_SHADOW),this.tabBar_&&this.tabBar_.classList.remove(this.CssClasses_.CASTING_SHADOW)):l===this.Mode_.WATERFALL&&(this.content_.addEventListener("scroll",this.contentScrollHandler_.bind(this)),this.contentScrollHandler_())),this.drawer_){var o=this.element_.querySelector("."+this.CssClasses_.DRAWER_BTN);if(!o){o=document.createElement("div"),o.classList.add(this.CssClasses_.DRAWER_BTN);var r=document.createElement("i");r.classList.add(this.CssClasses_.ICON),r.textContent=this.Constant_.MENU_ICON,o.appendChild(r)}this.drawer_.classList.contains(this.CssClasses_.ON_LARGE_SCREEN)?o.classList.add(this.CssClasses_.ON_LARGE_SCREEN):this.drawer_.classList.contains(this.CssClasses_.ON_SMALL_SCREEN)&&o.classList.add(this.CssClasses_.ON_SMALL_SCREEN),o.addEventListener("click",this.drawerToggleHandler_.bind(this)),this.element_.classList.add(this.CssClasses_.HAS_DRAWER),this.element_.classList.contains(this.CssClasses_.FIXED_HEADER)?this.header_.insertBefore(o,this.header_.firstChild):this.element_.insertBefore(o,this.content_);var d=document.createElement("div");d.classList.add(this.CssClasses_.OBFUSCATOR),this.element_.appendChild(d),d.addEventListener("click",this.drawerToggleHandler_.bind(this)),this.obfuscator_=d}if(this.screenSizeMediaQuery_=window.matchMedia(this.Constant_.MAX_WIDTH),this.screenSizeMediaQuery_.addListener(this.screenSizeHandler_.bind(this)),this.screenSizeHandler_(),this.header_&&this.tabBar_){this.element_.classList.add(this.CssClasses_.HAS_TABS);var _=document.createElement("div");_.classList.add(this.CssClasses_.TAB_CONTAINER),this.header_.insertBefore(_,this.tabBar_),this.header_.removeChild(this.tabBar_);var h=document.createElement("div");h.classList.add(this.CssClasses_.TAB_BAR_BUTTON),h.classList.add(this.CssClasses_.TAB_BAR_LEFT_BUTTON);var p=document.createElement("i");p.classList.add(this.CssClasses_.ICON),p.textContent=this.Constant_.CHEVRON_LEFT,h.appendChild(p),h.addEventListener("click",function(){this.tabBar_.scrollLeft-=this.Constant_.TAB_SCROLL_PIXELS}.bind(this));var c=document.createElement("div");c.classList.add(this.CssClasses_.TAB_BAR_BUTTON),c.classList.add(this.CssClasses_.TAB_BAR_RIGHT_BUTTON);var u=document.createElement("i");u.classList.add(this.CssClasses_.ICON),u.textContent=this.Constant_.CHEVRON_RIGHT,c.appendChild(u),c.addEventListener("click",function(){this.tabBar_.scrollLeft+=this.Constant_.TAB_SCROLL_PIXELS}.bind(this)),_.appendChild(h),_.appendChild(this.tabBar_),_.appendChild(c);var C=function(){this.tabBar_.scrollLeft>0?h.classList.add(this.CssClasses_.IS_ACTIVE):h.classList.remove(this.CssClasses_.IS_ACTIVE),this.tabBar_.scrollLeft<this.tabBar_.scrollWidth-this.tabBar_.offsetWidth?c.classList.add(this.CssClasses_.IS_ACTIVE):c.classList.remove(this.CssClasses_.IS_ACTIVE)}.bind(this);this.tabBar_.addEventListener("scroll",C),C(),this.tabBar_.classList.contains(this.CssClasses_.JS_RIPPLE_EFFECT)&&this.tabBar_.classList.add(this.CssClasses_.RIPPLE_IGNORE_EVENTS);for(var m=this.tabBar_.querySelectorAll("."+this.CssClasses_.TAB),E=this.content_.querySelectorAll("."+this.CssClasses_.PANEL),L=0;L<m.length;L++)new t(m[L],m,E,this)}this.element_.classList.add(this.CssClasses_.IS_UPGRADED)}},s.register({constructor:I,classAsString:"MaterialLayout",cssClass:"mdl-js-layout"});var f=function(e){this.element_=e,this.init()};window.MaterialDataTable=f,f.prototype.Constant_={},f.prototype.CssClasses_={DATA_TABLE:"mdl-data-table",SELECTABLE:"mdl-data-table--selectable",SELECT_ELEMENT:"mdl-data-table__select",IS_SELECTED:"is-selected",IS_UPGRADED:"is-upgraded"},f.prototype.selectRow_=function(e,t,s){return t?function(){e.checked?t.classList.add(this.CssClasses_.IS_SELECTED):t.classList.remove(this.CssClasses_.IS_SELECTED)}.bind(this):s?function(){var t,i;if(e.checked)for(t=0;t<s.length;t++)i=s[t].querySelector("td").querySelector(".mdl-checkbox"),i.MaterialCheckbox.check(),s[t].classList.add(this.CssClasses_.IS_SELECTED);else for(t=0;t<s.length;t++)i=s[t].querySelector("td").querySelector(".mdl-checkbox"),i.MaterialCheckbox.uncheck(),s[t].classList.remove(this.CssClasses_.IS_SELECTED)}.bind(this):void 0},f.prototype.createCheckbox_=function(e,t){var i=document.createElement("label"),n=["mdl-checkbox","mdl-js-checkbox","mdl-js-ripple-effect",this.CssClasses_.SELECT_ELEMENT];i.className=n.join(" ");var a=document.createElement("input");return a.type="checkbox",a.classList.add("mdl-checkbox__input"),a.addEventListener("change",this.selectRow_(a,e,t)),i.appendChild(a),s.upgradeElement(i,"MaterialCheckbox"),i},f.prototype.init=function(){if(this.element_){var e=this.element_.querySelector("th"),t=this.element_.querySelector("tbody").querySelectorAll("tr");if(this.element_.classList.contains(this.CssClasses_.SELECTABLE)){var s=document.createElement("th"),i=this.createCheckbox_(null,t);s.appendChild(i),e.parentElement.insertBefore(s,e);for(var n=0;n<t.length;n++){var a=t[n].querySelector("td");if(a){var l=document.createElement("td"),o=this.createCheckbox_(t[n]);l.appendChild(o),t[n].insertBefore(l,a)}}}this.element_.classList.add(this.CssClasses_.IS_UPGRADED)}},s.register({constructor:f,classAsString:"MaterialDataTable",cssClass:"mdl-js-data-table"});var b=function(e){this.element_=e,this.init()};window.MaterialRipple=b,b.prototype.Constant_={INITIAL_SCALE:"scale(0.0001, 0.0001)",INITIAL_SIZE:"1px",INITIAL_OPACITY:"0.4",FINAL_OPACITY:"0",FINAL_SCALE:""},b.prototype.CssClasses_={RIPPLE_CENTER:"mdl-ripple--center",RIPPLE_EFFECT_IGNORE_EVENTS:"mdl-js-ripple-effect--ignore-events",RIPPLE:"mdl-ripple",IS_ANIMATING:"is-animating",IS_VISIBLE:"is-visible"},b.prototype.downHandler_=function(e){if(!this.rippleElement_.style.width&&!this.rippleElement_.style.height){var t=this.element_.getBoundingClientRect();this.boundHeight=t.height,this.boundWidth=t.width,this.rippleSize_=2*Math.sqrt(t.width*t.width+t.height*t.height)+2,this.rippleElement_.style.width=this.rippleSize_+"px",this.rippleElement_.style.height=this.rippleSize_+"px"}if(this.rippleElement_.classList.add(this.CssClasses_.IS_VISIBLE),"mousedown"===e.type&&this.ignoringMouseDown_)this.ignoringMouseDown_=!1;else{"touchstart"===e.type&&(this.ignoringMouseDown_=!0);var s=this.getFrameCount();if(s>0)return;this.setFrameCount(1);var i,n,a=e.currentTarget.getBoundingClientRect();if(0===e.clientX&&0===e.clientY)i=Math.round(a.width/2),n=Math.round(a.height/2);else{var l=e.clientX?e.clientX:e.touches[0].clientX,o=e.clientY?e.clientY:e.touches[0].clientY;i=Math.round(l-a.left),n=Math.round(o-a.top)}this.setRippleXY(i,n),this.setRippleStyles(!0),window.requestAnimationFrame(this.animFrameHandler.bind(this))}},b.prototype.upHandler_=function(e){e&&2!==e.detail&&this.rippleElement_.classList.remove(this.CssClasses_.IS_VISIBLE),window.setTimeout(function(){this.rippleElement_.classList.remove(this.CssClasses_.IS_VISIBLE)}.bind(this),0)},b.prototype.init=function(){if(this.element_){var e=this.element_.classList.contains(this.CssClasses_.RIPPLE_CENTER);this.element_.classList.contains(this.CssClasses_.RIPPLE_EFFECT_IGNORE_EVENTS)||(this.rippleElement_=this.element_.querySelector("."+this.CssClasses_.RIPPLE),this.frameCount_=0,this.rippleSize_=0,this.x_=0,this.y_=0,this.ignoringMouseDown_=!1,this.boundDownHandler=this.downHandler_.bind(this),this.element_.addEventListener("mousedown",this.boundDownHandler),this.element_.addEventListener("touchstart",this.boundDownHandler),this.boundUpHandler=this.upHandler_.bind(this),this.element_.addEventListener("mouseup",this.boundUpHandler),this.element_.addEventListener("mouseleave",this.boundUpHandler),this.element_.addEventListener("touchend",this.boundUpHandler),this.element_.addEventListener("blur",this.boundUpHandler),this.getFrameCount=function(){return this.frameCount_},this.setFrameCount=function(e){this.frameCount_=e},this.getRippleElement=function(){return this.rippleElement_},this.setRippleXY=function(e,t){this.x_=e,this.y_=t},this.setRippleStyles=function(t){if(null!==this.rippleElement_){var s,i,n,a="translate("+this.x_+"px, "+this.y_+"px)";t?(i=this.Constant_.INITIAL_SCALE,n=this.Constant_.INITIAL_SIZE):(i=this.Constant_.FINAL_SCALE,n=this.rippleSize_+"px",e&&(a="translate("+this.boundWidth/2+"px, "+this.boundHeight/2+"px)")),s="translate(-50%, -50%) "+a+i,this.rippleElement_.style.webkitTransform=s,this.rippleElement_.style.msTransform=s,this.rippleElement_.style.transform=s,t?this.rippleElement_.classList.remove(this.CssClasses_.IS_ANIMATING):this.rippleElement_.classList.add(this.CssClasses_.IS_ANIMATING)}},this.animFrameHandler=function(){this.frameCount_-->0?window.requestAnimationFrame(this.animFrameHandler.bind(this)):this.setRippleStyles(!1)})}},b.prototype.mdlDowngrade_=function(){this.element_.removeEventListener("mousedown",this.boundDownHandler),this.element_.removeEventListener("touchstart",this.boundDownHandler),this.element_.removeEventListener("mouseup",this.boundUpHandler),this.element_.removeEventListener("mouseleave",this.boundUpHandler),this.element_.removeEventListener("touchend",this.boundUpHandler),this.element_.removeEventListener("blur",this.boundUpHandler)},b.prototype.mdlDowngrade=b.prototype.mdlDowngrade_,b.prototype.mdlDowngrade=b.prototype.mdlDowngrade,s.register({constructor:b,classAsString:"MaterialRipple",cssClass:"mdl-js-ripple-effect",widget:!1})}();
 //# sourceMappingURL=material.min.js.map
diff --git a/themes/material/mdl-LICENSE b/themes/material/mdl-LICENSE
new file mode 100644
index 000000000..9faf10865
--- /dev/null
+++ b/themes/material/mdl-LICENSE
@@ -0,0 +1,212 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2015 Google Inc
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+   All code in any directories or sub-directories that end with *.html or
+   *.css is licensed under the Creative Commons Attribution International
+   4.0 License, which full text can be found here:
+   https://creativecommons.org/licenses/by/4.0/legalcode.
+
+   As an exception to this license, all html or css that is generated by
+   the software at the direction of the user is copyright the user. The
+   user has full ownership and control over such content, including
+   whether and how they wish to license it.

From f8a7156371e629df63e05fb1accad55c386c76ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Wed, 30 Dec 2015 13:28:04 +0100
Subject: [PATCH 025/250] derp

---
 themes/material/layout.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/material/layout.class.php b/themes/material/layout.class.php
index 5d88d9650..43777acb4 100644
--- a/themes/material/layout.class.php
+++ b/themes/material/layout.class.php
@@ -114,9 +114,9 @@ public function display_page(Page $page) {
 		<title>{$page->title}</title>
     <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en">
     <link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons"  rel="stylesheet">
-    <link rel="stylesheet" href="{$data_href}/themes/{$theme_name}/material.min.css?v1.0.5"  rel="stylesheet">
+    <link rel="stylesheet" href="{$data_href}/themes/{$theme_name}/material.min.css"  rel="stylesheet">
     $header_html
-		<script type="text/javascript" src="{$data_href}/themes/{$theme_name}/material.min.js?v1.0.5"></script>
+		<script type="text/javascript" src="{$data_href}/themes/{$theme_name}/material.min.js"></script>
 		<script type="text/javascript" src="{$data_href}/themes/{$theme_name}/script0.js?v1"></script>
     <!-- having conflicts this ensures the screens will not remain hidden \while the layout is adjusted -->
 	</head>

From c36cc25cd5b1292ccb27cc67675e74eac5a7b89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Mon, 28 Dec 2015 18:42:55 +0100
Subject: [PATCH 026/250] This should add the correct class

---
 themes/material/home.theme.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index e12d1f179..badd677b1 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -29,6 +29,7 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 		$message_html = empty($main_text)     ? "" : "<div class='space' id='message'>$main_text</div>";
 		$counter_html = empty($counter_text)  ? "" : "<div class='mdl-typography--text-center' id='counter'>$counter_text</div>";
 		$contact_link = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a> -";
+		$main_links_html = empty($main_links) ? "" : preg_replace(shm-clink, mdl-navigation__link, $main_links);
 		$search_html = "
 			<div class='mdl-grid'>
 				<div class='mdl-layout-spacer'></div>
@@ -49,7 +50,7 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 			<div class='mdl-layout__drawer'>
 			    <span class='mdl-layout-title'>$sitename</span>
 			    <nav class='mdl-navigation'>
-			    	$main_links
+			    	$main_links_html
 		    	</nav>
 			</div>
 			<main class='mdl-layout__content'>

From 7a0cb4bddc5a8b99e6c303d52252ce01d8d1ddc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Wed, 6 Jan 2016 15:10:26 +0100
Subject: [PATCH 027/250] Oooops, that's kiiiinda important

---
 themes/material/home.theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index badd677b1..ad5949beb 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -29,7 +29,7 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 		$message_html = empty($main_text)     ? "" : "<div class='space' id='message'>$main_text</div>";
 		$counter_html = empty($counter_text)  ? "" : "<div class='mdl-typography--text-center' id='counter'>$counter_text</div>";
 		$contact_link = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a> -";
-		$main_links_html = empty($main_links) ? "" : preg_replace(shm-clink, mdl-navigation__link, $main_links);
+		$main_links_html = empty($main_links) ? "" : preg_replace("shm-clink", "mdl-navigation__link", $main_links);
 		$search_html = "
 			<div class='mdl-grid'>
 				<div class='mdl-layout-spacer'></div>

From 0b74b5630f309d0d3818518134d93b6bc330aa08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Wed, 6 Jan 2016 15:14:33 +0100
Subject: [PATCH 028/250] How to regex

---
 themes/material/home.theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index ad5949beb..e2aff9594 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -29,7 +29,7 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 		$message_html = empty($main_text)     ? "" : "<div class='space' id='message'>$main_text</div>";
 		$counter_html = empty($counter_text)  ? "" : "<div class='mdl-typography--text-center' id='counter'>$counter_text</div>";
 		$contact_link = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a> -";
-		$main_links_html = empty($main_links) ? "" : preg_replace("shm-clink", "mdl-navigation__link", $main_links);
+		$main_links_html = empty($main_links) ? "" : preg_replace("/shm-clink/", "/mdl-navigation__link/", $main_links);
 		$search_html = "
 			<div class='mdl-grid'>
 				<div class='mdl-layout-spacer'></div>

From f2af07e3d1af08fc157cf26839eeb3532b992375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Wed, 6 Jan 2016 15:22:38 +0100
Subject: [PATCH 029/250] O.o why didn't that work?

---
 themes/material/home.theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index e2aff9594..e1be42308 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -29,7 +29,7 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 		$message_html = empty($main_text)     ? "" : "<div class='space' id='message'>$main_text</div>";
 		$counter_html = empty($counter_text)  ? "" : "<div class='mdl-typography--text-center' id='counter'>$counter_text</div>";
 		$contact_link = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a> -";
-		$main_links_html = empty($main_links) ? "" : preg_replace("/shm-clink/", "/mdl-navigation__link/", $main_links);
+		$main_links_html = empty($main_links) ? "" : preg_replace("/shm-clink/g", "/mdl-navigation__link/", $main_links);
 		$search_html = "
 			<div class='mdl-grid'>
 				<div class='mdl-layout-spacer'></div>

From 8da4d73d82435e60491ad5a06955c1b9220fb7e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Wed, 6 Jan 2016 15:27:53 +0100
Subject: [PATCH 030/250] Online tool says this should work

---
 themes/material/home.theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index e1be42308..daace9260 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -29,7 +29,7 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 		$message_html = empty($main_text)     ? "" : "<div class='space' id='message'>$main_text</div>";
 		$counter_html = empty($counter_text)  ? "" : "<div class='mdl-typography--text-center' id='counter'>$counter_text</div>";
 		$contact_link = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a> -";
-		$main_links_html = empty($main_links) ? "" : preg_replace("/shm-clink/g", "/mdl-navigation__link/", $main_links);
+		$main_links_html = empty($main_links) ? "" : preg_replace('/shm-clink/', '/mdl-navigation__link/', $main_links);
 		$search_html = "
 			<div class='mdl-grid'>
 				<div class='mdl-layout-spacer'></div>

From a9a3af9a8825ab861854f158c640e53e50dab684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Wed, 6 Jan 2016 15:42:16 +0100
Subject: [PATCH 031/250] It works!!!!1!!!111!one111!!!

---
 themes/material/home.theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index daace9260..fc7fb8dc6 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -29,7 +29,7 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 		$message_html = empty($main_text)     ? "" : "<div class='space' id='message'>$main_text</div>";
 		$counter_html = empty($counter_text)  ? "" : "<div class='mdl-typography--text-center' id='counter'>$counter_text</div>";
 		$contact_link = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a> -";
-		$main_links_html = empty($main_links) ? "" : preg_replace('/shm-clink/', '/mdl-navigation__link/', $main_links);
+		$main_links_html = empty($main_links) ? "" : preg_replace('/shm-clink/', 'mdl-navigation__link', $main_links);
 		$search_html = "
 			<div class='mdl-grid'>
 				<div class='mdl-layout-spacer'></div>

From ac264c4040c121d3085f2c5f4cd71b2193a4f8ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Wed, 6 Jan 2016 23:21:55 +0100
Subject: [PATCH 032/250] Stylesheet and js not from other hosts anymore

---
 themes/material/home.theme.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index fc7fb8dc6..5958aba11 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -12,12 +12,13 @@ public function display_page(Page $page, $sitename, $base_href, $theme_name, $bo
 		<title>$sitename</title>
 		<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en">
+    	<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons"  rel="stylesheet">
+    	<link rel="stylesheet" href="{$data_href}/themes/{$theme_name}/material.min.css"  rel="stylesheet">
 		$hh
+		<script type="text/javascript" src="{$data_href}/themes/{$theme_name}/material.min.js"></script>
 	</head>
 	<body>
-		<link rel="stylesheet" href="https://storage.googleapis.com/code.getmdl.io/1.0.6/material.indigo-pink.min.css">
-		<script src="https://storage.googleapis.com/code.getmdl.io/1.0.6/material.min.js"></script>
-		<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
 		$body
 	</body>
 </html>

From 2cd649b719413e1a965dcc3bd3a4c22c0d169b6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Thu, 7 Jan 2016 13:13:50 +0100
Subject: [PATCH 033/250] That's what I get for copiying and pasting

---
 themes/material/home.theme.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index 5958aba11..41ea1ef0f 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -14,9 +14,9 @@ public function display_page(Page $page, $sitename, $base_href, $theme_name, $bo
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 		<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en">
     	<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons"  rel="stylesheet">
-    	<link rel="stylesheet" href="{$data_href}/themes/{$theme_name}/material.min.css"  rel="stylesheet">
+    	<link rel="stylesheet" href="{$base_href}/themes/{$theme_name}/material.min.css"  rel="stylesheet">
 		$hh
-		<script type="text/javascript" src="{$data_href}/themes/{$theme_name}/material.min.js"></script>
+		<script type="text/javascript" src="{$base_href}/themes/{$theme_name}/material.min.js"></script>
 	</head>
 	<body>
 		$body

From ba66f653d6d57dcda592064943aac163e5d2b3e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Fri, 8 Jan 2016 10:22:58 +0100
Subject: [PATCH 034/250] Removes data-clink-sel="" in the sidebar links It's
 unused as far as I can see

---
 themes/material/home.theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index 41ea1ef0f..a0cdf0eb3 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -30,7 +30,7 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 		$message_html = empty($main_text)     ? "" : "<div class='space' id='message'>$main_text</div>";
 		$counter_html = empty($counter_text)  ? "" : "<div class='mdl-typography--text-center' id='counter'>$counter_text</div>";
 		$contact_link = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a> -";
-		$main_links_html = empty($main_links) ? "" : preg_replace('/shm-clink/', 'mdl-navigation__link', $main_links);
+		$main_links_html = empty($main_links) ? "" : preg_replace('data-clink-sel="" ','', preg_replace('/shm-clink/', 'mdl-navigation__link', $main_links));
 		$search_html = "
 			<div class='mdl-grid'>
 				<div class='mdl-layout-spacer'></div>

From 92350251651c5c4ccf60bbea37293d84101d6535 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 24 Jan 2016 09:56:47 +0000
Subject: [PATCH 035/250] fix integrity constraint violations when
 mass-editting an image that already contains the new tag

---
 ext/tag_edit/main.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ext/tag_edit/main.php b/ext/tag_edit/main.php
index 12be5ab71..d6ac16bda 100644
--- a/ext/tag_edit/main.php
+++ b/ext/tag_edit/main.php
@@ -367,6 +367,9 @@ private function mass_tag_edit($search, $replace) {
 					$after[] = $tag;
 				}
 
+				// replace'd tag may already exist in tag set, so remove dupes to avoid integrity constraint violations.
+				$after = array_unique($after);
+
 				$image->set_tags($after);
 
 				$last_id = $image->id;

From 898bcfae94c06e2f6c3872fd88e5a621609de676 Mon Sep 17 00:00:00 2001
From: Matthew Barbour <sanmadjack@gmail.com>
Date: Mon, 21 Mar 2016 18:14:48 -0500
Subject: [PATCH 036/250] Fixes for bulk add results

---
 ext/bulk_add/main.php  | 6 +++++-
 ext/bulk_add/theme.php | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ext/bulk_add/main.php b/ext/bulk_add/main.php
index bb0d73b7b..fa5325262 100644
--- a/ext/bulk_add/main.php
+++ b/ext/bulk_add/main.php
@@ -32,7 +32,11 @@ public function onPageRequest(PageRequestEvent $event) {
 				set_time_limit(0);
 				$bae = new BulkAddEvent($_POST['dir']);
 				send_event($bae);
-				if(strlen($bae->results) > 0) {
+				if(is_array($bae->results)) {
+					foreach($bae->results as $result) {
+						 $this->theme->add_status("Adding files", $result);
+					}
+				} else if(strlen($bae->results) > 0) {
 					$this->theme->add_status("Adding files", $bae->results);
 				}
 				$this->theme->display_upload_results($page);
diff --git a/ext/bulk_add/theme.php b/ext/bulk_add/theme.php
index 02a31d137..99ed1754e 100644
--- a/ext/bulk_add/theme.php
+++ b/ext/bulk_add/theme.php
@@ -12,9 +12,9 @@ public function display_upload_results(Page $page) {
 		$page->add_block(new NavBlock());
 		$html = "";
 		foreach($this->messages as $block) {
-			$html .= "<br/>" . html_escape($html);
+			$html .= "<br/>" . $block->body;
 		}
-		$page->add_block(new Block("Results", $block));
+		$page->add_block(new Block("Results", $html));
 	}
 
 	/*

From 32dbdccd0041c11e7e26d1ad2bbcfec4fb0e9566 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Tue, 10 May 2016 21:15:50 +0100
Subject: [PATCH 037/250] has_children uses Y/N, not TRUE/FALSE

---
 core/basethemelet.class.php   | 2 +-
 ext/relatationships/main.php  | 4 ++--
 ext/relatationships/theme.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/basethemelet.class.php b/core/basethemelet.class.php
index 9bfb1a18b..68678e067 100644
--- a/core/basethemelet.class.php
+++ b/core/basethemelet.class.php
@@ -67,7 +67,7 @@ public function build_thumb_html(Image $image) {
 		$custom_classes = "";
 		if(class_exists("Relationships")){
 			if(property_exists($image, 'parent_id') && $image->parent_id !== NULL){	$custom_classes .= "shm-thumb-has_parent ";	}
-			if(property_exists($image, 'has_children') && $image->has_children == TRUE){ $custom_classes .= "shm-thumb-has_child "; }
+			if(property_exists($image, 'has_children') && $image->has_children == 'Y'){ $custom_classes .= "shm-thumb-has_child "; }
 		}
 
 		return "<a href='$h_view_link' class='thumb shm-thumb shm-thumb-link {$custom_classes}' data-tags='$h_tags' data-post-id='$i_id'>".
diff --git a/ext/relatationships/main.php b/ext/relatationships/main.php
index 8ecc69912..5bbfe0b01 100644
--- a/ext/relatationships/main.php
+++ b/ext/relatationships/main.php
@@ -25,7 +25,7 @@ public function onInitExt(InitExtEvent $event) {
 
 	public function onImageInfoSet(ImageInfoSetEvent $event) {
 		if(isset($_POST['tag_edit__tags']) ? !preg_match('/parent[=|:]/', $_POST["tag_edit__tags"]) : TRUE) { //Ignore tag_edit__parent if tags contain parent metatag
-			if (isset($_POST["tag_edit__parent"]) ? ctype_digit($_POST["tag_edit__parent"]) : FALSE) {
+			if(isset($_POST["tag_edit__parent"]) ? ctype_digit($_POST["tag_edit__parent"]) : FALSE) {
 				$this->set_parent($event->image->id, (int) $_POST["tag_edit__parent"]);
 			}else{
 				$this->remove_parent($event->image->id);
@@ -83,7 +83,7 @@ public function onImageInfoBoxBuilding(ImageInfoBoxBuildingEvent $event) {
 	public function onImageDeletion(ImageDeletionEvent $event) {
 		global $database;
 
-		if($event->image->has_children){
+		if($event->image->has_children == 'Y'){
 			$database->execute("UPDATE images SET parent_id = NULL WHERE parent_id = :iid", array("iid"=>$event->image->id));
 		}
 
diff --git a/ext/relatationships/theme.php b/ext/relatationships/theme.php
index 39018ae36..05e8a286d 100644
--- a/ext/relatationships/theme.php
+++ b/ext/relatationships/theme.php
@@ -12,7 +12,7 @@ public function relationship_info($image) {
 			$page->add_block(new Block(null, "This post belongs to a $a.", "main", 5));
 		}
 
-		if($image->has_children == TRUE){
+		if($image->has_children == 'Y'){
 			$ids = $database->get_col("SELECT id FROM images WHERE parent_id = :iid", array("iid"=>$image->id));
 
 			$html = "This post has <a href='".make_link('post/list/parent='.$image->id.'/1')."'>".(count($ids) > 1 ? "child posts" : "a child post")."</a>";

From a3296e18ae6ab08cb895f3b3b6650a14d5d1e50a Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Wed, 11 May 2016 14:49:22 +0100
Subject: [PATCH 038/250] create index for has_children

---
 ext/relatationships/main.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ext/relatationships/main.php b/ext/relatationships/main.php
index 5bbfe0b01..90875300a 100644
--- a/ext/relatationships/main.php
+++ b/ext/relatationships/main.php
@@ -21,6 +21,12 @@ public function onInitExt(InitExtEvent $event) {
 			$config->set_int("ext_relationships_version", 1);
 			log_info("relationships", "extension installed");
 		}
+		if ($config->get_int("ext_relationships_version") < 2){
+			$database->execute("CREATE INDEX images__has_children ON images(has_children)");
+
+			$config->set_int("ext_relationships_version", 2);
+			log_info("relationships", "extension updated");
+		}
 	}
 
 	public function onImageInfoSet(ImageInfoSetEvent $event) {

From 3e57f725d3e053b629945c246681546060f8e1de Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 22 May 2016 16:12:13 +0100
Subject: [PATCH 039/250] update ban message

---
 ext/ipban/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ipban/main.php b/ext/ipban/main.php
index b3f01a255..4a38e75f0 100644
--- a/ext/ipban/main.php
+++ b/ext/ipban/main.php
@@ -224,7 +224,7 @@ private function block(/*string*/ $remote) {
 
 				$contact_link = $config->get_string("contact_link");
 				if(!empty($contact_link)) {
-					print "<p><a href='$contact_link'>Contact The Admin</a>";
+					print "<p><a href='$contact_link'>Contact the staff (be sure to include this message)</a>";
 				}
 				exit;
 			}

From 536cba980a84ada299a3957a763fcc1f97c8837f Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 22 May 2016 16:13:38 +0100
Subject: [PATCH 040/250] update footer date

---
 themes/danbooru/layout.class.php  | 2 +-
 themes/danbooru2/layout.class.php | 2 +-
 themes/default/layout.class.php   | 2 +-
 themes/futaba/layout.class.php    | 2 +-
 themes/lite/layout.class.php      | 2 +-
 themes/warm/layout.class.php      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/themes/danbooru/layout.class.php b/themes/danbooru/layout.class.php
index 521ecf3ce..ece8afdae 100644
--- a/themes/danbooru/layout.class.php
+++ b/themes/danbooru/layout.class.php
@@ -229,7 +229,7 @@ public function display_page($page) {
 			<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> &copy;
 			<a href="http://www.shishnet.org/">Shish</a> &amp;
 			<a href="https://github.com/shish/shimmie2/graphs/contributors">The Team</a>
-			2007-2014,
+			2007-2016,
 			based on the Danbooru concept.
 			$debug
 			$contact
diff --git a/themes/danbooru2/layout.class.php b/themes/danbooru2/layout.class.php
index 4f459893b..f53928ebe 100644
--- a/themes/danbooru2/layout.class.php
+++ b/themes/danbooru2/layout.class.php
@@ -255,7 +255,7 @@ public function display_page($page) {
 			<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> &copy;
 			<a href="http://www.shishnet.org/">Shish</a> &amp;
 			<a href="https://github.com/shish/shimmie2/graphs/contributors">The Team</a>
-			2007-2014,
+			2007-2016,
 			based on the Danbooru concept<br />
 			$debug
 			$contact
diff --git a/themes/default/layout.class.php b/themes/default/layout.class.php
index e4bf2de20..2bb9d752f 100644
--- a/themes/default/layout.class.php
+++ b/themes/default/layout.class.php
@@ -85,7 +85,7 @@ public function display_page(Page $page) {
 			<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> &copy;
 			<a href="http://www.shishnet.org/">Shish</a> &amp;
 			<a href="https://github.com/shish/shimmie2/graphs/contributors">The Team</a>
-			2007-2014,
+			2007-2016,
 			based on the Danbooru concept.
 			$debug
 			$contact
diff --git a/themes/futaba/layout.class.php b/themes/futaba/layout.class.php
index 96440238f..25d77797c 100644
--- a/themes/futaba/layout.class.php
+++ b/themes/futaba/layout.class.php
@@ -90,7 +90,7 @@ function display_page(Page $page) {
 			<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> &copy;
 			<a href="http://www.shishnet.org/">Shish</a> &amp;
 			<a href="https://github.com/shish/shimmie2/graphs/contributors">The Team</a>
-			2007-2014,
+			2007-2016,
 			based on the Danbooru concept.
 			<br>Futaba theme based on 4chan's layout and CSS :3
 			$debug
diff --git a/themes/lite/layout.class.php b/themes/lite/layout.class.php
index fe2fc5e99..0081bdbae 100644
--- a/themes/lite/layout.class.php
+++ b/themes/lite/layout.class.php
@@ -198,7 +198,7 @@ public function display_page(Page $page) {
 			<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> &copy;
 			<a href="http://www.shishnet.org/">Shish</a> &amp;
 			<a href="https://github.com/shish/shimmie2/graphs/contributors">The Team</a>
-			2007-2014,
+			2007-2016,
 			based on the Danbooru concept.<br />
 			Lite Theme by <a href="http://seemslegit.com">Zach</a>
 			$debug
diff --git a/themes/warm/layout.class.php b/themes/warm/layout.class.php
index 79a980f7b..8416d891d 100644
--- a/themes/warm/layout.class.php
+++ b/themes/warm/layout.class.php
@@ -101,7 +101,7 @@ public function display_page(Page $page) {
 			<a href="http://code.shishnet.org/shimmie2/">Shimmie</a> &copy;
 			<a href="http://www.shishnet.org/">Shish</a> &amp;
 			<a href="https://github.com/shish/shimmie2/graphs/contributors">The Team</a>
-			2007-2014,
+			2007-2016,
 			based on the Danbooru concept.
 			$debug
 			$contact

From 44876a58d976669dc0e16fe4f9e689a1d4cdd470 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 22 May 2016 16:17:31 +0100
Subject: [PATCH 041/250] we should be using bool_escape instead...

---
 core/basethemelet.class.php   | 2 +-
 ext/relatationships/main.php  | 2 +-
 ext/relatationships/theme.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/basethemelet.class.php b/core/basethemelet.class.php
index 68678e067..de23c99b0 100644
--- a/core/basethemelet.class.php
+++ b/core/basethemelet.class.php
@@ -67,7 +67,7 @@ public function build_thumb_html(Image $image) {
 		$custom_classes = "";
 		if(class_exists("Relationships")){
 			if(property_exists($image, 'parent_id') && $image->parent_id !== NULL){	$custom_classes .= "shm-thumb-has_parent ";	}
-			if(property_exists($image, 'has_children') && $image->has_children == 'Y'){ $custom_classes .= "shm-thumb-has_child "; }
+			if(property_exists($image, 'has_children') && bool_escape($image->has_children)){ $custom_classes .= "shm-thumb-has_child "; }
 		}
 
 		return "<a href='$h_view_link' class='thumb shm-thumb shm-thumb-link {$custom_classes}' data-tags='$h_tags' data-post-id='$i_id'>".
diff --git a/ext/relatationships/main.php b/ext/relatationships/main.php
index 90875300a..e81aefbb5 100644
--- a/ext/relatationships/main.php
+++ b/ext/relatationships/main.php
@@ -89,7 +89,7 @@ public function onImageInfoBoxBuilding(ImageInfoBoxBuildingEvent $event) {
 	public function onImageDeletion(ImageDeletionEvent $event) {
 		global $database;
 
-		if($event->image->has_children == 'Y'){
+		if(bool_escape($event->image->has_children)){
 			$database->execute("UPDATE images SET parent_id = NULL WHERE parent_id = :iid", array("iid"=>$event->image->id));
 		}
 
diff --git a/ext/relatationships/theme.php b/ext/relatationships/theme.php
index 05e8a286d..abc4302e4 100644
--- a/ext/relatationships/theme.php
+++ b/ext/relatationships/theme.php
@@ -12,7 +12,7 @@ public function relationship_info($image) {
 			$page->add_block(new Block(null, "This post belongs to a $a.", "main", 5));
 		}
 
-		if($image->has_children == 'Y'){
+		if(bool_escape($image->has_children)){
 			$ids = $database->get_col("SELECT id FROM images WHERE parent_id = :iid", array("iid"=>$image->id));
 
 			$html = "This post has <a href='".make_link('post/list/parent='.$image->id.'/1')."'>".(count($ids) > 1 ? "child posts" : "a child post")."</a>";

From 3b171ffc5a1c0a2a04c912d6fc455afca21d20de Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 21 May 2016 07:42:17 +0100
Subject: [PATCH 042/250] fix single tag wildcard searches returning duplicate
 results if image has more than one match

---
 core/imageboard.pack.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 1d8365f70..308faf2ae 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -1038,12 +1038,14 @@ private static function build_ugly_search_querylet($terms) {
 		else if($positive_tag_count === 1 && $negative_tag_count === 0) {
 			// MySQL is braindead, and does a full table scan on images, running the subquery once for each row -_-
 			// "{$this->get_images} WHERE images.id IN (SELECT image_id FROM tags WHERE tag LIKE ?) ",
+			$group_by = ((strpos($tag_search->variables['tag0'], '%') !== FALSE) ? "GROUP BY images.id" : "");
 			$query = new Querylet("
 				SELECT images.*
 				FROM images
 				JOIN image_tags ON images.id=image_tags.image_id
 				JOIN tags ON image_tags.tag_id=tags.id
 				WHERE tag LIKE :tag0
+				{$group_by}
 			", $tag_search->variables);
 
 			if(!empty($img_search->sql)) {

From 61acb24875e3d9a9897246b819d03aa10f20a16f Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 22 May 2016 18:35:37 +0100
Subject: [PATCH 043/250] fixes #547 -> multi-tag searches not working with
 wildcard when wildcard matches more than 1 tag is there a better way to do
 this?

---
 core/imageboard.pack.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 308faf2ae..377ae7232 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -985,6 +985,7 @@ private static function build_ugly_search_querylet($terms) {
 		$img_querylets = self::parse_meta_terms($terms);
 		$positive_tag_count = 0;
 		$negative_tag_count = 0;
+		$wildcard_count     = 0;
 
 		$terms = Tag::resolve_aliases($terms);
 
@@ -1012,6 +1013,8 @@ private static function build_ugly_search_querylet($terms) {
 					$tag_querylets[] = new TagQuerylet($term, !$negative);
 				}
 			}
+
+			if(strpos($term, '%') !== FALSE) $wildcard_count++;
 		}
 
 		// merge all the tag querylets into one generic one
@@ -1019,7 +1022,13 @@ private static function build_ugly_search_querylet($terms) {
 		$terms = array();
 		foreach($tag_querylets as $tq) {
 			$sign = $tq->positive ? "+" : "-";
-			$sql .= ' '.$sign.' (tag LIKE :tag'.Image::$tag_n.')';
+
+			if(!$wildcard_count) {
+				$sql .= ' '.$sign.' (tag LIKE :tag'.Image::$tag_n.')';
+			} else {
+				$sql .= ' '.$sign.' IF(SUM(tag LIKE :tag'.Image::$tag_n.'), 1, 0)';
+			}
+
 			$terms['tag'.Image::$tag_n] = $tq->tag;
 			Image::$tag_n++;
 
@@ -1038,7 +1047,7 @@ private static function build_ugly_search_querylet($terms) {
 		else if($positive_tag_count === 1 && $negative_tag_count === 0) {
 			// MySQL is braindead, and does a full table scan on images, running the subquery once for each row -_-
 			// "{$this->get_images} WHERE images.id IN (SELECT image_id FROM tags WHERE tag LIKE ?) ",
-			$group_by = ((strpos($tag_search->variables['tag0'], '%') !== FALSE) ? "GROUP BY images.id" : "");
+			$group_by = (!$wildcard_count ? "" : "GROUP BY images.id");
 			$query = new Querylet("
 				SELECT images.*
 				FROM images
@@ -1076,8 +1085,9 @@ private static function build_ugly_search_querylet($terms) {
 			if($tags_ok) {
 				$tag_id_list = join(', ', $tag_id_array);
 
+				$sum = (!$wildcard_count ? "SUM" : "");
 				$subquery = new Querylet('
-					SELECT images.*, SUM('.$tag_search->sql.') AS score
+					SELECT images.*, '.$sum.'('.$tag_search->sql.') AS score
 					FROM images
 					LEFT JOIN image_tags ON image_tags.image_id = images.id
 					JOIN tags ON image_tags.tag_id = tags.id

From aeeaabb22e87b605d8a11660e50d6e9e02595ef6 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Mon, 6 Jun 2016 12:12:25 +0100
Subject: [PATCH 044/250] allow both http: and mailto: contact links

---
 core/util.inc.php                 | 25 +++++++++++++++++++++++++
 ext/home/main.php                 |  2 +-
 ext/home/theme.php                |  2 +-
 ext/ipban/main.php                |  2 +-
 themes/danbooru/layout.class.php  |  4 ++--
 themes/danbooru2/layout.class.php |  4 ++--
 themes/default/layout.class.php   |  4 ++--
 themes/futaba/layout.class.php    |  4 ++--
 themes/lite/layout.class.php      |  4 ++--
 themes/material/layout.class.php  |  4 ++--
 themes/warm/layout.class.php      |  4 ++--
 11 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/core/util.inc.php b/core/util.inc.php
index 11aa9ae09..c64509970 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -591,6 +591,31 @@ function zglob($pattern) {
 	}
 }
 
+/**
+ * Gets contact link as mailto: or http:
+ */
+function contact_link() {
+	global $config;
+	$text = $config->get_string('contact_link');
+	if(
+		startsWith($text, "http:") ||
+		startsWith($text, "https:") ||
+		startsWith($text, "mailto:")
+	) {
+		return $text;
+	}
+
+	if(strpos($text, "@")) {
+		return "mailto:$text";
+	}
+
+	if(strpos($text, "/")) {
+		return "http://$text";
+	}
+
+	return $text;
+}
+
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * CAPTCHA abstraction                                                       *
diff --git a/ext/home/main.php b/ext/home/main.php
index fb1269db2..566c1d6e3 100644
--- a/ext/home/main.php
+++ b/ext/home/main.php
@@ -49,7 +49,7 @@ private function get_body() {
 		global $config;
 		$base_href = get_base_href();
 		$sitename = $config->get_string('title');
-	    $contact_link = $config->get_string('contact_link');
+	    $contact_link = contact_link();
 		$counter_dir = $config->get_string('home_counter', 'default');
 
 		$total = Image::count_images();
diff --git a/ext/home/theme.php b/ext/home/theme.php
index e34b8ca40..6c51c73d4 100644
--- a/ext/home/theme.php
+++ b/ext/home/theme.php
@@ -37,7 +37,7 @@ public function build_body(/*string*/ $sitename, /*string*/ $main_links, /*strin
 		$main_links_html = empty($main_links) ? "" : "<div class='space' id='links'>$main_links</div>";
 		$message_html = empty($main_text)     ? "" : "<div class='space' id='message'>$main_text</div>";
 		$counter_html = empty($counter_text)  ? "" : "<div class='space' id='counter'>$counter_text</div>";
-		$contact_link = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a> &ndash;";
+		$contact_link = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a> &ndash;";
 		$search_html = "
 			<div class='space' id='search'>
 				<form action='".make_link("post/list")."' method='GET'>
diff --git a/ext/ipban/main.php b/ext/ipban/main.php
index b3f01a255..2c96d536a 100644
--- a/ext/ipban/main.php
+++ b/ext/ipban/main.php
@@ -222,7 +222,7 @@ private function block(/*string*/ $remote) {
 				print "IP <b>$ip</b> has been banned until <b>$date</b> by <b>{$admin->name}</b> because of <b>$reason</b>\n";
 				print "<p>If you couldn't possibly be guilty of what you're banned for, the person we banned probably had a dynamic IP address and so do you. See <a href='http://whatismyipaddress.com/dynamic-static'>http://whatismyipaddress.com/dynamic-static</a> for more information.\n";
 
-				$contact_link = $config->get_string("contact_link");
+				$contact_link = contact_link();
 				if(!empty($contact_link)) {
 					print "<p><a href='$contact_link'>Contact The Admin</a>";
 				}
diff --git a/themes/danbooru/layout.class.php b/themes/danbooru/layout.class.php
index 521ecf3ce..7ad90f2ea 100644
--- a/themes/danbooru/layout.class.php
+++ b/themes/danbooru/layout.class.php
@@ -49,7 +49,7 @@ public function display_page($page) {
 		$theme_name = $config->get_string('theme');
 		//$base_href = $config->get_string('base_href');
 		$data_href = get_base_href();
-		$contact_link = $config->get_string('contact_link');
+		$contact_link = contact_link();
 
 
 		$header_html = "";
@@ -88,7 +88,7 @@ public function display_page($page) {
 
 		$debug = get_debug_info();
 
-		$contact = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a>";
+		$contact = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a>";
 
 		if(empty($this->subheading)) {
 			$subheading = "";
diff --git a/themes/danbooru2/layout.class.php b/themes/danbooru2/layout.class.php
index 4f459893b..ffc007312 100644
--- a/themes/danbooru2/layout.class.php
+++ b/themes/danbooru2/layout.class.php
@@ -49,7 +49,7 @@ public function display_page($page) {
 		//$theme_name = $config->get_string('theme');
 		//$base_href = $config->get_string('base_href');
 		//$data_href = get_base_href();
-		$contact_link = $config->get_string('contact_link');
+		$contact_link = contact_link();
 
 
 		$header_html = "";
@@ -88,7 +88,7 @@ public function display_page($page) {
 
 		$debug = get_debug_info();
 
-		$contact = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a>";
+		$contact = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a>";
 
 		if(empty($this->subheading)) {
 			$subheading = "";
diff --git a/themes/default/layout.class.php b/themes/default/layout.class.php
index e4bf2de20..a8c8ac7c0 100644
--- a/themes/default/layout.class.php
+++ b/themes/default/layout.class.php
@@ -13,7 +13,7 @@ public function display_page(Page $page) {
 
 		//$theme_name = $config->get_string('theme', 'default');
 		//$data_href = get_base_href();
-		$contact_link = $config->get_string('contact_link');
+		$contact_link = contact_link();
 
 		$header_html = "";
 		ksort($page->html_headers);
@@ -44,7 +44,7 @@ public function display_page(Page $page) {
 
 		$debug = get_debug_info();
 
-		$contact = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a>";
+		$contact = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a>";
 
 		$wrapper = "";
 		if(strlen($page->heading) > 100) {
diff --git a/themes/futaba/layout.class.php b/themes/futaba/layout.class.php
index 96440238f..350f5dc7d 100644
--- a/themes/futaba/layout.class.php
+++ b/themes/futaba/layout.class.php
@@ -6,7 +6,7 @@ function display_page(Page $page) {
 
 		$theme_name = $config->get_string('theme', 'default');
 		$data_href = get_base_href();
-		$contact_link = $config->get_string('contact_link');
+		$contact_link = contact_link();
 
 		$header_html = "";
 		ksort($page->html_headers);
@@ -37,7 +37,7 @@ function display_page(Page $page) {
 
 		$debug = get_debug_info();
 
-		$contact = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a>";
+		$contact = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a>";
 
 		if(empty($page->subheading)) {
 			$subheading = "";
diff --git a/themes/lite/layout.class.php b/themes/lite/layout.class.php
index fe2fc5e99..0ce85a657 100644
--- a/themes/lite/layout.class.php
+++ b/themes/lite/layout.class.php
@@ -20,7 +20,7 @@ public function display_page(Page $page) {
 		$theme_name = $config->get_string('theme', 'lite');
 		$site_name = $config->get_string('title');
 		$data_href = get_base_href();
-		$contact_link = $config->get_string('contact_link');
+		$contact_link = contact_link();
 
 		$header_html = "";
 		ksort($page->html_headers);
@@ -152,7 +152,7 @@ public function display_page(Page $page) {
 
 		$debug = get_debug_info();
 
-		$contact = empty($contact_link) ? "" : "<br><a href='mailto:{$contact_link}'>Contact</a>";
+		$contact = empty($contact_link) ? "" : "<br><a href='{$contact_link}'>Contact</a>";
 		//$subheading = empty($page->subheading) ? "" : "<div id='subtitle'>{$page->subheading}</div>";
 
 		/*$wrapper = "";
diff --git a/themes/material/layout.class.php b/themes/material/layout.class.php
index 5d88d9650..d2431c9b8 100644
--- a/themes/material/layout.class.php
+++ b/themes/material/layout.class.php
@@ -13,7 +13,7 @@ public function display_page(Page $page) {
 		$site_name = $config->get_string('title');
 		$data_href = get_base_href();
 		$main_page = $config->get_string('main_page');
-		$contact_link = $config->get_string('contact_link');
+		$contact_link = contact_link();
     $site_link = make_link();
 
 		$header_html = "";
@@ -86,7 +86,7 @@ public function display_page(Page $page) {
 
 		$debug = get_debug_info();
 
-		$contact = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a>";
+		$contact = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a>";
 		/*$subheading = empty($page->subheading) ? "" : "<div id='subtitle'>{$page->subheading}</div>";
 
 		$wrapper = "";
diff --git a/themes/warm/layout.class.php b/themes/warm/layout.class.php
index 79a980f7b..4458ccfce 100644
--- a/themes/warm/layout.class.php
+++ b/themes/warm/layout.class.php
@@ -15,7 +15,7 @@ public function display_page(Page $page) {
 		$site_name = $config->get_string('title');
 		$data_href = get_base_href();
 		$main_page = $config->get_string('main_page');
-		$contact_link = $config->get_string('contact_link');
+		$contact_link = contact_link();
 
 		$header_html = "";
 		ksort($page->html_headers);
@@ -50,7 +50,7 @@ public function display_page(Page $page) {
 
 		$debug = get_debug_info();
 
-		$contact = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a>";
+		$contact = empty($contact_link) ? "" : "<br><a href='$contact_link'>Contact</a>";
 		/*$subheading = empty($page->subheading) ? "" : "<div id='subtitle'>{$page->subheading}</div>";
 
 		$wrapper = "";

From c41c9d680f4c949700fe73c7f8b1b4b69babd536 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Mon, 6 Jun 2016 11:57:54 +0100
Subject: [PATCH 045/250] search tests

---
 ext/index/test.php  | 180 +++++++++++++++++++++++++++++++-------------
 tests/bootstrap.php |  12 ++-
 2 files changed, 137 insertions(+), 55 deletions(-)

diff --git a/ext/index/test.php b/ext/index/test.php
index a53cdc283..3228556b8 100644
--- a/ext/index/test.php
+++ b/ext/index/test.php
@@ -1,5 +1,18 @@
 <?php
 class IndexTest extends ShimmiePHPUnitTestCase {
+	private function upload() {
+		$this->log_in_as_user();
+		$image_id_1 = $this->post_image("tests/pbx_screenshot.jpg", "thing computer screenshot pbx phone");
+		$image_id_2 = $this->post_image("tests/bedroom_workshop.jpg", "thing computer computing bedroom workshop");
+		$this->log_out();
+
+		# make sure both uploads were ok
+		$this->assertTrue($image_id_1 > 0);
+		$this->assertTrue($image_id_2 > 0);
+
+		return array($image_id_1, $image_id_2);
+	}
+
 	public function testIndexPage() {
 		$this->get_page('post/list');
 		$this->assert_title("Welcome to Shimmie ".VERSION);
@@ -24,85 +37,146 @@ public function testIndexPage() {
 		$this->assert_title("Shimmie");
 
 		$this->get_page('post/list/99999');
-		$this->assert_title("No Images Found");
+		$this->assert_response(404);
+	}
+
+	/* * * * * * * * * * *
+	* Tag Search         *
+	* * * * * * * * * * */
+	public function testTagSearchNoResults() {
+		$image_ids = $this->upload();
 
-		# FIXME: test search box
+		$this->get_page('post/list/maumaumau/1');
+		$this->assert_response(404);
 	}
 
-	public function testSearches() {
-		$this->log_in_as_user();
-		$image_id_1 = $this->post_image("tests/pbx_screenshot.jpg", "pbx computer screenshot");
-		$image_id_2 = $this->post_image("tests/bedroom_workshop.jpg", "computer bedroom workshop");
-		$this->log_out();
+	public function testTagSearchOneResult() {
+		$image_ids = $this->upload();
 
-		# make sure both uploads were ok
-		$this->assertTrue($image_id_1 > 0);
-		$this->assertTrue($image_id_2 > 0);
+		$this->get_page("post/list/pbx/1");
+		$this->assert_response(302);
+	}
 
-		# regular tag, no results
-		$this->get_page('post/list/maumaumau/1');
-		$this->assert_title("No Images Found");
+	public function testTagSearchManyResults() {
+		$image_ids = $this->upload();
 
-		# regular tag, many results
 		$this->get_page('post/list/computer/1');
+		$this->assert_response(200);
 		$this->assert_title("computer");
-		$this->assert_no_text("No Images Found");
+	}
 
-		# meta tag, many results
-		$this->get_page('post/list/size=640x480/1');
-		$this->assert_title("size=640x480");
-		$this->assert_no_text("No Images Found");
+	/* * * * * * * * * * *
+	* Multi-Tag Search   *
+	* * * * * * * * * * */
+	public function testMultiTagSearchNoResults() {
+		$image_ids = $this->upload();
+
+		# multiple tags, one of which doesn't exist
+		# (test the "one tag doesn't exist = no hits" path)
+		$this->get_page('post/list/computer asdfasdfwaffle/1');
+		$this->assert_response(404);
+	}
+
+	public function testMultiTagSearchOneResult() {
+		$image_ids = $this->upload();
+
+		$this->get_page('post/list/computer screenshot/1');
+		$this->assert_response(302);
+	}
+
+	public function testMultiTagSearchManyResults() {
+		$image_ids = $this->upload();
+
+		$this->get_page('post/list/computer thing/1');
+		$this->assert_response(200);
+	}
+
+	/* * * * * * * * * * *
+	* Meta Search        *
+	* * * * * * * * * * */
+	public function testMetaSearchNoResults() {
+		$this->get_page('post/list/hash=1234567890/1');
+		$this->assert_response(404);
+	}
+
+	public function testMetaSearchOneResult() {
+		$image_ids = $this->upload();
 
-		# meta tag, one result
 		$this->get_page("post/list/hash=feb01bab5698a11dd87416724c7a89e3/1");
-		//$this->assert_title(new PatternExpectation("/^Image $image_id_1: /"));
-		$this->assert_no_text("No Images Found");
+		$this->assert_response(302);
 
-		# meta tag, one result
 		$this->get_page("post/list/md5=feb01bab5698a11dd87416724c7a89e3/1");
-		//$this->assert_title(new PatternExpectation("/^Image $image_id_1: /"));
-		$this->assert_no_text("No Images Found");
+		$this->assert_response(302);
 
-		$this->markTestIncomplete();
+		$this->get_page("post/list/id={$image_ids[1]}/1");
+		$this->assert_response(302);
 
-		# multiple tags, many results
-		$this->get_page('post/list/computer%20size=640x480/1');
-		$this->assert_title("computer size=640x480");
-		$this->assert_no_text("No Images Found");
+		$this->get_page("post/list/filename=screenshot/1");
+		$this->assert_response(302);
 
-		# multiple tags, one of which doesn't exist
-		# (test the "one tag doesn't exist = no hits" path)
-		$this->get_page('post/list/computer%20asdfasdfwaffle/1');
-		$this->assert_text("No Images Found");
+	}
 
-		# multiple tags, single result; search with one result = direct to image
-		$this->get_page('post/list/screenshot%20computer/1');
-		//$this->assert_title(new PatternExpectation("/^Image $image_id_1: /"));
+	public function testMetaSearchManyResults() {
+		$image_ids = $this->upload();
+
+		$this->get_page('post/list/size=640x480/1');
+		$this->assert_response(200);
+
+		$this->get_page("post/list/tags=5/1");
+		$this->assert_response(200);
+
+		$this->get_page("post/list/ext=jpg/1");
+		$this->assert_response(200);
+	}
+
+	/* * * * * * * * * * *
+	* Wildcards          *
+	* * * * * * * * * * */
+	public function testWildSearch() {
+		$image_ids = $this->upload();
+
+		// Only the first image matches both the wildcard and the tag.
+		// This checks for https://github.com/shish/shimmie2/issues/547
+		// (comp* is expanded to "computer computing", then we searched
+		// for images which match two or more of the tags in
+		// "computer computing screenshot")
+		$this->get_page("post/list/comp* screenshot/1");
+		$this->assert_response(302);
+	}
+    
+	/* * * * * * * * * * *
+	* Mixed              *
+	* * * * * * * * * * */
+	public function testMixedSearchTagMeta() {
+		$image_ids = $this->upload();
+
+		# multiple tags, many results
+		$this->get_page('post/list/computer size=640x480/1');
+		$this->assert_response(200);
+	}
+	// tag + negative
+	// wildcards + ???
+
+	/* * * * * * * * * * *
+	* Other              *
+	* - negative tags    *
+	* - wildcards        *
+	* * * * * * * * * * */
+	public function testOther() {
+		$this->markTestIncomplete();
 
 		# negative tag, should have one result
-		$this->get_page('post/list/computer%20-pbx/1');
-		//$this->assert_title(new PatternExpectation("/^Image $image_id_2: /"));
+		$this->get_page('post/list/computer -pbx/1');
+		$this->assert_response(302);
 
 		# negative tag alone, should work
 		# FIXME: known broken in mysql
 		//$this->get_page('post/list/-pbx/1');
-		//$this->assert_title(new PatternExpectation("/^Image $image_id_2: /"));
+		//$this->assert_response(302);
 
 		# test various search methods
 		$this->get_page("post/list/bedroo*/1");
-		//$this->assert_title(new PatternExpectation("/^Image $image_id_2: /"));
-		$this->get_page("post/list/id=$image_id_1/1");
-		//$this->assert_title(new PatternExpectation("/^Image $image_id_1: /"));
-		$this->assert_no_text("No Images Found");
-		$this->get_page("post/list/filename=screenshot/1");
-		//$this->assert_title(new PatternExpectation("/^Image $image_id_1: /"));
-		$this->assert_no_text("No Images Found");
-		$this->get_page("post/list/tags=3/1");
-		$this->assert_title("tags=3");
-		$this->assert_no_text("No Images Found");
-		$this->get_page("post/list/ext=jpg/1");
-		$this->assert_title("ext=jpg");
-		$this->assert_no_text("No Images Found");
+		$this->assert_response(302);
 	}
 }
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 5b6b98270..30b7859cf 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -44,12 +44,20 @@ protected function get_page($page_name, $args=null) {
 		$_GET = $args;
 		$page = class_exists("CustomPage") ? new CustomPage() : new Page();
 		send_event(new PageRequestEvent($page_name));
+		if($page->mode == "redirect") {
+			$page->code = 302;
+		}
 	}
 
 	// page things
 	protected function assert_title($title) {
 		global $page;
-		$this->assertEquals($title, $page->title);
+		$this->assertContains($title, $page->title);
+	}
+
+	protected function assert_no_title($title) {
+		global $page;
+		$this->assertNotContains($title, $page->title);
 	}
 
 	protected function assert_response($code) {
@@ -59,7 +67,7 @@ protected function assert_response($code) {
 
 	protected function page_to_text($section=null) {
 		global $page;
-		$text = "";
+		$text = $page->title . "\n";
 		foreach($page->blocks as $block) {
 			if(is_null($section) || $section == $block->section) {
 				$text .= $block->header . "\n";

From 7f2609f727da3dbc68d8220b4e02e45500014bc2 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Tue, 7 Jun 2016 00:19:41 +0100
Subject: [PATCH 046/250] dedupe searching a bit

---
 core/imageboard.pack.php | 88 +++++++++++++++++-----------------------
 1 file changed, 37 insertions(+), 51 deletions(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 377ae7232..cd3c6c699 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -796,21 +796,6 @@ private static function build_img_search($img_querylets) {
 		return new Querylet($sql, $terms);
 	}
 
-	/**
-	 * @param Querylet $img_search
-	 * @return Querylet
-	 */
-	private static function build_simple_query($img_search) {
-		$query = new Querylet("SELECT images.* FROM images ");
-
-		if (!empty($img_search->sql)) {
-			$query->append_sql(" WHERE ");
-			$query->append($img_search);
-			return $query;
-		}
-		return $query;
-	}
-
 	/**
 	 * WARNING: this description is no longer accurate, though it does get across
 	 * the general idea - the actual method has a few extra optimisations
@@ -877,7 +862,11 @@ private static function build_accurate_search_querylet($terms) {
 
 		// no tags, do a simple search (+image metadata if we have any)
 		if($count_tag_querylets === 0) {
-			$query = self::build_simple_query($img_search);
+			$query = new Querylet("
+				SELECT images.*
+				FROM images
+				WHERE 1=1
+			");
 		}
 
 		// one positive tag (a common case), do an optimised search
@@ -889,11 +878,6 @@ private static function build_accurate_search_querylet($terms) {
 				JOIN tags ON image_tags.tag_id=tags.id
 				WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)
 			"), array("tag"=>$tag_querylets[0]->tag));
-
-			if(!empty($img_search->sql)) {
-				$query->append_sql(" AND ");
-				$query->append($img_search);
-			}
 		}
 
 		// more than one positive tag, or more than zero negative tags
@@ -902,30 +886,29 @@ private static function build_accurate_search_querylet($terms) {
 			$negative_tag_id_array = array();
 			$tags_ok = true;
 
-			foreach($tag_querylets as $tq) {
+			foreach ($tag_querylets as $tq) {
 				$tag_ids = $database->get_col(
 					$database->scoreql_to_sql("
 						SELECT id
 						FROM tags
 						WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)
-					"), array("tag"=>$tq->tag)
+					"), array("tag" => $tq->tag)
 				);
-				if($tq->positive) {
+				if ($tq->positive) {
 					$positive_tag_id_array = array_merge($positive_tag_id_array, $tag_ids);
 					$tags_ok = count($tag_ids) > 0;
-					if(!$tags_ok) break;
-				}
-				else {
+					if (!$tags_ok) break;
+				} else {
 					$negative_tag_id_array = array_merge($negative_tag_id_array, $tag_ids);
 				}
 			}
 
-			if($tags_ok) {
+			if ($tags_ok) {
 				$have_pos = count($positive_tag_id_array) > 0;
 				$have_neg = count($negative_tag_id_array) > 0;
 
 				$sql = "";
-				if($have_pos) {
+				if ($have_pos) {
 					$positive_tag_id_list = join(', ', $positive_tag_id_array);
 					$sql .= "
 						SELECT image_id
@@ -935,10 +918,10 @@ private static function build_accurate_search_querylet($terms) {
 						HAVING COUNT(image_id)>=$positive_tag_count
 					";
 				}
-				if($have_pos && $have_neg) {
+				if ($have_pos && $have_neg) {
 					$sql .= " EXCEPT ";
 				}
-				if($have_neg) {
+				if ($have_neg) {
 					$negative_tag_id_list = join(', ', $negative_tag_id_array);
 					$sql .= "
 						SELECT image_id
@@ -951,13 +934,7 @@ private static function build_accurate_search_querylet($terms) {
 					FROM images
 					WHERE images.id IN ($sql)
 				");
-
-				if(strlen($img_search->sql) > 0) {
-					$query->append_sql(" AND ");
-					$query->append($img_search);
-				}
-			}
-			else {
+			} else {
 				# one of the positive tags had zero results, therefor there
 				# can be no results; "where 1=0" should shortcut things
 				$query = new Querylet("
@@ -968,6 +945,12 @@ private static function build_accurate_search_querylet($terms) {
 			}
 		}
 
+		if (!empty($img_search->sql)) {
+			$query->append_sql(" AND ");
+			$query->append($img_search);
+			return $query;
+		}
+
 		return $query;
 	}
 
@@ -1040,7 +1023,11 @@ private static function build_ugly_search_querylet($terms) {
 
 		// no tags, do a simple search (+image metadata if we have any)
 		if($positive_tag_count + $negative_tag_count == 0) {
-			$query = self::build_simple_query($img_search);
+			$query = new Querylet("
+				SELECT images.*
+				FROM images
+				WHERE 1=1
+			");
 		}
 
 		// one positive tag (a common case), do an optimised search
@@ -1056,11 +1043,6 @@ private static function build_ugly_search_querylet($terms) {
 				WHERE tag LIKE :tag0
 				{$group_by}
 			", $tag_search->variables);
-
-			if(!empty($img_search->sql)) {
-				$query->append_sql(" AND ");
-				$query->append($img_search);
-			}
 		}
 
 		// more than one positive tag, and zero or more negative tags
@@ -1101,12 +1083,9 @@ private static function build_ugly_search_querylet($terms) {
 				);
 				$query = new Querylet('
 					SELECT *
-					FROM ('.$subquery->sql.') AS images ', $subquery->variables);
-
-				if(!empty($img_search->sql)) {
-					$query->append_sql(" WHERE ");
-					$query->append($img_search);
-				}
+					FROM ('.$subquery->sql.') AS images
+					WHERE 1=1
+				', $subquery->variables);
 			}
 			else {
 				# there are no results, "where 1=0" should shortcut things
@@ -1120,13 +1099,20 @@ private static function build_ugly_search_querylet($terms) {
 
 		//zero positive tags and one or more negative tags
 		//TODO: This isn't currently implemented. SEE: https://github.com/shish/shimmie2/issues/66
-		else{
+		else {
 			$query = new Querylet("
 				SELECT images.*
 				FROM images
 				WHERE 1=0
 			");
 		}
+
+		if (!empty($img_search->sql)) {
+			$query->append_sql(" AND ");
+			$query->append($img_search);
+			return $query;
+		}
+
 		Image::$tag_n = 0;
 		return $query;
 	}

From dc83d4ace72e55e2b70bf17f17d02cd5507f61ad Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Tue, 7 Jun 2016 01:34:38 +0100
Subject: [PATCH 047/250] lots of deduping for searching

---
 core/imageboard.pack.php | 475 +++++++++++++++++----------------------
 1 file changed, 203 insertions(+), 272 deletions(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index cd3c6c699..2105cae00 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -756,18 +756,16 @@ public function parse_link_template($tmpl, $_escape="url_escape") {
 	private static function build_search_querylet($terms) {
 		assert('is_array($terms)');
 		global $database;
-		if($database->get_driver_name() === "mysql")
-			return Image::build_ugly_search_querylet($terms);
-		else
-			return Image::build_accurate_search_querylet($terms);
-	}
 
-	/**
-	 * @param string[] $terms
-	 * @return ImgQuerylet[]
-	 */
-	private static function parse_meta_terms($terms) {
+		$tag_querylets = array();
 		$img_querylets = array();
+		$positive_tag_count = 0;
+		$negative_tag_count = 0;
+
+		/*
+		 * Turn a bunch of strings into a bunch of TagQuerylet
+		 * and ImgQuerylet objects
+		 */
 		$stpe = new SearchTermParseEvent(null, $terms);
 		send_event($stpe);
 		if ($stpe->is_querylet_set()) {
@@ -775,93 +773,50 @@ private static function parse_meta_terms($terms) {
 				$img_querylets[] = new ImgQuerylet($querylet, true);
 			}
 		}
-		return $img_querylets;
-	}
-
-	/**
-	 * @param ImgQuerylet[] $img_querylets
-	 * @return Querylet
-	 */
-	private static function build_img_search($img_querylets) {
-		// merge all the image metadata searches into one generic querylet
-		$n = 0;
-		$sql = "";
-		$terms = array();
-		foreach ($img_querylets as $iq) {
-			if ($n++ > 0) $sql .= " AND";
-			if (!$iq->positive) $sql .= " NOT";
-			$sql .= " (" . $iq->qlet->sql . ")";
-			$terms = array_merge($terms, $iq->qlet->variables);
-		}
-		return new Querylet($sql, $terms);
-	}
-
-	/**
-	 * WARNING: this description is no longer accurate, though it does get across
-	 * the general idea - the actual method has a few extra optimisations
-	 *
-	 * "foo bar -baz user=foo" becomes
-	 *
-	 * SELECT * FROM images WHERE
-	 *           images.id IN (SELECT image_id FROM image_tags WHERE tag='foo')
-	 *   AND     images.id IN (SELECT image_id FROM image_tags WHERE tag='bar')
-	 *   AND NOT images.id IN (SELECT image_id FROM image_tags WHERE tag='baz')
-	 *   AND     images.id IN (SELECT id FROM images WHERE owner_name='foo')
-	 *
-	 * This is:
-	 *   A) Incredibly simple:
-	 *      Each search term maps to a list of image IDs
-	 *   B) Runs really fast on a good database:
-	 *      These lists are calculated once, and the set intersection taken
-	 *   C) Runs really slow on bad databases:
-	 *      All the subqueries are executed every time for every row in the
-	 *      images table. Yes, MySQL does suck this much.
-	 *
-	 * @param string[] $terms
-	 * @return \Querylet
-	 */
-	private static function build_accurate_search_querylet($terms) {
-		global $database;
 
-		$tag_querylets = array();
-		$img_querylets = self::parse_meta_terms($terms);
-		$positive_tag_count = 0;
-
-		// parse the words that are searched for into
-		// various types of querylet
 		$terms = Tag::resolve_aliases($terms);
-		foreach($terms as $term) {
+		foreach ($terms as $term) {
 			$positive = true;
-			if(is_string($term) && !empty($term) && ($term[0] == '-')) {
+			if (is_string($term) && !empty($term) && ($term[0] == '-')) {
 				$positive = false;
 				$term = substr($term, 1);
 			}
-			if(strlen($term) === 0) {
+			if (strlen($term) === 0) {
 				continue;
 			}
 
 			$stpe = new SearchTermParseEvent($term, $terms);
 			send_event($stpe);
-			if($stpe->is_querylet_set()) {
-				foreach($stpe->get_querylets() as $querylet) {
+			if ($stpe->is_querylet_set()) {
+				foreach ($stpe->get_querylets() as $querylet) {
 					$img_querylets[] = new ImgQuerylet($querylet, $positive);
 				}
-			}
-			else {
+			} else {
 				$expansions = Tag::resolve_wildcard($term);
-				if($expansions && $positive) $positive_tag_count++;
-				foreach($expansions as $expanded_term) {
+				if ($expansions) {
+					if ($positive) $positive_tag_count++;
+					else $negative_tag_count++;
+				}
+				foreach ($expansions as $expanded_term) {
 					$tag_querylets[] = new TagQuerylet($expanded_term, $positive);
 				}
 			}
 		}
-		$img_search = self::build_img_search($img_querylets);
-
-		// How many tag querylets are there?
-		$count_tag_querylets = count($tag_querylets);
 
-		// no tags, do a simple search (+image metadata if we have any)
-		if($count_tag_querylets === 0) {
+		/*
+		 * Turn a bunch of Querylet objects into a base query
+		 *
+		 * Must follow the format
+		 *
+		 *   SELECT images.*
+		 *   FROM (...) AS images
+		 *   WHERE (...)
+		 *
+		 * ie, return a set of images.* columns, and end with a WHERE
+		 */
+
+		// no tags, do a simple search
+		if($positive_tag_count + $negative_tag_count == 0) {
 			$query = new Querylet("
 				SELECT images.*
 				FROM images
@@ -870,251 +825,227 @@ private static function build_accurate_search_querylet($terms) {
 		}
 
 		// one positive tag (a common case), do an optimised search
-		else if($count_tag_querylets === 1 && $tag_querylets[0]->positive) {
+		else if($positive_tag_count === 1 && $negative_tag_count === 0) {
 			$query = new Querylet($database->scoreql_to_sql("
-				SELECT images.*
-				FROM images
-				JOIN image_tags ON images.id=image_tags.image_id
-				JOIN tags ON image_tags.tag_id=tags.id
-				WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)
+				SELECT *
+				FROM (
+					SELECT images.*
+					FROM images
+					JOIN image_tags ON images.id=image_tags.image_id
+					JOIN tags ON image_tags.tag_id=tags.id
+					WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)
+					GROUP BY images.id
+				) AS images
+				WHERE 1=1
 			"), array("tag"=>$tag_querylets[0]->tag));
 		}
 
 		// more than one positive tag, or more than zero negative tags
 		else {
-			$positive_tag_id_array = array();
-			$negative_tag_id_array = array();
-			$tags_ok = true;
-
-			foreach ($tag_querylets as $tq) {
-				$tag_ids = $database->get_col(
-					$database->scoreql_to_sql("
-						SELECT id
-						FROM tags
-						WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)
-					"), array("tag" => $tq->tag)
+			if($database->get_driver_name() === "mysql")
+				$query = Image::build_ugly_search_querylet(
+					$tag_querylets,
+					$positive_tag_count
+				);
+			else
+				$query = Image::build_accurate_search_querylet(
+					$tag_querylets,
+					$positive_tag_count
 				);
-				if ($tq->positive) {
-					$positive_tag_id_array = array_merge($positive_tag_id_array, $tag_ids);
-					$tags_ok = count($tag_ids) > 0;
-					if (!$tags_ok) break;
-				} else {
-					$negative_tag_id_array = array_merge($negative_tag_id_array, $tag_ids);
-				}
-			}
-
-			if ($tags_ok) {
-				$have_pos = count($positive_tag_id_array) > 0;
-				$have_neg = count($negative_tag_id_array) > 0;
-
-				$sql = "";
-				if ($have_pos) {
-					$positive_tag_id_list = join(', ', $positive_tag_id_array);
-					$sql .= "
-						SELECT image_id
-						FROM image_tags
-						WHERE tag_id IN ($positive_tag_id_list)
-						GROUP BY image_id
-						HAVING COUNT(image_id)>=$positive_tag_count
-					";
-				}
-				if ($have_pos && $have_neg) {
-					$sql .= " EXCEPT ";
-				}
-				if ($have_neg) {
-					$negative_tag_id_list = join(', ', $negative_tag_id_array);
-					$sql .= "
-						SELECT image_id
-						FROM image_tags
-						WHERE tag_id IN ($negative_tag_id_list)
-					";
-				}
-				$query = new Querylet("
-					SELECT images.*
-					FROM images
-					WHERE images.id IN ($sql)
-				");
-			} else {
-				# one of the positive tags had zero results, therefor there
-				# can be no results; "where 1=0" should shortcut things
-				$query = new Querylet("
-					SELECT images.*
-					FROM images
-					WHERE 1=0
-				");
-			}
 		}
 
-		if (!empty($img_search->sql)) {
+		/*
+		 * Merge all the image metadata searches into one generic querylet
+		 * and append to the base querylet with "AND blah"
+		 */
+		if($img_querylets) {
+			$n = 0;
+			$img_sql = "";
+			$img_vars = array();
+			foreach ($img_querylets as $iq) {
+				if ($n++ > 0) $img_sql .= " AND";
+				if (!$iq->positive) $img_sql .= " NOT";
+				$img_sql .= " (" . $iq->qlet->sql . ")";
+				$img_vars = array_merge($img_vars, $iq->qlet->variables);
+			}
 			$query->append_sql(" AND ");
-			$query->append($img_search);
-			return $query;
+			$query->append(new Querylet($img_sql, $img_vars));
 		}
 
 		return $query;
 	}
 
 	/**
-	 * this function exists because mysql is a turd, see the docs for
-	 * build_accurate_search_querylet() for a full explanation
+	 * WARNING: this description is no longer accurate, though it does get across
+	 * the general idea - the actual method has a few extra optimisations
+	 *
+	 * "foo bar -baz user=foo" becomes
+	 *
+	 * SELECT * FROM images WHERE
+	 *           images.id IN (SELECT image_id FROM image_tags WHERE tag='foo')
+	 *   AND     images.id IN (SELECT image_id FROM image_tags WHERE tag='bar')
+	 *   AND NOT images.id IN (SELECT image_id FROM image_tags WHERE tag='baz')
+	 *   AND     images.id IN (SELECT id FROM images WHERE owner_name='foo')
+	 *
+	 * This is:
+	 *   A) Incredibly simple:
+	 *      Each search term maps to a list of image IDs
+	 *   B) Runs really fast on a good database:
+	 *      These lists are calculated once, and the set intersection taken
+	 *   C) Runs really slow on bad databases:
+	 *      All the subqueries are executed every time for every row in the
+	 *      images table. Yes, MySQL does suck this much.
 	 *
-	 * @param array $terms
+	 * @param array $tag_querylets
+	 * @param int $positive_tag_count
 	 * @return Querylet
 	 */
-	private static function build_ugly_search_querylet($terms) {
+	private static function build_accurate_search_querylet(
+		$tag_querylets,
+		$positive_tag_count
+	) {
 		global $database;
 
-		$tag_querylets = array();
-		$img_querylets = self::parse_meta_terms($terms);
-		$positive_tag_count = 0;
-		$negative_tag_count = 0;
-		$wildcard_count     = 0;
-
-		$terms = Tag::resolve_aliases($terms);
-
-		reset($terms); // rewind to first element in array.
-
-		// turn each term into a specific type of querylet
-		foreach($terms as $term) {
-			$negative = false;
-			if( !empty($term) && ($term[0] == '-')) {
-				$negative = true;
-				$term = substr($term, 1);
-			}
-
-			$stpe = new SearchTermParseEvent($term, $terms);
-			send_event($stpe);
-			if($stpe->is_querylet_set()) {
-				foreach($stpe->get_querylets() as $querylet) {
-					$img_querylets[] = new ImgQuerylet($querylet, !$negative);
-				}
-			}
-			else {
-				$term = str_replace("*", "%", $term);
-				$term = str_replace("?", "_", $term);
-				if(!preg_match("/^[%_]+$/", $term)) {
-					$tag_querylets[] = new TagQuerylet($term, !$negative);
+		$positive_tag_id_array = array();
+		$negative_tag_id_array = array();
+
+		foreach ($tag_querylets as $tq) {
+			$tag_ids = $database->get_col(
+				$database->scoreql_to_sql("
+					SELECT id
+					FROM tags
+					WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)
+				"),
+				array("tag" => $tq->tag)
+			);
+			if ($tq->positive) {
+				$positive_tag_id_array = array_merge($positive_tag_id_array, $tag_ids);
+				if (count($tag_ids) == 0) {
+					# one of the positive tags had zero results, therefor there
+					# can be no results; "where 1=0" should shortcut things
+					return new Querylet("
+						SELECT images.*
+						FROM images
+						WHERE 1=0
+					");
 				}
+			} else {
+				$negative_tag_id_array = array_merge($negative_tag_id_array, $tag_ids);
 			}
+		}
 
-			if(strpos($term, '%') !== FALSE) $wildcard_count++;
+		$have_pos = count($positive_tag_id_array) > 0;
+		$have_neg = count($negative_tag_id_array) > 0;
+
+		$sql = "";
+		if ($have_pos) {
+			$positive_tag_id_list = join(', ', $positive_tag_id_array);
+			$sql .= "
+				SELECT image_id
+				FROM image_tags
+				WHERE tag_id IN ($positive_tag_id_list)
+				GROUP BY image_id
+				HAVING COUNT(image_id)>=$positive_tag_count
+			";
 		}
+		if ($have_pos && $have_neg) {
+			$sql .= " EXCEPT ";
+		}
+		if ($have_neg) {
+			$negative_tag_id_list = join(', ', $negative_tag_id_array);
+			$sql .= "
+				SELECT image_id
+				FROM image_tags
+				WHERE tag_id IN ($negative_tag_id_list)
+			";
+		}
+		return new Querylet("
+			SELECT images.*
+			FROM images
+			WHERE images.id IN ($sql)
+		");
+	}
+
+	/**
+	 * this function exists because mysql is a turd, see the docs for
+	 * build_accurate_search_querylet() for a full explanation
+	 *
+	 * @param array $tag_querylets
+	 * @param int $positive_tag_count
+	 * @return Querylet
+	 */
+	private static function build_ugly_search_querylet(
+		$tag_querylets,
+		$positive_tag_count
+	) {
+		global $database;
 
 		// merge all the tag querylets into one generic one
 		$sql = "0";
 		$terms = array();
 		foreach($tag_querylets as $tq) {
 			$sign = $tq->positive ? "+" : "-";
-
-			if(!$wildcard_count) {
-				$sql .= ' '.$sign.' (tag LIKE :tag'.Image::$tag_n.')';
-			} else {
-				$sql .= ' '.$sign.' IF(SUM(tag LIKE :tag'.Image::$tag_n.'), 1, 0)';
-			}
-
+			$sql .= ' '.$sign.' IF(SUM(tag LIKE :tag'.Image::$tag_n.'), 1, 0)';
 			$terms['tag'.Image::$tag_n] = $tq->tag;
 			Image::$tag_n++;
-
-			if($sign === "+") $positive_tag_count++;
-			else $negative_tag_count++;
 		}
 		$tag_search = new Querylet($sql, $terms);
-		$img_search = self::build_img_search($img_querylets);
 
-		// no tags, do a simple search (+image metadata if we have any)
-		if($positive_tag_count + $negative_tag_count == 0) {
-			$query = new Querylet("
+		// only negative tags - shortcut to fail
+		if($positive_tag_count == 0) {
+			// TODO: This isn't currently implemented.
+			// SEE: https://github.com/shish/shimmie2/issues/66
+			return new Querylet("
 				SELECT images.*
 				FROM images
-				WHERE 1=1
+				WHERE 1=0
 			");
 		}
 
-		// one positive tag (a common case), do an optimised search
-		else if($positive_tag_count === 1 && $negative_tag_count === 0) {
-			// MySQL is braindead, and does a full table scan on images, running the subquery once for each row -_-
-			// "{$this->get_images} WHERE images.id IN (SELECT image_id FROM tags WHERE tag LIKE ?) ",
-			$group_by = (!$wildcard_count ? "" : "GROUP BY images.id");
-			$query = new Querylet("
-				SELECT images.*
-				FROM images
-				JOIN image_tags ON images.id=image_tags.image_id
-				JOIN tags ON image_tags.tag_id=tags.id
-				WHERE tag LIKE :tag0
-				{$group_by}
-			", $tag_search->variables);
-		}
-
-		// more than one positive tag, and zero or more negative tags
-		else if($positive_tag_count >= 1) {
-			$tag_id_array = array();
-			$tags_ok = true;
-
-			$x = 0;
-			foreach($tag_search->variables as $tag) {
-				$tag_ids = $database->get_col(
-					"SELECT id FROM tags WHERE tag LIKE :tag",
-					array("tag"=>$tag)
-				);
-				$tag_id_array = array_merge($tag_id_array, $tag_ids);
-
-				$tags_ok = count($tag_ids) > 0 || !$tag_querylets[$x]->positive;
-				if(!$tags_ok) break;
-
-				$x++;
-			}
-
-			if($tags_ok) {
-				$tag_id_list = join(', ', $tag_id_array);
+		$tag_id_array = array();
+
+		$x = 0;
+		foreach($tag_search->variables as $tag) {
+			$tag_ids = $database->get_col(
+				$database->scoreql_to_sql("
+					SELECT id
+					FROM tags
+					WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)
+				"),
+				array("tag" => $tag)
+			);
+			$tag_id_array = array_merge($tag_id_array, $tag_ids);
 
-				$sum = (!$wildcard_count ? "SUM" : "");
-				$subquery = new Querylet('
-					SELECT images.*, '.$sum.'('.$tag_search->sql.') AS score
-					FROM images
-					LEFT JOIN image_tags ON image_tags.image_id = images.id
-					JOIN tags ON image_tags.tag_id = tags.id
-					WHERE tags.id IN ('.$tag_id_list.')
-					GROUP BY images.id
-					HAVING score = :score',
-					array_merge(
-						$tag_search->variables,
-						array("score"=>$positive_tag_count)
-					)
-				);
-				$query = new Querylet('
-					SELECT *
-					FROM ('.$subquery->sql.') AS images
-					WHERE 1=1
-				', $subquery->variables);
-			}
-			else {
-				# there are no results, "where 1=0" should shortcut things
-				$query = new Querylet("
+			if($tag_querylets[$x]->positive && count($tag_ids) == 0) {
+				# one of the positive tags had zero results, therefor there
+				# can be no results; "where 1=0" should shortcut things
+				return new Querylet("
 					SELECT images.*
 					FROM images
 					WHERE 1=0
 				");
 			}
-		}
 
-		//zero positive tags and one or more negative tags
-		//TODO: This isn't currently implemented. SEE: https://github.com/shish/shimmie2/issues/66
-		else {
-			$query = new Querylet("
-				SELECT images.*
-				FROM images
-				WHERE 1=0
-			");
-		}
-
-		if (!empty($img_search->sql)) {
-			$query->append_sql(" AND ");
-			$query->append($img_search);
-			return $query;
+			$x++;
 		}
 
 		Image::$tag_n = 0;
-		return $query;
+		return new Querylet('
+			SELECT *
+			FROM (
+				SELECT images.*, SUM('.$tag_search->sql.') AS score
+				FROM images
+				LEFT JOIN image_tags ON image_tags.image_id = images.id
+				JOIN tags ON image_tags.tag_id = tags.id
+				WHERE tags.id IN (' . join(', ', $tag_id_array) . ')
+				GROUP BY images.id
+				HAVING score = :score
+			) AS images
+			WHERE 1=1
+		', array_merge(
+			$tag_search->variables,
+			array("score"=>$positive_tag_count)
+		));
 	}
 }
 

From 8e8a3da790044e4feb674b911f88c188e87e776d Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Tue, 7 Jun 2016 01:39:23 +0100
Subject: [PATCH 048/250] support single wildcard

---
 core/imageboard.pack.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 2105cae00..29c6d6a7a 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -833,7 +833,7 @@ private static function build_search_querylet($terms) {
 					FROM images
 					JOIN image_tags ON images.id=image_tags.image_id
 					JOIN tags ON image_tags.tag_id=tags.id
-					WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)
+					WHERE SCORE_STRNORM(tag) LIKE SCORE_STRNORM(:tag)
 					GROUP BY images.id
 				) AS images
 				WHERE 1=1

From bfa1dc20c01b50da775c55b93db9d16792b093d1 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Tue, 7 Jun 2016 01:50:56 +0100
Subject: [PATCH 049/250] fix mysql

---
 core/imageboard.pack.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 29c6d6a7a..c4111c893 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -980,17 +980,6 @@ private static function build_ugly_search_querylet(
 	) {
 		global $database;
 
-		// merge all the tag querylets into one generic one
-		$sql = "0";
-		$terms = array();
-		foreach($tag_querylets as $tq) {
-			$sign = $tq->positive ? "+" : "-";
-			$sql .= ' '.$sign.' IF(SUM(tag LIKE :tag'.Image::$tag_n.'), 1, 0)';
-			$terms['tag'.Image::$tag_n] = $tq->tag;
-			Image::$tag_n++;
-		}
-		$tag_search = new Querylet($sql, $terms);
-
 		// only negative tags - shortcut to fail
 		if($positive_tag_count == 0) {
 			// TODO: This isn't currently implemented.
@@ -1002,6 +991,17 @@ private static function build_ugly_search_querylet(
 			");
 		}
 
+		// merge all the tag querylets into one generic one
+		$sql = "0";
+		$terms = array();
+		foreach($tag_querylets as $tq) {
+			$sign = $tq->positive ? "+" : "-";
+			$sql .= ' '.$sign.' IF(tag LIKE :tag'.Image::$tag_n.', 1, 0)';
+			$terms['tag'.Image::$tag_n] = $tq->tag;
+			Image::$tag_n++;
+		}
+		$tag_search = new Querylet($sql, $terms);
+
 		$tag_id_array = array();
 
 		$x = 0;

From 3d05c2896a42177934644de94899fb976b0e0bc4 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Tue, 7 Jun 2016 01:56:05 +0100
Subject: [PATCH 050/250] expand test cases

---
 ext/index/test.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/ext/index/test.php b/ext/index/test.php
index 3228556b8..716ce59e2 100644
--- a/ext/index/test.php
+++ b/ext/index/test.php
@@ -132,7 +132,14 @@ public function testMetaSearchManyResults() {
 	/* * * * * * * * * * *
 	* Wildcards          *
 	* * * * * * * * * * */
-	public function testWildSearch() {
+	public function testWildSearchNoResults() {
+		$image_ids = $this->upload();
+
+		$this->get_page("post/list/asdfasdf*/1");
+		$this->assert_response(404);
+	}
+
+	public function testWildSearchOneResult() {
 		$image_ids = $this->upload();
 
 		// Only the first image matches both the wildcard and the tag.
@@ -143,6 +150,15 @@ public function testWildSearch() {
 		$this->get_page("post/list/comp* screenshot/1");
 		$this->assert_response(302);
 	}
+
+	public function testWildSearchManyResults() {
+		$image_ids = $this->upload();
+
+		// two images match comp* - one matches it once,
+		// one matches it twice
+		$this->get_page("post/list/comp*/1");
+		$this->assert_response(200);
+	}
     
 	/* * * * * * * * * * *
 	* Mixed              *

From 94ba42fc70e7cdf99163b8c397fc5cdbeb84cde1 Mon Sep 17 00:00:00 2001
From: HungryFeline <HungryFeline@users.noreply.github.com>
Date: Thu, 16 Jun 2016 16:40:51 +0200
Subject: [PATCH 051/250] Set ffmpeg's "overwrite output files" switch (-y)

Regenerate thumbnail doesn't work since the output file already exists and ffmpeg expects the user to decide wether to replace the file or not. With the -y switch set, ffmpeg does so without asking.

https://ffmpeg.org/ffmpeg.html#Main-options
---
 ext/handle_video/main.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/handle_video/main.php b/ext/handle_video/main.php
index b6930177d..4acb612de 100644
--- a/ext/handle_video/main.php
+++ b/ext/handle_video/main.php
@@ -85,12 +85,12 @@ protected function create_thumb($hash) {
 			
 				if ($config->get_bool("video_thumb_ignore_aspect_ratio") == true)
 				{
-					$cmd = escapeshellcmd("{$ffmpeg} -i {$inname} -ss 00:00:00.0 -f image2 -vframes 1 {$outname}");
+					$cmd = escapeshellcmd("{$ffmpeg} -y -i {$inname} -ss 00:00:00.0 -f image2 -vframes 1 {$outname}");
 				}
 				else
 				{
 					$scale = 'scale="' . escapeshellarg("if(gt(a,{$w}/{$h}),{$w},-1)") . ':' . escapeshellarg("if(gt(a,{$w}/{$h}),-1,{$h})") . '"';
-					$cmd = "{$ffmpeg} -i {$inname} -vf {$scale} -ss 00:00:00.0 -f image2 -vframes 1 {$outname}";
+					$cmd = "{$ffmpeg} -y -i {$inname} -vf {$scale} -ss 00:00:00.0 -f image2 -vframes 1 {$outname}";
 				}
 
 				exec($cmd, $output, $returnValue);

From 190d8bd7d706cb18ac19b6800c1a7a5df63bcc7a Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Fri, 17 Jun 2016 22:48:28 +0100
Subject: [PATCH 052/250] log api stats seperately

---
 ext/statsd/main.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ext/statsd/main.php b/ext/statsd/main.php
index 2cb3500af..5267495ff 100644
--- a/ext/statsd/main.php
+++ b/ext/statsd/main.php
@@ -50,6 +50,9 @@ public function onPageRequest($event) {
 		else if($event->page_matches("rss")) {
 			$this->_stats("rss");
 		}
+		else if($event->page_matches("api")) {
+			$this->_stats("api");
+		}
 		else {
 			#global $_shm_load_start;
 			#$time = microtime(true) - $_shm_load_start;

From 57fa3548428900d03f58a310d0f2dc717a7a5bb6 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Fri, 17 Jun 2016 22:51:30 +0100
Subject: [PATCH 053/250] fnmatch has a string length limit :|

---
 ext/blocks/main.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ext/blocks/main.php b/ext/blocks/main.php
index 314155f0c..430433704 100644
--- a/ext/blocks/main.php
+++ b/ext/blocks/main.php
@@ -40,7 +40,8 @@ public function onPageRequest(PageRequestEvent $event) {
 			$database->cache->set("blocks", $blocks, 600);
 		}
 		foreach($blocks as $block) {
-			if(fnmatch($block['pages'], implode("/", $event->args))) {
+			$path = implode("/", $event->args);
+			if(strlen($path) < 4000 && fnmatch($block['pages'], $path)) {
 				$page->add_block(new Block($block['title'], $block['content'], $block['area'], $block['priority']));
 			}
 		}

From 76c2815b2b30a1062b446569ab84b18022ab07b1 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Fri, 17 Jun 2016 23:41:57 +0100
Subject: [PATCH 054/250] unit test bettering

---
 ext/image/test.php  | 2 +-
 tests/bootstrap.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ext/image/test.php b/ext/image/test.php
index 2e5512a16..d5034175d 100644
--- a/ext/image/test.php
+++ b/ext/image/test.php
@@ -1,5 +1,5 @@
 <?php
-class ImageTest extends ShimmiePHPUnitTestCase {
+class ImageIOTest extends ShimmiePHPUnitTestCase {
 	public function testUserStats() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "test");
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 30b7859cf..87f07f48e 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -22,7 +22,10 @@ abstract class ShimmiePHPUnitTestCase extends PHPUnit_Framework_TestCase {
 
 	public function setUp() {
 		$class = str_replace("Test", "", get_class($this));
-		if(!method_exists($class, "is_live") || !ext_is_live($class)) {
+		if(!class_exists($class)) {
+			$this->markTestSkipped("$class not loaded");
+		}
+		elseif(!ext_is_live($class)) {
 			$this->markTestSkipped("$class not supported with this database");
 		}
 

From 7bc9a73357699bdcce9ff1b1a31346475c27ba2e Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 18 Jun 2016 00:00:02 +0100
Subject: [PATCH 055/250] migrate to a non-deprecated (and dependency-free)
 cookie library

---
 ext/blotter/script.js          |   6 +-
 ext/handle_pixel/script.js     |   8 +-
 ext/index/script.js            |   6 +-
 ext/pools/script.js            |   4 +-
 ext/tagger/script.js           |   4 +-
 lib/jquery.cookie-1.4.0.min.js |   8 --
 lib/js.cookie.js               | 151 +++++++++++++++++++++++++++++++++
 lib/shimmie.js                 |  35 --------
 8 files changed, 165 insertions(+), 57 deletions(-)
 delete mode 100644 lib/jquery.cookie-1.4.0.min.js
 create mode 100644 lib/js.cookie.js

diff --git a/ext/blotter/script.js b/ext/blotter/script.js
index 25e3188c1..dfffcf35b 100644
--- a/ext/blotter/script.js
+++ b/ext/blotter/script.js
@@ -4,14 +4,14 @@ $(document).ready(function() {
 	$(".shm-blotter2-toggle").click(function() {
 		$(".shm-blotter2").slideToggle("slow", function() {
 			if($(".shm-blotter2").is(":hidden")) {
-				$.cookie("ui-blotter2-hidden", 'true', {path: '/'});
+				Cookies.set("ui-blotter2-hidden", 'true');
 			}
 			else {
-				$.cookie("ui-blotter2-hidden", 'false', {path: '/'});
+				Cookies.set("ui-blotter2-hidden", 'false');
 			}
 		});
 	});
-	if($.cookie("ui-blotter2-hidden") === 'true') {
+	if(Cookies.get("ui-blotter2-hidden") === 'true') {
 		$(".shm-blotter2").hide();
 	}
 });
diff --git a/ext/handle_pixel/script.js b/ext/handle_pixel/script.js
index 83bd56ac4..b85094cce 100644
--- a/ext/handle_pixel/script.js
+++ b/ext/handle_pixel/script.js
@@ -21,7 +21,7 @@ $(function() {
 		
 		$(".shm-zoomer").val(zoom_type);
 		
-		$.cookie("ui-image-zoom", zoom_type, {path: '/', expires: 365});
+		Cookies.set("ui-image-zoom", zoom_type, {expires: 365});
 	}
 
 	$(".shm-zoomer").change(function(e) {
@@ -29,13 +29,13 @@ $(function() {
 	});
 
 	$(".shm-main-image").click(function(e) {
-		switch($.cookie("ui-image-zoom")) {
+		switch(Cookies.get("ui-image-zoom")) {
 			case "full": zoom("width"); break;
 			default: zoom("full"); break;
 		}
 	});
 
-	if($.cookie("ui-image-zoom")) {
-		zoom($.cookie("ui-image-zoom"));
+	if(Cookies.get("ui-image-zoom")) {
+		zoom(Cookies.get("ui-image-zoom"));
 	}
 });
diff --git a/ext/index/script.js b/ext/index/script.js
index e1499c74d..5f1ab8e20 100644
--- a/ext/index/script.js
+++ b/ext/index/script.js
@@ -1,7 +1,7 @@
 /*jshint bitwise:false, curly:true, eqeqeq:true, evil:true, forin:false, noarg:true, noempty:true, nonew:true, undef:false, strict:false, browser:true, jquery:true */
 
 $(function() {
-	var blocked_tags = ($.cookie("ui-blocked-tags") || "").split(" ");
+	var blocked_tags = (Cookies.get("ui-blocked-tags") || "").split(" ");
 	var needs_refresh = false;
 	for(var i=0; i<blocked_tags.length; i++) {
 		var tag = blocked_tags[i];
@@ -34,9 +34,9 @@ $(function() {
 });
 
 function select_blocked_tags() {
-	var blocked_tags = prompt("Enter tags to ignore", $.cookie("ui-blocked-tags") || "My_Little_Pony");
+	var blocked_tags = prompt("Enter tags to ignore", Cookies.get("ui-blocked-tags") || "My_Little_Pony");
 	if(blocked_tags !== null) {
-		$.cookie("ui-blocked-tags", blocked_tags.toLowerCase(), {path: '/', expires: 365});
+		Cookies.set("ui-blocked-tags", blocked_tags.toLowerCase(), {expires: 365});
 		location.reload(true);
 	}
 }
diff --git a/ext/pools/script.js b/ext/pools/script.js
index c5e91d4ef..88cec0e3c 100644
--- a/ext/pools/script.js
+++ b/ext/pools/script.js
@@ -1,12 +1,12 @@
 /*jshint bitwise:true, curly:true, forin:false, noarg:true, noempty:true, nonew:true, undef:true, strict:false, browser:true, jquery:true */
 
 $(function() {
-	var order_pool = $.cookie("shm_ui-order-pool") || "created";
+	var order_pool = Cookies.get("shm_ui-order-pool") || "created";
 	$("#order_pool option[value="+order_pool+"]").attr("selected", true);
 
 	$('#order_pool').change(function(){
 		var val = $("#order_pool option:selected").val();
-		$.cookie("shm_ui-order-pool", val, {path: '/', expires: 365}); //FIXME: This won't play nice if COOKIE_PREFIX is not "shm_".
+		Cookies.set("shm_ui-order-pool", val, {expires: 365}); //FIXME: This won't play nice if COOKIE_PREFIX is not "shm_".
 		window.location.href = '';
 	});
 });
diff --git a/ext/tagger/script.js b/ext/tagger/script.js
index 511a2684a..ba3fa66ec 100644
--- a/ext/tagger/script.js
+++ b/ext/tagger/script.js
@@ -201,11 +201,11 @@ var Tagger = {
 				x = xy[0];
 				y = xy[1];
 			}
-			setCookie(config.title+"_tagger-position",x+" "+y,14);
+			Cookies.set(config.title+"_tagger-position", x+" "+y, {expires: 14});
 		},
 		
 		load : function () {
-			var p = getCookie(config.title+"_tagger-position");
+			var p = Cookies.get(config.title+"_tagger-position");
 			if(p) {
 				var xy = p.split(" ");
 				this.set(xy[0],xy[1]);
diff --git a/lib/jquery.cookie-1.4.0.min.js b/lib/jquery.cookie-1.4.0.min.js
deleted file mode 100644
index 353ce8e38..000000000
--- a/lib/jquery.cookie-1.4.0.min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*!
- * jQuery Cookie Plugin v1.4.0
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2013 Klaus Hartl
- * Released under the MIT license
- */
-(function(e){if(typeof define==="function"&&define.amd){define(["jquery"],e)}else{e(jQuery)}})(function(e){function n(e){return u.raw?e:encodeURIComponent(e)}function r(e){return u.raw?e:decodeURIComponent(e)}function i(e){return n(u.json?JSON.stringify(e):String(e))}function s(e){if(e.indexOf('"')===0){e=e.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\")}try{e=decodeURIComponent(e.replace(t," "))}catch(n){return}try{return u.json?JSON.parse(e):e}catch(n){}}function o(t,n){var r=u.raw?t:s(t);return e.isFunction(n)?n(r):r}var t=/\+/g;var u=e.cookie=function(t,s,a){if(s!==undefined&&!e.isFunction(s)){a=e.extend({},u.defaults,a);if(typeof a.expires==="number"){var f=a.expires,l=a.expires=new Date;l.setDate(l.getDate()+f)}return document.cookie=[n(t),"=",i(s),a.expires?"; expires="+a.expires.toUTCString():"",a.path?"; path="+a.path:"",a.domain?"; domain="+a.domain:"",a.secure?"; secure":""].join("")}var c=t?undefined:{};var h=document.cookie?document.cookie.split("; "):[];for(var p=0,d=h.length;p<d;p++){var v=h[p].split("=");var m=r(v.shift());var g=v.join("=");if(t&&t===m){c=o(g,s);break}if(!t&&(g=o(g))!==undefined){c[m]=g}}return c};u.defaults={};e.removeCookie=function(t,n){if(e.cookie(t)!==undefined){e.cookie(t,"",e.extend({},n,{expires:-1}));return true}return false}});
diff --git a/lib/js.cookie.js b/lib/js.cookie.js
new file mode 100644
index 000000000..7f3dffde6
--- /dev/null
+++ b/lib/js.cookie.js
@@ -0,0 +1,151 @@
+/*!
+ * JavaScript Cookie v2.1.2
+ * https://github.com/js-cookie/js-cookie
+ *
+ * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
+ * Released under the MIT license
+ */
+;(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		define(factory);
+	} else if (typeof exports === 'object') {
+		module.exports = factory();
+	} else {
+		var OldCookies = window.Cookies;
+		var api = window.Cookies = factory();
+		api.noConflict = function () {
+			window.Cookies = OldCookies;
+			return api;
+		};
+	}
+}(function () {
+	function extend () {
+		var i = 0;
+		var result = {};
+		for (; i < arguments.length; i++) {
+			var attributes = arguments[ i ];
+			for (var key in attributes) {
+				result[key] = attributes[key];
+			}
+		}
+		return result;
+	}
+
+	function init (converter) {
+		function api (key, value, attributes) {
+			var result;
+			if (typeof document === 'undefined') {
+				return;
+			}
+
+			// Write
+
+			if (arguments.length > 1) {
+				attributes = extend({
+					path: '/'
+				}, api.defaults, attributes);
+
+				if (typeof attributes.expires === 'number') {
+					var expires = new Date();
+					expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5);
+					attributes.expires = expires;
+				}
+
+				try {
+					result = JSON.stringify(value);
+					if (/^[\{\[]/.test(result)) {
+						value = result;
+					}
+				} catch (e) {}
+
+				if (!converter.write) {
+					value = encodeURIComponent(String(value))
+						.replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
+				} else {
+					value = converter.write(value, key);
+				}
+
+				key = encodeURIComponent(String(key));
+				key = key.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent);
+				key = key.replace(/[\(\)]/g, escape);
+
+				return (document.cookie = [
+					key, '=', value,
+					attributes.expires && '; expires=' + attributes.expires.toUTCString(), // use expires attribute, max-age is not supported by IE
+					attributes.path    && '; path=' + attributes.path,
+					attributes.domain  && '; domain=' + attributes.domain,
+					attributes.secure ? '; secure' : ''
+				].join(''));
+			}
+
+			// Read
+
+			if (!key) {
+				result = {};
+			}
+
+			// To prevent the for loop in the first place assign an empty array
+			// in case there are no cookies at all. Also prevents odd result when
+			// calling "get()"
+			var cookies = document.cookie ? document.cookie.split('; ') : [];
+			var rdecode = /(%[0-9A-Z]{2})+/g;
+			var i = 0;
+
+			for (; i < cookies.length; i++) {
+				var parts = cookies[i].split('=');
+				var cookie = parts.slice(1).join('=');
+
+				if (cookie.charAt(0) === '"') {
+					cookie = cookie.slice(1, -1);
+				}
+
+				try {
+					var name = parts[0].replace(rdecode, decodeURIComponent);
+					cookie = converter.read ?
+						converter.read(cookie, name) : converter(cookie, name) ||
+						cookie.replace(rdecode, decodeURIComponent);
+
+					if (this.json) {
+						try {
+							cookie = JSON.parse(cookie);
+						} catch (e) {}
+					}
+
+					if (key === name) {
+						result = cookie;
+						break;
+					}
+
+					if (!key) {
+						result[name] = cookie;
+					}
+				} catch (e) {}
+			}
+
+			return result;
+		}
+
+		api.set = api;
+		api.get = function (key) {
+			return api(key);
+		};
+		api.getJSON = function () {
+			return api.apply({
+				json: true
+			}, [].slice.call(arguments));
+		};
+		api.defaults = {};
+
+		api.remove = function (key, attributes) {
+			api(key, '', extend(attributes, {
+				expires: -1
+			}));
+		};
+
+		api.withConverter = init;
+
+		return api;
+	}
+
+	return init(function () {});
+}));
diff --git a/lib/shimmie.js b/lib/shimmie.js
index 5f18651f4..b899ebda0 100644
--- a/lib/shimmie.js
+++ b/lib/shimmie.js
@@ -137,41 +137,6 @@ function getHTTPObject() {
 }
 
 
-/* get, set, and delete cookies */
-function getCookie( name ) {
-	var start = document.cookie.indexOf( name + "=" );
-	var len = start + name.length + 1;
-	if ( ( !start ) && ( name !== document.cookie.substring( 0, name.length ) ) ) {
-		return null;
-	}
-	if ( start === -1 ) { return null; }
-	var end = document.cookie.indexOf( ";", len );
-	if ( end === -1 ) { end = document.cookie.length; }
-	return unescape( document.cookie.substring( len, end ) );
-}
-	
-function setCookie( name, value, expires, path, domain, secure ) {
-	var today = new Date();
-	today.setTime( today.getTime() );
-	if ( expires ) {
-		expires = expires * 1000 * 60 * 60 * 24;
-	}
-	var expires_date = new Date( today.getTime() + (expires) );
-	document.cookie = name+"="+escape( value ) +
-		( ( expires ) ? ";expires="+expires_date.toGMTString() : "" ) + //expires.toGMTString()
-		( ( path ) ? ";path=" + path : "" ) +
-		( ( domain ) ? ";domain=" + domain : "" ) +
-		( ( secure ) ? ";secure" : "" );
-}
-	
-function deleteCookie( name, path, domain ) {
-	if ( getCookie( name ) ) { document.cookie = name + "=" +
-			( ( path ) ? ";path=" + path : "") +
-			( ( domain ) ? ";domain=" + domain : "" ) +
-			";expires=Thu, 01-Jan-1970 00:00:01 GMT";
-	}
-}
-
 function replyTo(imageId, commentId, userId) {
 	var box = $("#comment_on_"+imageId);
 	var text = "[url=site://post/view/"+imageId+"#c"+commentId+"]@"+userId+"[/url]: ";

From f3a3c7698824ba1c48a71ae13073eb76c7ee53ff Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 18 Jun 2016 00:45:58 +0100
Subject: [PATCH 056/250] better test router

---
 tests/router.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/router.php b/tests/router.php
index 6c00377bf..5ba314d17 100644
--- a/tests/router.php
+++ b/tests/router.php
@@ -18,5 +18,6 @@
 
 // all other requests (use shimmie routing based on URL)
 $_SERVER["PHP_SELF"] = '/';
-$_GET['q'] = $_SERVER["REQUEST_URI"];
+$_GET['q'] = explode("?", $_SERVER["REQUEST_URI"])[0];
+error_log($_GET['q']);
 require_once "index.php";

From 7dce8da850d2b266ffc196a9e9c0aa9ee9314fe3 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 18 Jun 2016 01:19:34 +0100
Subject: [PATCH 057/250] caching for autocomplete

---
 ext/tag_list/main.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/ext/tag_list/main.php b/ext/tag_list/main.php
index ad1d35092..5322f5b42 100644
--- a/ext/tag_list/main.php
+++ b/ext/tag_list/main.php
@@ -49,20 +49,27 @@ public function onPageRequest(PageRequestEvent $event) {
 			if(!isset($_GET["s"])) return;
 
 			//$limit = 0;
+			$cache_key = "autocomplete-" . strtolower($_GET["s"]);
 			$limitSQL = "";
 			$SQLarr = array("search"=>$_GET["s"]."%");
 			if(isset($_GET["limit"]) && $_GET["limit"] !== 0){
 				$limitSQL = "LIMIT :limit";
 				$SQLarr['limit'] = $_GET["limit"];
+				$cache_key .= "-" . $_GET["limit"];
 			}
 
-			$res = $database->get_col($database->scoreql_to_sql("
-				SELECT tag
-				FROM tags
-				WHERE SCORE_STRNORM(tag) LIKE SCORE_STRNORM(:search)
-					AND count > 0
-				$limitSQL
-			"), $SQLarr);
+			$res = null;
+			$database->cache->get($cache_key);
+			if(!$res) {
+				$res = $database->get_col($database->scoreql_to_sql("
+					SELECT tag
+					FROM tags
+					WHERE SCORE_STRNORM(tag) LIKE SCORE_STRNORM(:search)
+						AND count > 0
+					$limitSQL
+				"), $SQLarr);
+				$database->cache->set($cache_key, $res, 600);
+			}
 
 			$page->set_mode("data");
 			$page->set_type("text/plain");

From 0b75b559a0ac72297ebf9f879e280e0cc9e9568a Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Wed, 11 May 2016 15:15:58 +0100
Subject: [PATCH 058/250] init composer

---
 .gitignore          | 13 +++++--------
 composer.json       |  8 ++++++++
 lib/vendor/.gitkeep |  0
 3 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 composer.json
 create mode 100644 lib/vendor/.gitkeep

diff --git a/.gitignore b/.gitignore
index 15949525d..4002f8686 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,12 @@ thumbs
 !lib/images
 *.phar
 *.sqlite
+/lib/vendor/
 
+#Composer
+composer.phar
+composer.lock
+/vendor/
 
 # Created by http://www.gitignore.io
 
@@ -20,13 +25,6 @@ Desktop.ini
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
 
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-
 ### OSX ###
 .DS_Store
 .AppleDouble
@@ -35,7 +33,6 @@ $RECYCLE.BIN/
 # Icon must ends with two \r.
 Icon
 
-
 # Thumbnails
 ._*
 
diff --git a/composer.json b/composer.json
new file mode 100644
index 000000000..3a4d6155d
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,8 @@
+{
+	"type"    : "project",
+	"license" : "GPL-2.0",
+
+	"require" : {
+		"php" : ">=5.4.8"
+	}
+}
diff --git a/lib/vendor/.gitkeep b/lib/vendor/.gitkeep
new file mode 100644
index 000000000..e69de29bb

From e740d031019d4f4f2bdb0d5130a05bf57152463a Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Wed, 11 May 2016 16:48:21 +0100
Subject: [PATCH 059/250] generate seperate css/js cache files for libs & core
 files

---
 core/page.class.php     | 59 ++++++++++++++++++++++++++++++++++-------
 lib/vendor/css/.gitkeep |  0
 lib/vendor/js/.gitkeep  |  0
 3 files changed, 49 insertions(+), 10 deletions(-)
 create mode 100644 lib/vendor/css/.gitkeep
 create mode 100644 lib/vendor/js/.gitkeep

diff --git a/core/page.class.php b/core/page.class.php
index cca68f633..596871b0e 100644
--- a/core/page.class.php
+++ b/core/page.class.php
@@ -337,18 +337,40 @@ public function add_auto_html_headers() {
 		$this->add_html_header("<link rel='icon' type='image/x-icon' href='$data_href/favicon.ico'>", 41);
 		$this->add_html_header("<link rel='apple-touch-icon' href='$data_href/apple-touch-icon.png'>", 42);
 
+		//We use $config_latest to make sure cache is reset if config is ever updated.
 		$config_latest = 0;
 		foreach(zglob("data/config/*") as $conf) {
 			$config_latest = max($config_latest, filemtime($conf));
 		}
 
-		$css_files = array();
+		/*** Generate CSS cache files ***/
+		$css_lib_latest = $config_latest;
+		$css_lib_files = zglob("lib/vendor/css/*.css");
+		foreach($css_lib_files as $css) {
+			$css_lib_latest = max($css_lib_latest, filemtime($css));
+		}
+		$css_lib_md5 = md5(serialize($css_lib_files));
+		$css_lib_cache_file = data_path("cache/style.lib.{$theme_name}.{$css_lib_latest}.{$css_lib_md5}.css");
+		if(!file_exists($css_lib_cache_file)) {
+			$css_lib_data = "";
+			foreach($css_lib_files as $file) {
+				$file_data = file_get_contents($file);
+				$pattern = '/url[\s]*\([\s]*["\']?([^"\'\)]+)["\']?[\s]*\)/';
+				$replace = 'url("../../'.dirname($file).'/$1")';
+				$file_data = preg_replace($pattern, $replace, $file_data);
+				$css_lib_data .= $file_data . "\n";
+			}
+			file_put_contents($css_lib_cache_file, $css_lib_data);
+		}
+		$this->add_html_header("<link rel='stylesheet' href='$data_href/$css_lib_cache_file' type='text/css'>", 43);
+
 		$css_latest = $config_latest;
-		foreach(array_merge(zglob("lib/*.css"), zglob("ext/*/style.css"), zglob("themes/$theme_name/style.css")) as $css) {
-			$css_files[] = $css;
+		$css_files = array_merge(zglob("lib/shimmie.css"), zglob("ext/*/style.css"), zglob("themes/$theme_name/style.css"));
+		foreach($css_files as $css) {
 			$css_latest = max($css_latest, filemtime($css));
 		}
-		$css_cache_file = data_path("cache/style.$theme_name.$css_latest.css");
+		$css_md5 = md5(serialize($css_files));
+		$css_cache_file = data_path("cache/style.main.{$theme_name}.{$css_latest}.{$css_md5}.css");
 		if(!file_exists($css_cache_file)) {
 			$css_data = "";
 			foreach($css_files as $file) {
@@ -360,15 +382,32 @@ public function add_auto_html_headers() {
 			}
 			file_put_contents($css_cache_file, $css_data);
 		}
-		$this->add_html_header("<link rel='stylesheet' href='$data_href/$css_cache_file' type='text/css'>", 43);
+		$this->add_html_header("<link rel='stylesheet' href='$data_href/$css_cache_file' type='text/css'>", 44);
+
+		/*** Generate JS cache files ***/
+		$js_lib_latest = $config_latest;
+		$js_lib_files = zglob("lib/vendor/js/*.js");
+		foreach($js_lib_files as $js) {
+			$js_lib_latest = max($js_lib_latest, filemtime($js));
+		}
+		$js_lib_md5 = md5(serialize($js_lib_files));
+		$js_lib_cache_file = data_path("cache/script.lib.{$theme_name}.{$js_lib_latest}.{$js_lib_md5}.js");
+		if(!file_exists($js_lib_cache_file)) {
+			$js_data = "";
+			foreach($js_lib_files as $file) {
+				$js_data .= file_get_contents($file) . "\n";
+			}
+			file_put_contents($js_lib_cache_file, $js_data);
+		}
+		$this->add_html_header("<script src='$data_href/$js_lib_cache_file' type='text/javascript'></script>", 45);
 
-		$js_files = array();
 		$js_latest = $config_latest;
-		foreach(array_merge(zglob("lib/*.js"), zglob("ext/*/script.js"), zglob("themes/$theme_name/script.js")) as $js) {
-			$js_files[] = $js;
+		$js_files = array_merge(zglob("lib/shimmie.js"), zglob("ext/*/script.js"), zglob("themes/$theme_name/script.js"));
+		foreach($js_files as $js) {
 			$js_latest = max($js_latest, filemtime($js));
 		}
-		$js_cache_file = data_path("cache/script.$theme_name.$js_latest.js");
+		$js_md5 = md5(serialize($js_files));
+		$js_cache_file = data_path("cache/script.main.{$theme_name}.{$js_latest}.{$js_md5}.js");
 		if(!file_exists($js_cache_file)) {
 			$js_data = "";
 			foreach($js_files as $file) {
@@ -376,7 +415,7 @@ public function add_auto_html_headers() {
 			}
 			file_put_contents($js_cache_file, $js_data);
 		}
-		$this->add_html_header("<script src='$data_href/$js_cache_file' type='text/javascript'></script>", 44);
+		$this->add_html_header("<script src='$data_href/$js_cache_file' type='text/javascript'></script>", 45);
 	}
 }
 
diff --git a/lib/vendor/css/.gitkeep b/lib/vendor/css/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/vendor/js/.gitkeep b/lib/vendor/js/.gitkeep
new file mode 100644
index 000000000..e69de29bb

From 36264d3f6e6583db8c8289460583c707922033bd Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Wed, 11 May 2016 16:50:09 +0100
Subject: [PATCH 060/250] stop caching css/js from disabled exts

---
 core/page.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/page.class.php b/core/page.class.php
index 596871b0e..011f70250 100644
--- a/core/page.class.php
+++ b/core/page.class.php
@@ -365,7 +365,7 @@ public function add_auto_html_headers() {
 		$this->add_html_header("<link rel='stylesheet' href='$data_href/$css_lib_cache_file' type='text/css'>", 43);
 
 		$css_latest = $config_latest;
-		$css_files = array_merge(zglob("lib/shimmie.css"), zglob("ext/*/style.css"), zglob("themes/$theme_name/style.css"));
+		$css_files = array_merge(zglob("lib/shimmie.css"), zglob("ext/{".ENABLED_EXTS."}/style.css"), zglob("themes/$theme_name/style.css"));
 		foreach($css_files as $css) {
 			$css_latest = max($css_latest, filemtime($css));
 		}
@@ -402,7 +402,7 @@ public function add_auto_html_headers() {
 		$this->add_html_header("<script src='$data_href/$js_lib_cache_file' type='text/javascript'></script>", 45);
 
 		$js_latest = $config_latest;
-		$js_files = array_merge(zglob("lib/shimmie.js"), zglob("ext/*/script.js"), zglob("themes/$theme_name/script.js"));
+		$js_files = array_merge(zglob("lib/shimmie.js"), zglob("ext/{".ENABLED_EXTS."}/script.js"), zglob("themes/$theme_name/script.js"));
 		foreach($js_files as $js) {
 			$js_latest = max($js_latest, filemtime($js));
 		}

From baf8aa1b8c7be8570bfbfc7289f8f11c42894559 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Wed, 11 May 2016 16:50:39 +0100
Subject: [PATCH 061/250] use composer to grab jquery this requires
 composer-asset-plugin to be globally installed

---
 composer.json | 21 ++++++++++++++++++++-
 install.php   |  2 +-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 3a4d6155d..2751ea0cd 100644
--- a/composer.json
+++ b/composer.json
@@ -3,6 +3,25 @@
 	"license" : "GPL-2.0",
 
 	"require" : {
-		"php" : ">=5.4.8"
+		"php" : ">=5.4.8",
+
+		"fxp/composer-asset-plugin": "~1.1",
+		"bower-asset/jquery": "1.12.3"
+
+	},
+
+	"vendor-copy": {
+		"vendor/bower-asset/jquery/dist/jquery.js"      : "lib/vendor/js/jquery-1.12.3.js",
+		"vendor/bower-asset/jquery/dist/jquery.min.js"  : "lib/vendor/js/jquery-1.12.3.min.js",
+		"vendor/bower-asset/jquery/dist/jquery.min.map" : "lib/vendor/js/jquery-1.12.3.min.map"
+	},
+
+	"scripts": {
+		"post-install-cmd" : [
+			"php -r \"array_map('copy', array_keys(json_decode(file_get_contents('composer.json'), TRUE)['vendor-copy']), json_decode(file_get_contents('composer.json'), TRUE)['vendor-copy']);\""
+		],
+		"post-update-cmd" : [
+			"php -r \"array_map('copy', array_keys(json_decode(file_get_contents('composer.json'), TRUE)['vendor-copy']), json_decode(file_get_contents('composer.json'), TRUE)['vendor-copy']);\""
+		]
 	}
 }
diff --git a/install.php b/install.php
index 3c6d2b193..fc76bfbd3 100644
--- a/install.php
+++ b/install.php
@@ -27,7 +27,7 @@
 		<title>Shimmie Installation</title>
 		<link rel="shortcut icon" href="favicon.ico" />
 		<link rel='stylesheet' href='lib/shimmie.css' type='text/css'>
-		<script type="text/javascript" src="lib/jquery-1.11.0.min.js"></script>
+		<script type="text/javascript" src="lib/vendor/js/jquery-1.12.3.min.js"></script>
 	</head>
 	<body>
 <?php if(false) { ?>

From 1bfec55690740bd3fc66df364dc43a1cc35a7614 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 1 Feb 2015 00:47:09 +0000
Subject: [PATCH 062/250] tag lib for autocomplete --not added autocomplete yet

---
 ext/autocomplete/lib/jquery-ui.min.css       |  7 ++
 ext/autocomplete/lib/jquery-ui.min.js        | 13 +++
 ext/autocomplete/lib/jquery-ui.theme.min.css |  5 +
 ext/autocomplete/lib/jquery.tagit.css        | 69 ++++++++++++++
 ext/autocomplete/lib/tag-it.min.js           | 17 ++++
 ext/autocomplete/lib/tagit.ui-zendesk.css    | 98 ++++++++++++++++++++
 ext/autocomplete/main.php                    | 33 +++++++
 ext/autocomplete/style.css                   |  8 ++
 ext/autocomplete/theme.php                   | 29 ++++++
 9 files changed, 279 insertions(+)
 create mode 100644 ext/autocomplete/lib/jquery-ui.min.css
 create mode 100644 ext/autocomplete/lib/jquery-ui.min.js
 create mode 100644 ext/autocomplete/lib/jquery-ui.theme.min.css
 create mode 100644 ext/autocomplete/lib/jquery.tagit.css
 create mode 100644 ext/autocomplete/lib/tag-it.min.js
 create mode 100644 ext/autocomplete/lib/tagit.ui-zendesk.css
 create mode 100644 ext/autocomplete/main.php
 create mode 100644 ext/autocomplete/style.css
 create mode 100644 ext/autocomplete/theme.php

diff --git a/ext/autocomplete/lib/jquery-ui.min.css b/ext/autocomplete/lib/jquery-ui.min.css
new file mode 100644
index 000000000..91f16a3b8
--- /dev/null
+++ b/ext/autocomplete/lib/jquery-ui.min.css
@@ -0,0 +1,7 @@
+/*! jQuery UI - v1.11.2 - 2014-10-16
+* http://jqueryui.com
+* Includes: core.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, draggable.css, menu.css, progressbar.css, resizable.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=gloss_wave&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=highlight_soft&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=glass&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=glass&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=highlight_soft&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=diagonals_thick&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=diagonals_thick&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=flat&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin:2px 0 0 0;padding:.5em .5em .5em .7em;min-height:0;font-size:100%}.ui-accordion .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-icons .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{position:absolute;left:.5em;top:50%;margin-top:-8px}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-button{display:inline-block;position:relative;padding:0;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2.2em}button.ui-button-icon-only{width:2.4em}.ui-button-icons-only{width:3.4em}button.ui-button-icons-only{width:3.7em}.ui-button .ui-button-text{display:block;line-height:normal}.ui-button-text-only .ui-button-text{padding:.4em 1em}.ui-button-icon-only .ui-button-text,.ui-button-icons-only .ui-button-text{padding:.4em;text-indent:-9999999px}.ui-button-text-icon-primary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 1em .4em 2.1em}.ui-button-text-icon-secondary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 2.1em .4em 1em}.ui-button-text-icons .ui-button-text{padding-left:2.1em;padding-right:2.1em}input.ui-button{padding:.4em 1em}.ui-button-icon-only .ui-icon,.ui-button-text-icon-primary .ui-icon,.ui-button-text-icon-secondary .ui-icon,.ui-button-text-icons .ui-icon,.ui-button-icons-only .ui-icon{position:absolute;top:50%;margin-top:-8px}.ui-button-icon-only .ui-icon{left:50%;margin-left:-8px}.ui-button-text-icon-primary .ui-button-icon-primary,.ui-button-text-icons .ui-button-icon-primary,.ui-button-icons-only .ui-button-icon-primary{left:.5em}.ui-button-text-icon-secondary .ui-button-icon-secondary,.ui-button-text-icons .ui-button-icon-secondary,.ui-button-icons-only .ui-button-icon-secondary{right:.5em}.ui-buttonset{margin-right:7px}.ui-buttonset .ui-button{margin-left:0;margin-right:-.3em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-dialog{overflow:hidden;position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:none}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{position:relative;margin:0;padding:3px 1em 3px .4em;cursor:pointer;min-height:0;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url("data:image/gif;base64,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");height:100%;filter:alpha(opacity=25);opacity:0.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-selectmenu-menu{padding:0;margin:0;position:absolute;top:0;left:0;display:none}.ui-selectmenu-menu .ui-menu{overflow:auto;overflow-x:hidden;padding-bottom:1px}.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup{font-size:1em;font-weight:bold;line-height:1.5;padding:2px 0.4em;margin:0.5em 0 0 0;height:auto;border:0}.ui-selectmenu-open{display:block}.ui-selectmenu-button{display:inline-block;overflow:hidden;position:relative;text-decoration:none;cursor:pointer}.ui-selectmenu-button span.ui-icon{right:0.5em;left:auto;margin-top:-8px;position:absolute;top:50%}.ui-selectmenu-button span.ui-selectmenu-text{text-align:left;padding:0.4em 2.1em 0.4em 1em;display:block;line-height:1.4;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default;-ms-touch-action:none;touch-action:none}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:22px}.ui-spinner-button{width:16px;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top:none;border-bottom:none;border-right:none}.ui-spinner .ui-icon{position:absolute;margin-top:-8px;top:50%;left:0}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-spinner .ui-icon-triangle-1-s{background-position:-65px -16px}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav .ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor{cursor:text}.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px;-webkit-box-shadow:0 0 5px #aaa;box-shadow:0 0 5px #aaa}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #ddd;background:#eee url("images/ui-bg_highlight-soft_100_eeeeee_1x100.png") 50% top repeat-x;color:#333}.ui-widget-content a{color:#333}.ui-widget-header{border:1px solid #e78f08;background:#f6a828 url("images/ui-bg_gloss-wave_35_f6a828_500x100.png") 50% 50% repeat-x;color:#fff;font-weight:bold}.ui-widget-header a{color:#fff}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #ccc;background:#f6f6f6 url("images/ui-bg_glass_100_f6f6f6_1x400.png") 50% 50% repeat-x;font-weight:bold;color:#1c94c4}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#1c94c4;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #fbcb09;background:#fdf5ce url("images/ui-bg_glass_100_fdf5ce_1x400.png") 50% 50% repeat-x;font-weight:bold;color:#c77405}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#c77405;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #fbd850;background:#fff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;font-weight:bold;color:#eb8f00}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#eb8f00;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fed22f;background:#ffe45c url("images/ui-bg_highlight-soft_75_ffe45c_1x100.png") 50% top repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#b81900 url("images/ui-bg_diagonals-thick_18_b81900_40x40.png") 50% 50% repeat;color:#fff}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#fff}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#fff}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_ffffff_256x240.png")}.ui-state-default .ui-icon{background-image:url("images/ui-icons_ef8c08_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url("images/ui-icons_ef8c08_256x240.png")}.ui-state-active .ui-icon{background-image:url("images/ui-icons_ef8c08_256x240.png")}.ui-state-highlight .ui-icon{background-image:url("images/ui-icons_228ef1_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_ffd27a_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#666 url("images/ui-bg_diagonals-thick_20_666666_40x40.png") 50% 50% repeat;opacity:.5;filter:Alpha(Opacity=50)}.ui-widget-shadow{margin:-5px 0 0 -5px;padding:5px;background:#000 url("images/ui-bg_flat_10_000000_40x100.png") 50% 50% repeat-x;opacity:.2;filter:Alpha(Opacity=20);border-radius:5px}
\ No newline at end of file
diff --git a/ext/autocomplete/lib/jquery-ui.min.js b/ext/autocomplete/lib/jquery-ui.min.js
new file mode 100644
index 000000000..17eab7903
--- /dev/null
+++ b/ext/autocomplete/lib/jquery-ui.min.js
@@ -0,0 +1,13 @@
+/*! jQuery UI - v1.11.2 - 2014-10-16
+* http://jqueryui.com
+* Includes: core.js, widget.js, mouse.js, position.js, accordion.js, autocomplete.js, button.js, datepicker.js, dialog.js, draggable.js, droppable.js, effect.js, effect-blind.js, effect-bounce.js, effect-clip.js, effect-drop.js, effect-explode.js, effect-fade.js, effect-fold.js, effect-highlight.js, effect-puff.js, effect-pulsate.js, effect-scale.js, effect-shake.js, effect-size.js, effect-slide.js, effect-transfer.js, menu.js, progressbar.js, resizable.js, selectable.js, selectmenu.js, slider.js, sortable.js, spinner.js, tabs.js, tooltip.js
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+(function(e){"function"==typeof define&&define.amd?define(["jquery"],e):e(jQuery)})(function(e){function t(t,s){var n,a,o,r=t.nodeName.toLowerCase();return"area"===r?(n=t.parentNode,a=n.name,t.href&&a&&"map"===n.nodeName.toLowerCase()?(o=e("img[usemap='#"+a+"']")[0],!!o&&i(o)):!1):(/input|select|textarea|button|object/.test(r)?!t.disabled:"a"===r?t.href||s:s)&&i(t)}function i(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return"hidden"===e.css(this,"visibility")}).length}function s(e){for(var t,i;e.length&&e[0]!==document;){if(t=e.css("position"),("absolute"===t||"relative"===t||"fixed"===t)&&(i=parseInt(e.css("zIndex"),10),!isNaN(i)&&0!==i))return i;e=e.parent()}return 0}function n(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},e.extend(this._defaults,this.regional[""]),this.regional.en=e.extend(!0,{},this.regional[""]),this.regional["en-US"]=e.extend(!0,{},this.regional.en),this.dpDiv=a(e("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function a(t){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return t.delegate(i,"mouseout",function(){e(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).removeClass("ui-datepicker-next-hover")}).delegate(i,"mouseover",o)}function o(){e.datepicker._isDisabledDatepicker(v.inline?v.dpDiv.parent()[0]:v.input[0])||(e(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),e(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).addClass("ui-datepicker-next-hover"))}function r(t,i){e.extend(t,i);for(var s in i)null==i[s]&&(t[s]=i[s]);return t}function h(e){return function(){var t=this.element.val();e.apply(this,arguments),this._refresh(),t!==this.element.val()&&this._trigger("change")}}e.ui=e.ui||{},e.extend(e.ui,{version:"1.11.2",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({scrollParent:function(t){var i=this.css("position"),s="absolute"===i,n=t?/(auto|scroll|hidden)/:/(auto|scroll)/,a=this.parents().filter(function(){var t=e(this);return s&&"static"===t.css("position")?!1:n.test(t.css("overflow")+t.css("overflow-y")+t.css("overflow-x"))}).eq(0);return"fixed"!==i&&a.length?a:e(this[0].ownerDocument||document)},uniqueId:function(){var e=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++e)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(i){return!!e.data(i,t)}}):function(t,i,s){return!!e.data(t,s[3])},focusable:function(i){return t(i,!isNaN(e.attr(i,"tabindex")))},tabbable:function(i){var s=e.attr(i,"tabindex"),n=isNaN(s);return(n||s>=0)&&t(i,!n)}}),e("<a>").outerWidth(1).jquery||e.each(["Width","Height"],function(t,i){function s(t,i,s,a){return e.each(n,function(){i-=parseFloat(e.css(t,"padding"+this))||0,s&&(i-=parseFloat(e.css(t,"border"+this+"Width"))||0),a&&(i-=parseFloat(e.css(t,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],a=i.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+i]=function(t){return void 0===t?o["inner"+i].call(this):this.each(function(){e(this).css(a,s(this,t)+"px")})},e.fn["outer"+i]=function(t,n){return"number"!=typeof t?o["outer"+i].call(this,t):this.each(function(){e(this).css(a,s(this,t,!0,n)+"px")})}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(i){return arguments.length?t.call(this,e.camelCase(i)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),e.fn.extend({focus:function(t){return function(i,s){return"number"==typeof i?this.each(function(){var t=this;setTimeout(function(){e(t).focus(),s&&s.call(t)},i)}):t.apply(this,arguments)}}(e.fn.focus),disableSelection:function(){var e="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.bind(e+".ui-disableSelection",function(e){e.preventDefault()})}}(),enableSelection:function(){return this.unbind(".ui-disableSelection")},zIndex:function(t){if(void 0!==t)return this.css("zIndex",t);if(this.length)for(var i,s,n=e(this[0]);n.length&&n[0]!==document;){if(i=n.css("position"),("absolute"===i||"relative"===i||"fixed"===i)&&(s=parseInt(n.css("zIndex"),10),!isNaN(s)&&0!==s))return s;n=n.parent()}return 0}}),e.ui.plugin={add:function(t,i,s){var n,a=e.ui[t].prototype;for(n in s)a.plugins[n]=a.plugins[n]||[],a.plugins[n].push([i,s[n]])},call:function(e,t,i,s){var n,a=e.plugins[t];if(a&&(s||e.element[0].parentNode&&11!==e.element[0].parentNode.nodeType))for(n=0;a.length>n;n++)e.options[a[n][0]]&&a[n][1].apply(e.element,i)}};var l=0,u=Array.prototype.slice;e.cleanData=function(t){return function(i){var s,n,a;for(a=0;null!=(n=i[a]);a++)try{s=e._data(n,"events"),s&&s.remove&&e(n).triggerHandler("remove")}catch(o){}t(i)}}(e.cleanData),e.widget=function(t,i,s){var n,a,o,r,h={},l=t.split(".")[0];return t=t.split(".")[1],n=l+"-"+t,s||(s=i,i=e.Widget),e.expr[":"][n.toLowerCase()]=function(t){return!!e.data(t,n)},e[l]=e[l]||{},a=e[l][t],o=e[l][t]=function(e,t){return this._createWidget?(arguments.length&&this._createWidget(e,t),void 0):new o(e,t)},e.extend(o,a,{version:s.version,_proto:e.extend({},s),_childConstructors:[]}),r=new i,r.options=e.widget.extend({},r.options),e.each(s,function(t,s){return e.isFunction(s)?(h[t]=function(){var e=function(){return i.prototype[t].apply(this,arguments)},n=function(e){return i.prototype[t].apply(this,e)};return function(){var t,i=this._super,a=this._superApply;return this._super=e,this._superApply=n,t=s.apply(this,arguments),this._super=i,this._superApply=a,t}}(),void 0):(h[t]=s,void 0)}),o.prototype=e.widget.extend(r,{widgetEventPrefix:a?r.widgetEventPrefix||t:t},h,{constructor:o,namespace:l,widgetName:t,widgetFullName:n}),a?(e.each(a._childConstructors,function(t,i){var s=i.prototype;e.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete a._childConstructors):i._childConstructors.push(o),e.widget.bridge(t,o),o},e.widget.extend=function(t){for(var i,s,n=u.call(arguments,1),a=0,o=n.length;o>a;a++)for(i in n[a])s=n[a][i],n[a].hasOwnProperty(i)&&void 0!==s&&(t[i]=e.isPlainObject(s)?e.isPlainObject(t[i])?e.widget.extend({},t[i],s):e.widget.extend({},s):s);return t},e.widget.bridge=function(t,i){var s=i.prototype.widgetFullName||t;e.fn[t]=function(n){var a="string"==typeof n,o=u.call(arguments,1),r=this;return n=!a&&o.length?e.widget.extend.apply(null,[n].concat(o)):n,a?this.each(function(){var i,a=e.data(this,s);return"instance"===n?(r=a,!1):a?e.isFunction(a[n])&&"_"!==n.charAt(0)?(i=a[n].apply(a,o),i!==a&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):e.error("no such method '"+n+"' for "+t+" widget instance"):e.error("cannot call methods on "+t+" prior to initialization; "+"attempted to call method '"+n+"'")}):this.each(function(){var t=e.data(this,s);t?(t.option(n||{}),t._init&&t._init()):e.data(this,s,new i(n,this))}),r}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(t,i){i=e(i||this.defaultElement||this)[0],this.element=e(i),this.uuid=l++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=e(),this.hoverable=e(),this.focusable=e(),i!==this&&(e.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===i&&this.destroy()}}),this.document=e(i.style?i.ownerDocument:i.document||i),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(t,i){var s,n,a,o=t;if(0===arguments.length)return e.widget.extend({},this.options);if("string"==typeof t)if(o={},s=t.split("."),t=s.shift(),s.length){for(n=o[t]=e.widget.extend({},this.options[t]),a=0;s.length-1>a;a++)n[s[a]]=n[s[a]]||{},n=n[s[a]];if(t=s.pop(),1===arguments.length)return void 0===n[t]?null:n[t];n[t]=i}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=i}return this._setOptions(o),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,"disabled"===e&&(this.widget().toggleClass(this.widgetFullName+"-disabled",!!t),t&&(this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus"))),this},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_on:function(t,i,s){var n,a=this;"boolean"!=typeof t&&(s=i,i=t,t=!1),s?(i=n=e(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),e.each(s,function(s,o){function r(){return t||a.options.disabled!==!0&&!e(this).hasClass("ui-state-disabled")?("string"==typeof o?a[o]:o).apply(a,arguments):void 0}"string"!=typeof o&&(r.guid=o.guid=o.guid||r.guid||e.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+a.eventNamespace,u=h[2];u?n.delegate(u,l,r):i.bind(l,r)})},_off:function(t,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(i).undelegate(i),this.bindings=e(this.bindings.not(t).get()),this.focusable=e(this.focusable.not(t).get()),this.hoverable=e(this.hoverable.not(t).get())},_delay:function(e,t){function i(){return("string"==typeof e?s[e]:e).apply(s,arguments)}var s=this;return setTimeout(i,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,i,s){var n,a,o=this.options[t];if(s=s||{},i=e.Event(i),i.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),i.target=this.element[0],a=i.originalEvent)for(n in a)n in i||(i[n]=a[n]);return this.element.trigger(i,s),!(e.isFunction(o)&&o.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,i){e.Widget.prototype["_"+t]=function(s,n,a){"string"==typeof n&&(n={effect:n});var o,r=n?n===!0||"number"==typeof n?i:n.effect||i:t;n=n||{},"number"==typeof n&&(n={duration:n}),o=!e.isEmptyObject(n),n.complete=a,n.delay&&s.delay(n.delay),o&&e.effects&&e.effects.effect[r]?s[t](n):r!==t&&s[r]?s[r](n.duration,n.easing,a):s.queue(function(i){e(this)[t](),a&&a.call(s[0]),i()})}}),e.widget;var d=!1;e(document).mouseup(function(){d=!1}),e.widget("ui.mouse",{version:"1.11.2",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var t=this;this.element.bind("mousedown."+this.widgetName,function(e){return t._mouseDown(e)}).bind("click."+this.widgetName,function(i){return!0===e.data(i.target,t.widgetName+".preventClickEvent")?(e.removeData(i.target,t.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(!d){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var i=this,s=1===t.which,n="string"==typeof this.options.cancel&&t.target.nodeName?e(t.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(t)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(t)!==!1,!this._mouseStarted)?(t.preventDefault(),!0):(!0===e.data(t.target,this.widgetName+".preventClickEvent")&&e.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(e){return i._mouseMove(e)},this._mouseUpDelegate=function(e){return i._mouseUp(e)},this.document.bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),d=!0,!0)):!0}},_mouseMove:function(t){if(this._mouseMoved){if(e.ui.ie&&(!document.documentMode||9>document.documentMode)&&!t.button)return this._mouseUp(t);if(!t.which)return this._mouseUp(t)}return(t.which||t.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,t)!==!1,this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted)},_mouseUp:function(t){return this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&e.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),d=!1,!1},_mouseDistanceMet:function(e){return Math.max(Math.abs(this._mouseDownEvent.pageX-e.pageX),Math.abs(this._mouseDownEvent.pageY-e.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),function(){function t(e,t,i){return[parseFloat(e[0])*(p.test(e[0])?t/100:1),parseFloat(e[1])*(p.test(e[1])?i/100:1)]}function i(t,i){return parseInt(e.css(t,i),10)||0}function s(t){var i=t[0];return 9===i.nodeType?{width:t.width(),height:t.height(),offset:{top:0,left:0}}:e.isWindow(i)?{width:t.width(),height:t.height(),offset:{top:t.scrollTop(),left:t.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:t.outerWidth(),height:t.outerHeight(),offset:t.offset()}}e.ui=e.ui||{};var n,a,o=Math.max,r=Math.abs,h=Math.round,l=/left|center|right/,u=/top|center|bottom/,d=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,p=/%$/,f=e.fn.position;e.position={scrollbarWidth:function(){if(void 0!==n)return n;var t,i,s=e("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),a=s.children()[0];return e("body").append(s),t=a.offsetWidth,s.css("overflow","scroll"),i=a.offsetWidth,t===i&&(i=s[0].clientWidth),s.remove(),n=t-i},getScrollInfo:function(t){var i=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),s=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),n="scroll"===i||"auto"===i&&t.width<t.element[0].scrollWidth,a="scroll"===s||"auto"===s&&t.height<t.element[0].scrollHeight;return{width:a?e.position.scrollbarWidth():0,height:n?e.position.scrollbarWidth():0}},getWithinInfo:function(t){var i=e(t||window),s=e.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType;return{element:i,isWindow:s,isDocument:n,offset:i.offset()||{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:s||n?i.width():i.outerWidth(),height:s||n?i.height():i.outerHeight()}}},e.fn.position=function(n){if(!n||!n.of)return f.apply(this,arguments);n=e.extend({},n);var p,m,g,v,y,b,_=e(n.of),x=e.position.getWithinInfo(n.within),w=e.position.getScrollInfo(x),k=(n.collision||"flip").split(" "),T={};return b=s(_),_[0].preventDefault&&(n.at="left top"),m=b.width,g=b.height,v=b.offset,y=e.extend({},v),e.each(["my","at"],function(){var e,t,i=(n[this]||"").split(" ");1===i.length&&(i=l.test(i[0])?i.concat(["center"]):u.test(i[0])?["center"].concat(i):["center","center"]),i[0]=l.test(i[0])?i[0]:"center",i[1]=u.test(i[1])?i[1]:"center",e=d.exec(i[0]),t=d.exec(i[1]),T[this]=[e?e[0]:0,t?t[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===k.length&&(k[1]=k[0]),"right"===n.at[0]?y.left+=m:"center"===n.at[0]&&(y.left+=m/2),"bottom"===n.at[1]?y.top+=g:"center"===n.at[1]&&(y.top+=g/2),p=t(T.at,m,g),y.left+=p[0],y.top+=p[1],this.each(function(){var s,l,u=e(this),d=u.outerWidth(),c=u.outerHeight(),f=i(this,"marginLeft"),b=i(this,"marginTop"),D=d+f+i(this,"marginRight")+w.width,S=c+b+i(this,"marginBottom")+w.height,M=e.extend({},y),C=t(T.my,u.outerWidth(),u.outerHeight());"right"===n.my[0]?M.left-=d:"center"===n.my[0]&&(M.left-=d/2),"bottom"===n.my[1]?M.top-=c:"center"===n.my[1]&&(M.top-=c/2),M.left+=C[0],M.top+=C[1],a||(M.left=h(M.left),M.top=h(M.top)),s={marginLeft:f,marginTop:b},e.each(["left","top"],function(t,i){e.ui.position[k[t]]&&e.ui.position[k[t]][i](M,{targetWidth:m,targetHeight:g,elemWidth:d,elemHeight:c,collisionPosition:s,collisionWidth:D,collisionHeight:S,offset:[p[0]+C[0],p[1]+C[1]],my:n.my,at:n.at,within:x,elem:u})}),n.using&&(l=function(e){var t=v.left-M.left,i=t+m-d,s=v.top-M.top,a=s+g-c,h={target:{element:_,left:v.left,top:v.top,width:m,height:g},element:{element:u,left:M.left,top:M.top,width:d,height:c},horizontal:0>i?"left":t>0?"right":"center",vertical:0>a?"top":s>0?"bottom":"middle"};d>m&&m>r(t+i)&&(h.horizontal="center"),c>g&&g>r(s+a)&&(h.vertical="middle"),h.important=o(r(t),r(i))>o(r(s),r(a))?"horizontal":"vertical",n.using.call(this,e,h)}),u.offset(e.extend(M,{using:l}))})},e.ui.position={fit:{left:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=e.left-t.collisionPosition.marginLeft,h=n-r,l=r+t.collisionWidth-a-n;t.collisionWidth>a?h>0&&0>=l?(i=e.left+h+t.collisionWidth-a-n,e.left+=h-i):e.left=l>0&&0>=h?n:h>l?n+a-t.collisionWidth:n:h>0?e.left+=h:l>0?e.left-=l:e.left=o(e.left-r,e.left)},top:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollTop:s.offset.top,a=t.within.height,r=e.top-t.collisionPosition.marginTop,h=n-r,l=r+t.collisionHeight-a-n;t.collisionHeight>a?h>0&&0>=l?(i=e.top+h+t.collisionHeight-a-n,e.top+=h-i):e.top=l>0&&0>=h?n:h>l?n+a-t.collisionHeight:n:h>0?e.top+=h:l>0?e.top-=l:e.top=o(e.top-r,e.top)}},flip:{left:function(e,t){var i,s,n=t.within,a=n.offset.left+n.scrollLeft,o=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=e.left-t.collisionPosition.marginLeft,u=l-h,d=l+t.collisionWidth-o-h,c="left"===t.my[0]?-t.elemWidth:"right"===t.my[0]?t.elemWidth:0,p="left"===t.at[0]?t.targetWidth:"right"===t.at[0]?-t.targetWidth:0,f=-2*t.offset[0];0>u?(i=e.left+c+p+f+t.collisionWidth-o-a,(0>i||r(u)>i)&&(e.left+=c+p+f)):d>0&&(s=e.left-t.collisionPosition.marginLeft+c+p+f-h,(s>0||d>r(s))&&(e.left+=c+p+f))},top:function(e,t){var i,s,n=t.within,a=n.offset.top+n.scrollTop,o=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=e.top-t.collisionPosition.marginTop,u=l-h,d=l+t.collisionHeight-o-h,c="top"===t.my[1],p=c?-t.elemHeight:"bottom"===t.my[1]?t.elemHeight:0,f="top"===t.at[1]?t.targetHeight:"bottom"===t.at[1]?-t.targetHeight:0,m=-2*t.offset[1];0>u?(s=e.top+p+f+m+t.collisionHeight-o-a,e.top+p+f+m>u&&(0>s||r(u)>s)&&(e.top+=p+f+m)):d>0&&(i=e.top-t.collisionPosition.marginTop+p+f+m-h,e.top+p+f+m>d&&(i>0||d>r(i))&&(e.top+=p+f+m))}},flipfit:{left:function(){e.ui.position.flip.left.apply(this,arguments),e.ui.position.fit.left.apply(this,arguments)},top:function(){e.ui.position.flip.top.apply(this,arguments),e.ui.position.fit.top.apply(this,arguments)}}},function(){var t,i,s,n,o,r=document.getElementsByTagName("body")[0],h=document.createElement("div");t=document.createElement(r?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},r&&e.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(o in s)t.style[o]=s[o];t.appendChild(h),i=r||document.documentElement,i.insertBefore(t,i.firstChild),h.style.cssText="position: absolute; left: 10.7432222px;",n=e(h).offset().left,a=n>10&&11>n,t.innerHTML="",i.removeChild(t)}()}(),e.ui.position,e.widget("ui.accordion",{version:"1.11.2",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var t=this.options;this.prevShow=this.prevHide=e(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),t.collapsible||t.active!==!1&&null!=t.active||(t.active=0),this._processPanels(),0>t.active&&(t.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():e()}},_createIcons:function(){var t=this.options.icons;t&&(e("<span>").addClass("ui-accordion-header-icon ui-icon "+t.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(t.header).addClass(t.activeHeader),this.headers.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var e;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").removeUniqueId(),this._destroyIcons(),e=this.headers.next().removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").css("display","").removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&e.css("height","")},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):("event"===e&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(t)),this._super(e,t),"collapsible"!==e||t||this.options.active!==!1||this._activate(0),"icons"===e&&(this._destroyIcons(),t&&this._createIcons()),"disabled"===e&&(this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!t)),void 0)},_keydown:function(t){if(!t.altKey&&!t.ctrlKey){var i=e.ui.keyCode,s=this.headers.length,n=this.headers.index(t.target),a=!1;switch(t.keyCode){case i.RIGHT:case i.DOWN:a=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:a=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(t);break;case i.HOME:a=this.headers[0];break;case i.END:a=this.headers[s-1]}a&&(e(t.target).attr("tabIndex",-1),e(a).attr("tabIndex",0),a.focus(),t.preventDefault())}},_panelKeyDown:function(t){t.keyCode===e.ui.keyCode.UP&&t.ctrlKey&&e(t.currentTarget).prev().focus()},refresh:function(){var t=this.options;this._processPanels(),t.active===!1&&t.collapsible===!0||!this.headers.length?(t.active=!1,this.active=e()):t.active===!1?this._activate(0):this.active.length&&!e.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(t.active=!1,this.active=e()):this._activate(Math.max(0,t.active-1)):t.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var e=this.headers,t=this.panels;this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-state-default ui-corner-all"),this.panels=this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide(),t&&(this._off(e.not(this.headers)),this._off(t.not(this.panels)))},_refresh:function(){var t,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active).addClass("ui-accordion-header-active ui-state-active ui-corner-top").removeClass("ui-corner-all"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(){var t=e(this),i=t.uniqueId().attr("id"),s=t.next(),n=s.uniqueId().attr("id");t.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(t=n.height(),this.element.siblings(":visible").each(function(){var i=e(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(t-=i.outerHeight(!0))}),this.headers.each(function(){t-=e(this).outerHeight(!0)}),this.headers.next().each(function(){e(this).height(Math.max(0,t-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===s&&(t=0,this.headers.next().each(function(){t=Math.max(t,e(this).css("height","").height())}).height(t))},_activate:function(t){var i=this._findActive(t)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return"number"==typeof t?this.headers.eq(t):e()},_setupEvents:function(t){var i={keydown:"_keydown"};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n[0]===s[0],o=a&&i.collapsible,r=o?e():n.next(),h=s.next(),l={oldHeader:s,oldPanel:h,newHeader:o?e():n,newPanel:r};t.preventDefault(),a&&!i.collapsible||this._trigger("beforeActivate",t,l)===!1||(i.active=o?!1:this.headers.index(n),this.active=a?e():n,this._toggle(l),s.removeClass("ui-accordion-header-active ui-state-active"),i.icons&&s.children(".ui-accordion-header-icon").removeClass(i.icons.activeHeader).addClass(i.icons.header),a||(n.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),i.icons&&n.children(".ui-accordion-header-icon").removeClass(i.icons.header).addClass(i.icons.activeHeader),n.next().addClass("ui-accordion-content-active")))},_toggle:function(t){var i=t.newPanel,s=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,t):(s.hide(),i.show(),this._toggleComplete(t)),s.attr({"aria-hidden":"true"}),s.prev().attr("aria-selected","false"),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===e(this).attr("tabIndex")}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true",tabIndex:0,"aria-expanded":"true"})},_animate:function(e,t,i){var s,n,a,o=this,r=0,h=e.length&&(!t.length||e.index()<t.index()),l=this.options.animate||{},u=h&&l.down||l,d=function(){o._toggleComplete(i)};return"number"==typeof u&&(a=u),"string"==typeof u&&(n=u),n=n||u.easing||l.easing,a=a||u.duration||l.duration,t.length?e.length?(s=e.show().outerHeight(),t.animate(this.hideProps,{duration:a,easing:n,step:function(e,t){t.now=Math.round(e)}}),e.hide().animate(this.showProps,{duration:a,easing:n,complete:d,step:function(e,i){i.now=Math.round(e),"height"!==i.prop?r+=i.now:"content"!==o.options.heightStyle&&(i.now=Math.round(s-t.outerHeight()-r),r=0)}}),void 0):t.animate(this.hideProps,a,n,d):e.animate(this.showProps,a,n,d)},_toggleComplete:function(e){var t=e.oldPanel;t.removeClass("ui-accordion-content-active").prev().removeClass("ui-corner-top").addClass("ui-corner-all"),t.length&&(t.parent()[0].className=t.parent()[0].className),this._trigger("activate",null,e)}}),e.widget("ui.menu",{version:"1.11.2",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},items:"> *",menus:"ul",position:{my:"left-1 top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item":function(e){e.preventDefault()},"click .ui-menu-item":function(t){var i=e(t.target);!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&e(this.document[0].activeElement).closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){if(!this.previousFilter){var i=e(t.currentTarget);i.siblings(".ui-state-active").removeClass("ui-state-active"),this.focus(t,i)
+}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(e,t){var i=this.active||this.element.find(this.options.items).eq(0);t||this.focus(e,i)},blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){this._closeOnDocumentClick(e)&&this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-menu-icons ui-front").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").removeUniqueId().removeClass("ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(t){var i,s,n,a,o=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:o=!1,s=this.previousFilter||"",n=String.fromCharCode(t.keyCode),a=!1,clearTimeout(this.filterTimer),n===s?a=!0:n=s+n,i=this._filterMenuItems(n),i=a&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(t.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(t,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}o&&t.preventDefault()},_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.is("[aria-haspopup='true']")?this.expand(e):this.select(e))},refresh:function(){var t,i,s=this,n=this.options.icons.submenu,a=this.element.find(this.options.menus);this.element.toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length),a.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-front").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),i=t.parent(),s=e("<span>").addClass("ui-menu-icon ui-icon "+n).data("ui-menu-submenu-carat",!0);i.attr("aria-haspopup","true").prepend(s),t.attr("aria-labelledby",i.attr("id"))}),t=a.add(this.element),i=t.find(this.options.items),i.not(".ui-menu-item").each(function(){var t=e(this);s._isDivider(t)&&t.addClass("ui-widget-content ui-menu-divider")}),i.not(".ui-menu-item, .ui-menu-divider").addClass("ui-menu-item").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(e,t){"icons"===e&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(t.submenu),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},focus:function(e,t){var i,s;this.blur(e,e&&"focus"===e.type),this._scrollIntoView(t),this.active=t.first(),s=this.active.addClass("ui-state-focus").removeClass("ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").addClass("ui-state-active"),e&&"keydown"===e.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=t.children(".ui-menu"),i.length&&e&&/^mouse/.test(e.type)&&this._startOpening(i),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},_scrollIntoView:function(t){var i,s,n,a,o,r;this._hasScroll()&&(i=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,n=t.offset().top-this.activeMenu.offset().top-i-s,a=this.activeMenu.scrollTop(),o=this.activeMenu.height(),r=t.outerHeight(),0>n?this.activeMenu.scrollTop(a+n):n+r>o&&this.activeMenu.scrollTop(a+n-o+r))},blur:function(e,t){t||clearTimeout(this.timer),this.active&&(this.active.removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active}))},_startOpening:function(e){clearTimeout(this.timer),"true"===e.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(e)},this.delay))},_open:function(t){var i=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(t,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(t),this.activeMenu=s},this.delay)},_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find(".ui-state-active").not(".ui-state-focus").removeClass("ui-state-active")},_closeOnDocumentClick:function(t){return!e(t.target).closest(".ui-menu").length},_isDivider:function(e){return!/[^\-\u2014\u2013\s]/.test(e.text())},collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),this.focus(e,t))},expand:function(e){var t=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},next:function(e){this._move("next","first",e)},previous:function(e){this._move("prev","last",e)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(e,t,i){var s;this.active&&(s="first"===e||"last"===e?this.active["first"===e?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[e+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[t]()),this.focus(i,s)},nextPage:function(t){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=e(this),0>i.offset().top-s-n}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(t),void 0)},previousPage:function(t){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=e(this),i.offset().top-s+n>0}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items).first())),void 0):(this.next(t),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||e(t.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,i)},_filterMenuItems:function(t){var i=t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),s=RegExp("^"+i,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return s.test(e.trim(e(this).text()))})}}),e.widget("ui.autocomplete",{version:"1.11.2",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var t,i,s,n=this.element[0].nodeName.toLowerCase(),a="textarea"===n,o="input"===n;this.isMultiLine=a?!0:o?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[a||o?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return t=!0,s=!0,i=!0,void 0;t=!1,s=!1,i=!1;var a=e.ui.keyCode;switch(n.keyCode){case a.PAGE_UP:t=!0,this._move("previousPage",n);break;case a.PAGE_DOWN:t=!0,this._move("nextPage",n);break;case a.UP:t=!0,this._keyEvent("previous",n);break;case a.DOWN:t=!0,this._keyEvent("next",n);break;case a.ENTER:this.menu.active&&(t=!0,n.preventDefault(),this.menu.select(n));break;case a.TAB:this.menu.active&&this.menu.select(n);break;case a.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(t)return t=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=e.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(e){return s?(s=!1,e.preventDefault(),void 0):(this._searchTimeout(e),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(e),this._change(e),void 0)}}),this._initSource(),this.menu=e("<ul>").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var i=this.menu.element[0];e(t.target).closest(".ui-menu-item").length||this._delay(function(){var t=this;this.document.one("mousedown",function(s){s.target===t.element[0]||s.target===i||e.contains(i,s.target)||t.close()})})},menufocus:function(t,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){e(t.target).trigger(t.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:n})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&e.trim(s).length&&(this.liveRegion.children().hide(),e("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,t){var i=t.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",e,{item:i})&&this._value(i.value),this.term=this._value(),this.close(e),this.selectedItem=i}}),this.liveRegion=e("<span>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(e,t){this._super(e,t),"source"===e&&this._initSource(),"appendTo"===e&&this.menu.element.appendTo(this._appendTo()),"disabled"===e&&t&&this.xhr&&this.xhr.abort()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t&&t[0]||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_initSource:function(){var t,i,s=this;e.isArray(this.options.source)?(t=this.options.source,this.source=function(i,s){s(e.ui.autocomplete.filter(t,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(t,n){s.xhr&&s.xhr.abort(),s.xhr=e.ajax({url:i,data:t,dataType:"json",success:function(e){n(e)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(e){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),i=this.menu.element.is(":visible"),s=e.altKey||e.ctrlKey||e.metaKey||e.shiftKey;(!t||t&&!i&&!s)&&(this.selectedItem=null,this.search(null,e))},this.options.delay)},search:function(e,t){return e=null!=e?e:this._value(),this.term=this._value(),e.length<this.options.minLength?this.close(t):this._trigger("search",t)!==!1?this._search(e):void 0},_search:function(e){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:e},this._response())},_response:function(){var t=++this.requestIndex;return e.proxy(function(e){t===this.requestIndex&&this.__response(e),this.pending--,this.pending||this.element.removeClass("ui-autocomplete-loading")},this)},__response:function(e){e&&(e=this._normalize(e)),this._trigger("response",null,{content:e}),!this.options.disabled&&e&&e.length&&!this.cancelSearch?(this._suggest(e),this._trigger("open")):this._close()},close:function(e){this.cancelSearch=!0,this._close(e)},_close:function(e){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",e))},_change:function(e){this.previous!==this._value()&&this._trigger("change",e,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:e.map(t,function(t){return"string"==typeof t?{label:t,value:t}:e.extend({},t,{label:t.label||t.value,value:t.value||t.label})})},_suggest:function(t){var i=this.menu.element.empty();this._renderMenu(i,t),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(e.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var e=this.menu.element;e.outerWidth(Math.max(e.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(t,i){var s=this;e.each(i,function(e,i){s._renderItemData(t,i)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-autocomplete-item",t)},_renderItem:function(t,i){return e("<li>").text(i.label).appendTo(t)},_move:function(e,t){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(e)||this.menu.isLastItem()&&/^next/.test(e)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[e](t),void 0):(this.search(null,t),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(e,t){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(e,t),t.preventDefault())}}),e.extend(e.ui.autocomplete,{escapeRegex:function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,i){var s=RegExp(e.ui.autocomplete.escapeRegex(i),"i");return e.grep(t,function(e){return s.test(e.label||e.value||e)})}}),e.widget("ui.autocomplete",e.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(e){return e+(e>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,this.liveRegion.children().hide(),e("<div>").text(i).appendTo(this.liveRegion))}}),e.ui.autocomplete;var c,p="ui-button ui-widget ui-state-default ui-corner-all",f="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",m=function(){var t=e(this);setTimeout(function(){t.find(":ui-button").button("refresh")},1)},g=function(t){var i=t.name,s=t.form,n=e([]);return i&&(i=i.replace(/'/g,"\\'"),n=s?e(s).find("[name='"+i+"'][type=radio]"):e("[name='"+i+"'][type=radio]",t.ownerDocument).filter(function(){return!this.form})),n};e.widget("ui.button",{version:"1.11.2",defaultElement:"<button>",options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset"+this.eventNamespace).bind("reset"+this.eventNamespace,m),"boolean"!=typeof this.options.disabled?this.options.disabled=!!this.element.prop("disabled"):this.element.prop("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var t=this,i=this.options,s="checkbox"===this.type||"radio"===this.type,n=s?"":"ui-state-active";null===i.label&&(i.label="input"===this.type?this.buttonElement.val():this.buttonElement.html()),this._hoverable(this.buttonElement),this.buttonElement.addClass(p).attr("role","button").bind("mouseenter"+this.eventNamespace,function(){i.disabled||this===c&&e(this).addClass("ui-state-active")}).bind("mouseleave"+this.eventNamespace,function(){i.disabled||e(this).removeClass(n)}).bind("click"+this.eventNamespace,function(e){i.disabled&&(e.preventDefault(),e.stopImmediatePropagation())}),this._on({focus:function(){this.buttonElement.addClass("ui-state-focus")},blur:function(){this.buttonElement.removeClass("ui-state-focus")}}),s&&this.element.bind("change"+this.eventNamespace,function(){t.refresh()}),"checkbox"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){return i.disabled?!1:void 0}):"radio"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){if(i.disabled)return!1;e(this).addClass("ui-state-active"),t.buttonElement.attr("aria-pressed","true");var s=t.element[0];g(s).not(s).map(function(){return e(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown"+this.eventNamespace,function(){return i.disabled?!1:(e(this).addClass("ui-state-active"),c=this,t.document.one("mouseup",function(){c=null}),void 0)}).bind("mouseup"+this.eventNamespace,function(){return i.disabled?!1:(e(this).removeClass("ui-state-active"),void 0)}).bind("keydown"+this.eventNamespace,function(t){return i.disabled?!1:((t.keyCode===e.ui.keyCode.SPACE||t.keyCode===e.ui.keyCode.ENTER)&&e(this).addClass("ui-state-active"),void 0)}).bind("keyup"+this.eventNamespace+" blur"+this.eventNamespace,function(){e(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(t){t.keyCode===e.ui.keyCode.SPACE&&e(this).click()})),this._setOption("disabled",i.disabled),this._resetButton()},_determineButtonType:function(){var e,t,i;this.type=this.element.is("[type=checkbox]")?"checkbox":this.element.is("[type=radio]")?"radio":this.element.is("input")?"input":"button","checkbox"===this.type||"radio"===this.type?(e=this.element.parents().last(),t="label[for='"+this.element.attr("id")+"']",this.buttonElement=e.find(t),this.buttonElement.length||(e=e.length?e.siblings():this.element.siblings(),this.buttonElement=e.filter(t),this.buttonElement.length||(this.buttonElement=e.find(t))),this.element.addClass("ui-helper-hidden-accessible"),i=this.element.is(":checked"),i&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.prop("aria-pressed",i)):this.buttonElement=this.element},widget:function(){return this.buttonElement},_destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(p+" ui-state-active "+f).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title")},_setOption:function(e,t){return this._super(e,t),"disabled"===e?(this.widget().toggleClass("ui-state-disabled",!!t),this.element.prop("disabled",!!t),t&&("checkbox"===this.type||"radio"===this.type?this.buttonElement.removeClass("ui-state-focus"):this.buttonElement.removeClass("ui-state-focus ui-state-active")),void 0):(this._resetButton(),void 0)},refresh:function(){var t=this.element.is("input, button")?this.element.is(":disabled"):this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOption("disabled",t),"radio"===this.type?g(this.element[0]).each(function(){e(this).is(":checked")?e(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):e(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):"checkbox"===this.type&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if("input"===this.type)return this.options.label&&this.element.val(this.options.label),void 0;var t=this.buttonElement.removeClass(f),i=e("<span></span>",this.document[0]).addClass("ui-button-text").html(this.options.label).appendTo(t.empty()).text(),s=this.options.icons,n=s.primary&&s.secondary,a=[];s.primary||s.secondary?(this.options.text&&a.push("ui-button-text-icon"+(n?"s":s.primary?"-primary":"-secondary")),s.primary&&t.prepend("<span class='ui-button-icon-primary ui-icon "+s.primary+"'></span>"),s.secondary&&t.append("<span class='ui-button-icon-secondary ui-icon "+s.secondary+"'></span>"),this.options.text||(a.push(n?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||t.attr("title",e.trim(i)))):a.push("ui-button-text-only"),t.addClass(a.join(" "))}}),e.widget("ui.buttonset",{version:"1.11.2",options:{items:"button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(e,t){"disabled"===e&&this.buttons.button("option",e,t),this._super(e,t)},refresh:function(){var t="rtl"===this.element.css("direction"),i=this.element.find(this.options.items),s=i.filter(":ui-button");i.not(":ui-button").button(),s.button("refresh"),this.buttons=i.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(t?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(t?"ui-corner-left":"ui-corner-right").end().end()},_destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy")}}),e.ui.button,e.extend(e.ui,{datepicker:{version:"1.11.2"}});var v;e.extend(n.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(e){return r(this._defaults,e||{}),this},_attachDatepicker:function(t,i){var s,n,a;s=t.nodeName.toLowerCase(),n="div"===s||"span"===s,t.id||(this.uuid+=1,t.id="dp"+this.uuid),a=this._newInst(e(t),n),a.settings=e.extend({},i||{}),"input"===s?this._connectDatepicker(t,a):n&&this._inlineDatepicker(t,a)},_newInst:function(t,i){var s=t[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:s,input:t,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?a(e("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(t,i){var s=e(t);i.append=e([]),i.trigger=e([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp),this._autoSize(i),e.data(t,"datepicker",i),i.settings.disabled&&this._disableDatepicker(t))},_attachments:function(t,i){var s,n,a,o=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),o&&(i.append=e("<span class='"+this._appendClass+"'>"+o+"</span>"),t[r?"before":"after"](i.append)),t.unbind("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&t.focus(this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),a=this._get(i,"buttonImage"),i.trigger=e(this._get(i,"buttonImageOnly")?e("<img/>").addClass(this._triggerClass).attr({src:a,alt:n,title:n}):e("<button type='button'></button>").addClass(this._triggerClass).html(a?e("<img/>").attr({src:a,alt:n,title:n}):n)),t[r?"before":"after"](i.trigger),i.trigger.click(function(){return e.datepicker._datepickerShowing&&e.datepicker._lastInput===t[0]?e.datepicker._hideDatepicker():e.datepicker._datepickerShowing&&e.datepicker._lastInput!==t[0]?(e.datepicker._hideDatepicker(),e.datepicker._showDatepicker(t[0])):e.datepicker._showDatepicker(t[0]),!1}))},_autoSize:function(e){if(this._get(e,"autoSize")&&!e.inline){var t,i,s,n,a=new Date(2009,11,20),o=this._get(e,"dateFormat");o.match(/[DM]/)&&(t=function(e){for(i=0,s=0,n=0;e.length>n;n++)e[n].length>i&&(i=e[n].length,s=n);return s},a.setMonth(t(this._get(e,o.match(/MM/)?"monthNames":"monthNamesShort"))),a.setDate(t(this._get(e,o.match(/DD/)?"dayNames":"dayNamesShort"))+20-a.getDay())),e.input.attr("size",this._formatDate(e,a).length)}},_inlineDatepicker:function(t,i){var s=e(t);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),e.data(t,"datepicker",i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(t),i.dpDiv.css("display","block"))},_dialogDatepicker:function(t,i,s,n,a){var o,h,l,u,d,c=this._dialogInst;return c||(this.uuid+=1,o="dp"+this.uuid,this._dialogInput=e("<input type='text' id='"+o+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.keydown(this._doKeyDown),e("body").append(this._dialogInput),c=this._dialogInst=this._newInst(this._dialogInput,!1),c.settings={},e.data(this._dialogInput[0],"datepicker",c)),r(c.settings,n||{}),i=i&&i.constructor===Date?this._formatDate(c,i):i,this._dialogInput.val(i),this._pos=a?a.length?a:[a.pageX,a.pageY]:null,this._pos||(h=document.documentElement.clientWidth,l=document.documentElement.clientHeight,u=document.documentElement.scrollLeft||document.body.scrollLeft,d=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[h/2-100+u,l/2-150+d]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),c.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),e.blockUI&&e.blockUI(this.dpDiv),e.data(this._dialogInput[0],"datepicker",c),this},_destroyDatepicker:function(t){var i,s=e(t),n=e.data(t,"datepicker");s.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),e.removeData(t,"datepicker"),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty())},_enableDatepicker:function(t){var i,s,n=e(t),a=e.data(t,"datepicker");n.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),"input"===i?(t.disabled=!1,a.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}))},_disableDatepicker:function(t){var i,s,n=e(t),a=e.data(t,"datepicker");n.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),"input"===i?(t.disabled=!0,a.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}),this._disabledInputs[this._disabledInputs.length]=t)},_isDisabledDatepicker:function(e){if(!e)return!1;for(var t=0;this._disabledInputs.length>t;t++)if(this._disabledInputs[t]===e)return!0;return!1},_getInst:function(t){try{return e.data(t,"datepicker")}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(t,i,s){var n,a,o,h,l=this._getInst(t);return 2===arguments.length&&"string"==typeof i?"defaults"===i?e.extend({},e.datepicker._defaults):l?"all"===i?e.extend({},l.settings):this._get(l,i):null:(n=i||{},"string"==typeof i&&(n={},n[i]=s),l&&(this._curInst===l&&this._hideDatepicker(),a=this._getDateDatepicker(t,!0),o=this._getMinMaxDate(l,"min"),h=this._getMinMaxDate(l,"max"),r(l.settings,n),null!==o&&void 0!==n.dateFormat&&void 0===n.minDate&&(l.settings.minDate=this._formatDate(l,o)),null!==h&&void 0!==n.dateFormat&&void 0===n.maxDate&&(l.settings.maxDate=this._formatDate(l,h)),"disabled"in n&&(n.disabled?this._disableDatepicker(t):this._enableDatepicker(t)),this._attachments(e(t),l),this._autoSize(l),this._setDate(l,a),this._updateAlternate(l),this._updateDatepicker(l)),void 0)},_changeDatepicker:function(e,t,i){this._optionDatepicker(e,t,i)},_refreshDatepicker:function(e){var t=this._getInst(e);t&&this._updateDatepicker(t)},_setDateDatepicker:function(e,t){var i=this._getInst(e);i&&(this._setDate(i,t),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(e,t){var i=this._getInst(e);return i&&!i.inline&&this._setDateFromField(i,t),i?this._getDate(i):null},_doKeyDown:function(t){var i,s,n,a=e.datepicker._getInst(t.target),o=!0,r=a.dpDiv.is(".ui-datepicker-rtl");if(a._keyEvent=!0,e.datepicker._datepickerShowing)switch(t.keyCode){case 9:e.datepicker._hideDatepicker(),o=!1;break;case 13:return n=e("td."+e.datepicker._dayOverClass+":not(."+e.datepicker._currentClass+")",a.dpDiv),n[0]&&e.datepicker._selectDay(t.target,a.selectedMonth,a.selectedYear,n[0]),i=e.datepicker._get(a,"onSelect"),i?(s=e.datepicker._formatDate(a),i.apply(a.input?a.input[0]:null,[s,a])):e.datepicker._hideDatepicker(),!1;case 27:e.datepicker._hideDatepicker();break;case 33:e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(a,"stepBigMonths"):-e.datepicker._get(a,"stepMonths"),"M");break;case 34:e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(a,"stepBigMonths"):+e.datepicker._get(a,"stepMonths"),"M");break;case 35:(t.ctrlKey||t.metaKey)&&e.datepicker._clearDate(t.target),o=t.ctrlKey||t.metaKey;break;case 36:(t.ctrlKey||t.metaKey)&&e.datepicker._gotoToday(t.target),o=t.ctrlKey||t.metaKey;break;case 37:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,r?1:-1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(a,"stepBigMonths"):-e.datepicker._get(a,"stepMonths"),"M");break;case 38:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,-7,"D"),o=t.ctrlKey||t.metaKey;break;case 39:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,r?-1:1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(a,"stepBigMonths"):+e.datepicker._get(a,"stepMonths"),"M");break;case 40:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,7,"D"),o=t.ctrlKey||t.metaKey;break;default:o=!1}else 36===t.keyCode&&t.ctrlKey?e.datepicker._showDatepicker(this):o=!1;o&&(t.preventDefault(),t.stopPropagation())},_doKeyPress:function(t){var i,s,n=e.datepicker._getInst(t.target);return e.datepicker._get(n,"constrainInput")?(i=e.datepicker._possibleChars(e.datepicker._get(n,"dateFormat")),s=String.fromCharCode(null==t.charCode?t.keyCode:t.charCode),t.ctrlKey||t.metaKey||" ">s||!i||i.indexOf(s)>-1):void 0
+},_doKeyUp:function(t){var i,s=e.datepicker._getInst(t.target);if(s.input.val()!==s.lastVal)try{i=e.datepicker.parseDate(e.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,e.datepicker._getFormatConfig(s)),i&&(e.datepicker._setDateFromField(s),e.datepicker._updateAlternate(s),e.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(t){if(t=t.target||t,"input"!==t.nodeName.toLowerCase()&&(t=e("input",t.parentNode)[0]),!e.datepicker._isDisabledDatepicker(t)&&e.datepicker._lastInput!==t){var i,n,a,o,h,l,u;i=e.datepicker._getInst(t),e.datepicker._curInst&&e.datepicker._curInst!==i&&(e.datepicker._curInst.dpDiv.stop(!0,!0),i&&e.datepicker._datepickerShowing&&e.datepicker._hideDatepicker(e.datepicker._curInst.input[0])),n=e.datepicker._get(i,"beforeShow"),a=n?n.apply(t,[t,i]):{},a!==!1&&(r(i.settings,a),i.lastVal=null,e.datepicker._lastInput=t,e.datepicker._setDateFromField(i),e.datepicker._inDialog&&(t.value=""),e.datepicker._pos||(e.datepicker._pos=e.datepicker._findPos(t),e.datepicker._pos[1]+=t.offsetHeight),o=!1,e(t).parents().each(function(){return o|="fixed"===e(this).css("position"),!o}),h={left:e.datepicker._pos[0],top:e.datepicker._pos[1]},e.datepicker._pos=null,i.dpDiv.empty(),i.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),e.datepicker._updateDatepicker(i),h=e.datepicker._checkOffset(i,h,o),i.dpDiv.css({position:e.datepicker._inDialog&&e.blockUI?"static":o?"fixed":"absolute",display:"none",left:h.left+"px",top:h.top+"px"}),i.inline||(l=e.datepicker._get(i,"showAnim"),u=e.datepicker._get(i,"duration"),i.dpDiv.css("z-index",s(e(t))+1),e.datepicker._datepickerShowing=!0,e.effects&&e.effects.effect[l]?i.dpDiv.show(l,e.datepicker._get(i,"showOptions"),u):i.dpDiv[l||"show"](l?u:null),e.datepicker._shouldFocusInput(i)&&i.input.focus(),e.datepicker._curInst=i))}},_updateDatepicker:function(t){this.maxRows=4,v=t,t.dpDiv.empty().append(this._generateHTML(t)),this._attachHandlers(t);var i,s=this._getNumberOfMonths(t),n=s[1],a=17,r=t.dpDiv.find("."+this._dayOverClass+" a");r.length>0&&o.apply(r.get(0)),t.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&t.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),t.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),t.dpDiv[(this._get(t,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),t===e.datepicker._curInst&&e.datepicker._datepickerShowing&&e.datepicker._shouldFocusInput(t)&&t.input.focus(),t.yearshtml&&(i=t.yearshtml,setTimeout(function(){i===t.yearshtml&&t.yearshtml&&t.dpDiv.find("select.ui-datepicker-year:first").replaceWith(t.yearshtml),i=t.yearshtml=null},0))},_shouldFocusInput:function(e){return e.input&&e.input.is(":visible")&&!e.input.is(":disabled")&&!e.input.is(":focus")},_checkOffset:function(t,i,s){var n=t.dpDiv.outerWidth(),a=t.dpDiv.outerHeight(),o=t.input?t.input.outerWidth():0,r=t.input?t.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:e(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:e(document).scrollTop());return i.left-=this._get(t,"isRTL")?n-o:0,i.left-=s&&i.left===t.input.offset().left?e(document).scrollLeft():0,i.top-=s&&i.top===t.input.offset().top+r?e(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+a>l&&l>a?Math.abs(a+r):0),i},_findPos:function(t){for(var i,s=this._getInst(t),n=this._get(s,"isRTL");t&&("hidden"===t.type||1!==t.nodeType||e.expr.filters.hidden(t));)t=t[n?"previousSibling":"nextSibling"];return i=e(t).offset(),[i.left,i.top]},_hideDatepicker:function(t){var i,s,n,a,o=this._curInst;!o||t&&o!==e.data(t,"datepicker")||this._datepickerShowing&&(i=this._get(o,"showAnim"),s=this._get(o,"duration"),n=function(){e.datepicker._tidyDialog(o)},e.effects&&(e.effects.effect[i]||e.effects[i])?o.dpDiv.hide(i,e.datepicker._get(o,"showOptions"),s,n):o.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,a=this._get(o,"onClose"),a&&a.apply(o.input?o.input[0]:null,[o.input?o.input.val():"",o]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),e.blockUI&&(e.unblockUI(),e("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(e){e.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(t){if(e.datepicker._curInst){var i=e(t.target),s=e.datepicker._getInst(i[0]);(i[0].id!==e.datepicker._mainDivId&&0===i.parents("#"+e.datepicker._mainDivId).length&&!i.hasClass(e.datepicker.markerClassName)&&!i.closest("."+e.datepicker._triggerClass).length&&e.datepicker._datepickerShowing&&(!e.datepicker._inDialog||!e.blockUI)||i.hasClass(e.datepicker.markerClassName)&&e.datepicker._curInst!==s)&&e.datepicker._hideDatepicker()}},_adjustDate:function(t,i,s){var n=e(t),a=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(a,i+("M"===s?this._get(a,"showCurrentAtPos"):0),s),this._updateDatepicker(a))},_gotoToday:function(t){var i,s=e(t),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(t,i,s){var n=e(t),a=this._getInst(n[0]);a["selected"+("M"===s?"Month":"Year")]=a["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(a),this._adjustDate(n)},_selectDay:function(t,i,s,n){var a,o=e(t);e(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(o[0])||(a=this._getInst(o[0]),a.selectedDay=a.currentDay=e("a",n).html(),a.selectedMonth=a.currentMonth=i,a.selectedYear=a.currentYear=s,this._selectDate(t,this._formatDate(a,a.currentDay,a.currentMonth,a.currentYear)))},_clearDate:function(t){var i=e(t);this._selectDate(i,"")},_selectDate:function(t,i){var s,n=e(t),a=this._getInst(n[0]);i=null!=i?i:this._formatDate(a),a.input&&a.input.val(i),this._updateAlternate(a),s=this._get(a,"onSelect"),s?s.apply(a.input?a.input[0]:null,[i,a]):a.input&&a.input.trigger("change"),a.inline?this._updateDatepicker(a):(this._hideDatepicker(),this._lastInput=a.input[0],"object"!=typeof a.input[0]&&a.input.focus(),this._lastInput=null)},_updateAlternate:function(t){var i,s,n,a=this._get(t,"altField");a&&(i=this._get(t,"altFormat")||this._get(t,"dateFormat"),s=this._getDate(t),n=this.formatDate(i,s,this._getFormatConfig(t)),e(a).each(function(){e(this).val(n)}))},noWeekends:function(e){var t=e.getDay();return[t>0&&6>t,""]},iso8601Week:function(e){var t,i=new Date(e.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),t=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((t-i)/864e5)/7)+1},parseDate:function(t,i,s){if(null==t||null==i)throw"Invalid arguments";if(i="object"==typeof i?""+i:i+"",""===i)return null;var n,a,o,r,h=0,l=(s?s.shortYearCutoff:null)||this._defaults.shortYearCutoff,u="string"!=typeof l?l:(new Date).getFullYear()%100+parseInt(l,10),d=(s?s.dayNamesShort:null)||this._defaults.dayNamesShort,c=(s?s.dayNames:null)||this._defaults.dayNames,p=(s?s.monthNamesShort:null)||this._defaults.monthNamesShort,f=(s?s.monthNames:null)||this._defaults.monthNames,m=-1,g=-1,v=-1,y=-1,b=!1,_=function(e){var i=t.length>n+1&&t.charAt(n+1)===e;return i&&n++,i},x=function(e){var t=_(e),s="@"===e?14:"!"===e?20:"y"===e&&t?4:"o"===e?3:2,n="y"===e?s:1,a=RegExp("^\\d{"+n+","+s+"}"),o=i.substring(h).match(a);if(!o)throw"Missing number at position "+h;return h+=o[0].length,parseInt(o[0],10)},w=function(t,s,n){var a=-1,o=e.map(_(t)?n:s,function(e,t){return[[t,e]]}).sort(function(e,t){return-(e[1].length-t[1].length)});if(e.each(o,function(e,t){var s=t[1];return i.substr(h,s.length).toLowerCase()===s.toLowerCase()?(a=t[0],h+=s.length,!1):void 0}),-1!==a)return a+1;throw"Unknown name at position "+h},k=function(){if(i.charAt(h)!==t.charAt(n))throw"Unexpected literal at position "+h;h++};for(n=0;t.length>n;n++)if(b)"'"!==t.charAt(n)||_("'")?k():b=!1;else switch(t.charAt(n)){case"d":v=x("d");break;case"D":w("D",d,c);break;case"o":y=x("o");break;case"m":g=x("m");break;case"M":g=w("M",p,f);break;case"y":m=x("y");break;case"@":r=new Date(x("@")),m=r.getFullYear(),g=r.getMonth()+1,v=r.getDate();break;case"!":r=new Date((x("!")-this._ticksTo1970)/1e4),m=r.getFullYear(),g=r.getMonth()+1,v=r.getDate();break;case"'":_("'")?k():b=!0;break;default:k()}if(i.length>h&&(o=i.substr(h),!/^\s+/.test(o)))throw"Extra/unparsed characters found in date: "+o;if(-1===m?m=(new Date).getFullYear():100>m&&(m+=(new Date).getFullYear()-(new Date).getFullYear()%100+(u>=m?0:-100)),y>-1)for(g=1,v=y;;){if(a=this._getDaysInMonth(m,g-1),a>=v)break;g++,v-=a}if(r=this._daylightSavingAdjust(new Date(m,g-1,v)),r.getFullYear()!==m||r.getMonth()+1!==g||r.getDate()!==v)throw"Invalid date";return r},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(e,t,i){if(!t)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,a=(i?i.dayNames:null)||this._defaults.dayNames,o=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(t){var i=e.length>s+1&&e.charAt(s+1)===t;return i&&s++,i},l=function(e,t,i){var s=""+t;if(h(e))for(;i>s.length;)s="0"+s;return s},u=function(e,t,i,s){return h(e)?s[t]:i[t]},d="",c=!1;if(t)for(s=0;e.length>s;s++)if(c)"'"!==e.charAt(s)||h("'")?d+=e.charAt(s):c=!1;else switch(e.charAt(s)){case"d":d+=l("d",t.getDate(),2);break;case"D":d+=u("D",t.getDay(),n,a);break;case"o":d+=l("o",Math.round((new Date(t.getFullYear(),t.getMonth(),t.getDate()).getTime()-new Date(t.getFullYear(),0,0).getTime())/864e5),3);break;case"m":d+=l("m",t.getMonth()+1,2);break;case"M":d+=u("M",t.getMonth(),o,r);break;case"y":d+=h("y")?t.getFullYear():(10>t.getYear()%100?"0":"")+t.getYear()%100;break;case"@":d+=t.getTime();break;case"!":d+=1e4*t.getTime()+this._ticksTo1970;break;case"'":h("'")?d+="'":c=!0;break;default:d+=e.charAt(s)}return d},_possibleChars:function(e){var t,i="",s=!1,n=function(i){var s=e.length>t+1&&e.charAt(t+1)===i;return s&&t++,s};for(t=0;e.length>t;t++)if(s)"'"!==e.charAt(t)||n("'")?i+=e.charAt(t):s=!1;else switch(e.charAt(t)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=e.charAt(t)}return i},_get:function(e,t){return void 0!==e.settings[t]?e.settings[t]:this._defaults[t]},_setDateFromField:function(e,t){if(e.input.val()!==e.lastVal){var i=this._get(e,"dateFormat"),s=e.lastVal=e.input?e.input.val():null,n=this._getDefaultDate(e),a=n,o=this._getFormatConfig(e);try{a=this.parseDate(i,s,o)||n}catch(r){s=t?"":s}e.selectedDay=a.getDate(),e.drawMonth=e.selectedMonth=a.getMonth(),e.drawYear=e.selectedYear=a.getFullYear(),e.currentDay=s?a.getDate():0,e.currentMonth=s?a.getMonth():0,e.currentYear=s?a.getFullYear():0,this._adjustInstDate(e)}},_getDefaultDate:function(e){return this._restrictMinMax(e,this._determineDate(e,this._get(e,"defaultDate"),new Date))},_determineDate:function(t,i,s){var n=function(e){var t=new Date;return t.setDate(t.getDate()+e),t},a=function(i){try{return e.datepicker.parseDate(e.datepicker._get(t,"dateFormat"),i,e.datepicker._getFormatConfig(t))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?e.datepicker._getDate(t):null)||new Date,a=n.getFullYear(),o=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":o+=parseInt(l[1],10),r=Math.min(r,e.datepicker._getDaysInMonth(a,o));break;case"y":case"Y":a+=parseInt(l[1],10),r=Math.min(r,e.datepicker._getDaysInMonth(a,o))}l=h.exec(i)}return new Date(a,o,r)},o=null==i||""===i?s:"string"==typeof i?a(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return o=o&&"Invalid Date"==""+o?s:o,o&&(o.setHours(0),o.setMinutes(0),o.setSeconds(0),o.setMilliseconds(0)),this._daylightSavingAdjust(o)},_daylightSavingAdjust:function(e){return e?(e.setHours(e.getHours()>12?e.getHours()+2:0),e):null},_setDate:function(e,t,i){var s=!t,n=e.selectedMonth,a=e.selectedYear,o=this._restrictMinMax(e,this._determineDate(e,t,new Date));e.selectedDay=e.currentDay=o.getDate(),e.drawMonth=e.selectedMonth=e.currentMonth=o.getMonth(),e.drawYear=e.selectedYear=e.currentYear=o.getFullYear(),n===e.selectedMonth&&a===e.selectedYear||i||this._notifyChange(e),this._adjustInstDate(e),e.input&&e.input.val(s?"":this._formatDate(e))},_getDate:function(e){var t=!e.currentYear||e.input&&""===e.input.val()?null:this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return t},_attachHandlers:function(t){var i=this._get(t,"stepMonths"),s="#"+t.id.replace(/\\\\/g,"\\");t.dpDiv.find("[data-handler]").map(function(){var t={prev:function(){e.datepicker._adjustDate(s,-i,"M")},next:function(){e.datepicker._adjustDate(s,+i,"M")},hide:function(){e.datepicker._hideDatepicker()},today:function(){e.datepicker._gotoToday(s)},selectDay:function(){return e.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return e.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return e.datepicker._selectMonthYear(s,this,"Y"),!1}};e(this).bind(this.getAttribute("data-event"),t[this.getAttribute("data-handler")])})},_generateHTML:function(e){var t,i,s,n,a,o,r,h,l,u,d,c,p,f,m,g,v,y,b,_,x,w,k,T,D,S,M,C,N,A,P,I,z,H,F,E,O,j,W,L=new Date,R=this._daylightSavingAdjust(new Date(L.getFullYear(),L.getMonth(),L.getDate())),Y=this._get(e,"isRTL"),B=this._get(e,"showButtonPanel"),J=this._get(e,"hideIfNoPrevNext"),q=this._get(e,"navigationAsDateFormat"),K=this._getNumberOfMonths(e),V=this._get(e,"showCurrentAtPos"),U=this._get(e,"stepMonths"),Q=1!==K[0]||1!==K[1],G=this._daylightSavingAdjust(e.currentDay?new Date(e.currentYear,e.currentMonth,e.currentDay):new Date(9999,9,9)),X=this._getMinMaxDate(e,"min"),$=this._getMinMaxDate(e,"max"),Z=e.drawMonth-V,et=e.drawYear;if(0>Z&&(Z+=12,et--),$)for(t=this._daylightSavingAdjust(new Date($.getFullYear(),$.getMonth()-K[0]*K[1]+1,$.getDate())),t=X&&X>t?X:t;this._daylightSavingAdjust(new Date(et,Z,1))>t;)Z--,0>Z&&(Z=11,et--);for(e.drawMonth=Z,e.drawYear=et,i=this._get(e,"prevText"),i=q?this.formatDate(i,this._daylightSavingAdjust(new Date(et,Z-U,1)),this._getFormatConfig(e)):i,s=this._canAdjustMonth(e,-1,et,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":J?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(e,"nextText"),n=q?this.formatDate(n,this._daylightSavingAdjust(new Date(et,Z+U,1)),this._getFormatConfig(e)):n,a=this._canAdjustMonth(e,1,et,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":J?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",o=this._get(e,"currentText"),r=this._get(e,"gotoCurrent")&&e.currentDay?G:R,o=q?this.formatDate(o,r,this._getFormatConfig(e)):o,h=e.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(e,"closeText")+"</button>",l=B?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(e,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+o+"</button>":"")+(Y?"":h)+"</div>":"",u=parseInt(this._get(e,"firstDay"),10),u=isNaN(u)?0:u,d=this._get(e,"showWeek"),c=this._get(e,"dayNames"),p=this._get(e,"dayNamesMin"),f=this._get(e,"monthNames"),m=this._get(e,"monthNamesShort"),g=this._get(e,"beforeShowDay"),v=this._get(e,"showOtherMonths"),y=this._get(e,"selectOtherMonths"),b=this._getDefaultDate(e),_="",w=0;K[0]>w;w++){for(k="",this.maxRows=4,T=0;K[1]>T;T++){if(D=this._daylightSavingAdjust(new Date(et,Z,e.selectedDay)),S=" ui-corner-all",M="",Q){if(M+="<div class='ui-datepicker-group",K[1]>1)switch(T){case 0:M+=" ui-datepicker-group-first",S=" ui-corner-"+(Y?"right":"left");break;case K[1]-1:M+=" ui-datepicker-group-last",S=" ui-corner-"+(Y?"left":"right");break;default:M+=" ui-datepicker-group-middle",S=""}M+="'>"}for(M+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+S+"'>"+(/all|left/.test(S)&&0===w?Y?a:s:"")+(/all|right/.test(S)&&0===w?Y?s:a:"")+this._generateMonthYearHeader(e,Z,et,X,$,w>0||T>0,f,m)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",C=d?"<th class='ui-datepicker-week-col'>"+this._get(e,"weekHeader")+"</th>":"",x=0;7>x;x++)N=(x+u)%7,C+="<th scope='col'"+((x+u+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+c[N]+"'>"+p[N]+"</span></th>";for(M+=C+"</tr></thead><tbody>",A=this._getDaysInMonth(et,Z),et===e.selectedYear&&Z===e.selectedMonth&&(e.selectedDay=Math.min(e.selectedDay,A)),P=(this._getFirstDayOfMonth(et,Z)-u+7)%7,I=Math.ceil((P+A)/7),z=Q?this.maxRows>I?this.maxRows:I:I,this.maxRows=z,H=this._daylightSavingAdjust(new Date(et,Z,1-P)),F=0;z>F;F++){for(M+="<tr>",E=d?"<td class='ui-datepicker-week-col'>"+this._get(e,"calculateWeek")(H)+"</td>":"",x=0;7>x;x++)O=g?g.apply(e.input?e.input[0]:null,[H]):[!0,""],j=H.getMonth()!==Z,W=j&&!y||!O[0]||X&&X>H||$&&H>$,E+="<td class='"+((x+u+6)%7>=5?" ui-datepicker-week-end":"")+(j?" ui-datepicker-other-month":"")+(H.getTime()===D.getTime()&&Z===e.selectedMonth&&e._keyEvent||b.getTime()===H.getTime()&&b.getTime()===D.getTime()?" "+this._dayOverClass:"")+(W?" "+this._unselectableClass+" ui-state-disabled":"")+(j&&!v?"":" "+O[1]+(H.getTime()===G.getTime()?" "+this._currentClass:"")+(H.getTime()===R.getTime()?" ui-datepicker-today":""))+"'"+(j&&!v||!O[2]?"":" title='"+O[2].replace(/'/g,"&#39;")+"'")+(W?"":" data-handler='selectDay' data-event='click' data-month='"+H.getMonth()+"' data-year='"+H.getFullYear()+"'")+">"+(j&&!v?"&#xa0;":W?"<span class='ui-state-default'>"+H.getDate()+"</span>":"<a class='ui-state-default"+(H.getTime()===R.getTime()?" ui-state-highlight":"")+(H.getTime()===G.getTime()?" ui-state-active":"")+(j?" ui-priority-secondary":"")+"' href='#'>"+H.getDate()+"</a>")+"</td>",H.setDate(H.getDate()+1),H=this._daylightSavingAdjust(H);M+=E+"</tr>"}Z++,Z>11&&(Z=0,et++),M+="</tbody></table>"+(Q?"</div>"+(K[0]>0&&T===K[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),k+=M}_+=k}return _+=l,e._keyEvent=!1,_},_generateMonthYearHeader:function(e,t,i,s,n,a,o,r){var h,l,u,d,c,p,f,m,g=this._get(e,"changeMonth"),v=this._get(e,"changeYear"),y=this._get(e,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",_="";if(a||!g)_+="<span class='ui-datepicker-month'>"+o[t]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,_+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",u=0;12>u;u++)(!h||u>=s.getMonth())&&(!l||n.getMonth()>=u)&&(_+="<option value='"+u+"'"+(u===t?" selected='selected'":"")+">"+r[u]+"</option>");_+="</select>"}if(y||(b+=_+(!a&&g&&v?"":"&#xa0;")),!e.yearshtml)if(e.yearshtml="",a||!v)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(d=this._get(e,"yearRange").split(":"),c=(new Date).getFullYear(),p=function(e){var t=e.match(/c[+\-].*/)?i+parseInt(e.substring(1),10):e.match(/[+\-].*/)?c+parseInt(e,10):parseInt(e,10);return isNaN(t)?c:t},f=p(d[0]),m=Math.max(f,p(d[1]||"")),f=s?Math.max(f,s.getFullYear()):f,m=n?Math.min(m,n.getFullYear()):m,e.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";m>=f;f++)e.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";e.yearshtml+="</select>",b+=e.yearshtml,e.yearshtml=null}return b+=this._get(e,"yearSuffix"),y&&(b+=(!a&&g&&v?"":"&#xa0;")+_),b+="</div>"},_adjustInstDate:function(e,t,i){var s=e.drawYear+("Y"===i?t:0),n=e.drawMonth+("M"===i?t:0),a=Math.min(e.selectedDay,this._getDaysInMonth(s,n))+("D"===i?t:0),o=this._restrictMinMax(e,this._daylightSavingAdjust(new Date(s,n,a)));e.selectedDay=o.getDate(),e.drawMonth=e.selectedMonth=o.getMonth(),e.drawYear=e.selectedYear=o.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(e)},_restrictMinMax:function(e,t){var i=this._getMinMaxDate(e,"min"),s=this._getMinMaxDate(e,"max"),n=i&&i>t?i:t;return s&&n>s?s:n},_notifyChange:function(e){var t=this._get(e,"onChangeMonthYear");t&&t.apply(e.input?e.input[0]:null,[e.selectedYear,e.selectedMonth+1,e])},_getNumberOfMonths:function(e){var t=this._get(e,"numberOfMonths");return null==t?[1,1]:"number"==typeof t?[1,t]:t},_getMinMaxDate:function(e,t){return this._determineDate(e,this._get(e,t+"Date"),null)},_getDaysInMonth:function(e,t){return 32-this._daylightSavingAdjust(new Date(e,t,32)).getDate()},_getFirstDayOfMonth:function(e,t){return new Date(e,t,1).getDay()},_canAdjustMonth:function(e,t,i,s){var n=this._getNumberOfMonths(e),a=this._daylightSavingAdjust(new Date(i,s+(0>t?t:n[0]*n[1]),1));return 0>t&&a.setDate(this._getDaysInMonth(a.getFullYear(),a.getMonth())),this._isInRange(e,a)},_isInRange:function(e,t){var i,s,n=this._getMinMaxDate(e,"min"),a=this._getMinMaxDate(e,"max"),o=null,r=null,h=this._get(e,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),o=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(o+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||t.getTime()>=n.getTime())&&(!a||t.getTime()<=a.getTime())&&(!o||t.getFullYear()>=o)&&(!r||r>=t.getFullYear())},_getFormatConfig:function(e){var t=this._get(e,"shortYearCutoff");return t="string"!=typeof t?t:(new Date).getFullYear()%100+parseInt(t,10),{shortYearCutoff:t,dayNamesShort:this._get(e,"dayNamesShort"),dayNames:this._get(e,"dayNames"),monthNamesShort:this._get(e,"monthNamesShort"),monthNames:this._get(e,"monthNames")}},_formatDate:function(e,t,i,s){t||(e.currentDay=e.selectedDay,e.currentMonth=e.selectedMonth,e.currentYear=e.selectedYear);var n=t?"object"==typeof t?t:this._daylightSavingAdjust(new Date(s,i,t)):this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return this.formatDate(this._get(e,"dateFormat"),n,this._getFormatConfig(e))}}),e.fn.datepicker=function(t){if(!this.length)return this;e.datepicker.initialized||(e(document).mousedown(e.datepicker._checkExternalClick),e.datepicker.initialized=!0),0===e("#"+e.datepicker._mainDivId).length&&e("body").append(e.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof t||"isDisabled"!==t&&"getDate"!==t&&"widget"!==t?"option"===t&&2===arguments.length&&"string"==typeof arguments[1]?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof t?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this].concat(i)):e.datepicker._attachDatepicker(this,t)}):e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(i))},e.datepicker=new n,e.datepicker.initialized=!1,e.datepicker.uuid=(new Date).getTime(),e.datepicker.version="1.11.2",e.datepicker,e.widget("ui.draggable",e.ui.mouse,{version:"1.11.2",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._setHandleClassName(),this._mouseInit()},_setOption:function(e,t){this._super(e,t),"handle"===e&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(t){var i=this.options;return this._blurActiveElement(t),this.helper||i.disabled||e(t.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(t),this.handle?(this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(t){this.iframeBlocks=this.document.find(t).map(function(){var t=e(this);return e("<div>").css("position","absolute").appendTo(t.parent()).outerWidth(t.outerWidth()).outerHeight(t.outerHeight()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(t){var i=this.document[0];if(this.handleElement.is(t.target))try{i.activeElement&&"body"!==i.activeElement.nodeName.toLowerCase()&&e(i.activeElement).blur()}catch(s){}},_mouseStart:function(t){var i=this.options;return this.helper=this._createHelper(t),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),e.ui.ddmanager&&(e.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===e(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(t),this.originalPosition=this.position=this._generatePosition(t,!1),this.originalPageX=t.pageX,this.originalPageY=t.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",t)===!1?(this._clear(),!1):(this._cacheHelperProportions(),e.ui.ddmanager&&!i.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this._normalizeRightBottom(),this._mouseDrag(t,!0),e.ui.ddmanager&&e.ui.ddmanager.dragStart(this,t),!0)},_refreshOffsets:function(e){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:e.pageX-this.offset.left,top:e.pageY-this.offset.top}},_mouseDrag:function(t,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(t,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",t,s)===!1)return this._mouseUp({}),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),!1},_mouseStop:function(t){var i=this,s=!1;return e.ui.ddmanager&&!this.options.dropBehaviour&&(s=e.ui.ddmanager.drop(this,t)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||e.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?e(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",t)!==!1&&i._clear()}):this._trigger("stop",t)!==!1&&this._clear(),!1},_mouseUp:function(t){return this._unblockFrames(),e.ui.ddmanager&&e.ui.ddmanager.dragStop(this,t),this.handleElement.is(t.target)&&this.element.focus(),e.ui.mouse.prototype._mouseUp.call(this,t)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(t){return this.options.handle?!!e(t.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this.handleElement.addClass("ui-draggable-handle")},_removeHandleClassName:function(){this.handleElement.removeClass("ui-draggable-handle")},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper),n=s?e(i.helper.apply(this.element[0],[t])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_isRootNode:function(e){return/(html|body)/i.test(e.tagName)||e===this.document[0]},_getParentOffset:function(){var t=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var e=this.element.position(),t=this._isRootNode(this.scrollParent[0]);return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+(t?0:this.scrollParent.scrollTop()),left:e.left-(parseInt(this.helper.css("left"),10)||0)+(t?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options,a=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[e(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,e(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,e(window).scrollLeft()+e(window).width()-this.helperProportions.width-this.margins.left,e(window).scrollTop()+(e(window).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,e(a).width()-this.helperProportions.width-this.margins.left,(e(a).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=e(n.containment),s=i[0],s&&(t=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(t?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(t?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)
+},_convertPositionTo:function(e,t){t||(t=this.position);var i="absolute"===e?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:t.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:t.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(e,t){var i,s,n,a,o=this.options,r=this._isRootNode(this.scrollParent[0]),h=e.pageX,l=e.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),t&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,e.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),e.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),e.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),e.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),o.grid&&(n=o.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/o.grid[1])*o.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-o.grid[1]:n+o.grid[1]:n,a=o.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/o.grid[0])*o.grid[0]:this.originalPageX,h=i?a-this.offset.click.left>=i[0]||a-this.offset.click.left>i[2]?a:a-this.offset.click.left>=i[0]?a-o.grid[0]:a+o.grid[0]:a),"y"===o.axis&&(h=this.originalPageX),"x"===o.axis&&(l=this.originalPageY)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_normalizeRightBottom:function(){"y"!==this.options.axis&&"auto"!==this.helper.css("right")&&(this.helper.width(this.helper.width()),this.helper.css("right","auto")),"x"!==this.options.axis&&"auto"!==this.helper.css("bottom")&&(this.helper.height(this.helper.height()),this.helper.css("bottom","auto"))},_trigger:function(t,i,s){return s=s||this._uiHash(),e.ui.plugin.call(this,t,[i,s,this],!0),/^(drag|start|stop)/.test(t)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),e.Widget.prototype._trigger.call(this,t,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),e.ui.plugin.add("draggable","connectToSortable",{start:function(t,i,s){var n=e.extend({},i,{item:s.element});s.sortables=[],e(s.options.connectToSortable).each(function(){var i=e(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",t,n))})},stop:function(t,i,s){var n=e.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,e.each(s.sortables,function(){var e=this;e.isOver?(e.isOver=0,s.cancelHelperRemoval=!0,e.cancelHelperRemoval=!1,e._storedCSS={position:e.placeholder.css("position"),top:e.placeholder.css("top"),left:e.placeholder.css("left")},e._mouseStop(t),e.options.helper=e.options._helper):(e.cancelHelperRemoval=!0,e._trigger("deactivate",t,n))})},drag:function(t,i,s){e.each(s.sortables,function(){var n=!1,a=this;a.positionAbs=s.positionAbs,a.helperProportions=s.helperProportions,a.offset.click=s.offset.click,a._intersectsWith(a.containerCache)&&(n=!0,e.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==a&&this._intersectsWith(this.containerCache)&&e.contains(a.element[0],this.element[0])&&(n=!1),n})),n?(a.isOver||(a.isOver=1,a.currentItem=i.helper.appendTo(a.element).data("ui-sortable-item",!0),a.options._helper=a.options.helper,a.options.helper=function(){return i.helper[0]},t.target=a.currentItem[0],a._mouseCapture(t,!0),a._mouseStart(t,!0,!0),a.offset.click.top=s.offset.click.top,a.offset.click.left=s.offset.click.left,a.offset.parent.left-=s.offset.parent.left-a.offset.parent.left,a.offset.parent.top-=s.offset.parent.top-a.offset.parent.top,s._trigger("toSortable",t),s.dropped=a.element,e.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,a.fromOutside=s),a.currentItem&&(a._mouseDrag(t),i.position=a.position)):a.isOver&&(a.isOver=0,a.cancelHelperRemoval=!0,a.options._revert=a.options.revert,a.options.revert=!1,a._trigger("out",t,a._uiHash(a)),a._mouseStop(t,!0),a.options.revert=a.options._revert,a.options.helper=a.options._helper,a.placeholder&&a.placeholder.remove(),s._refreshOffsets(t),i.position=s._generatePosition(t,!0),s._trigger("fromSortable",t),s.dropped=!1,e.each(s.sortables,function(){this.refreshPositions()}))})}}),e.ui.plugin.add("draggable","cursor",{start:function(t,i,s){var n=e("body"),a=s.options;n.css("cursor")&&(a._cursor=n.css("cursor")),n.css("cursor",a.cursor)},stop:function(t,i,s){var n=s.options;n._cursor&&e("body").css("cursor",n._cursor)}}),e.ui.plugin.add("draggable","opacity",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("opacity")&&(a._opacity=n.css("opacity")),n.css("opacity",a.opacity)},stop:function(t,i,s){var n=s.options;n._opacity&&e(i.helper).css("opacity",n._opacity)}}),e.ui.plugin.add("draggable","scroll",{start:function(e,t,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(t,i,s){var n=s.options,a=!1,o=s.scrollParentNotHidden[0],r=s.document[0];o!==r&&"HTML"!==o.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+o.offsetHeight-t.pageY<n.scrollSensitivity?o.scrollTop=a=o.scrollTop+n.scrollSpeed:t.pageY-s.overflowOffset.top<n.scrollSensitivity&&(o.scrollTop=a=o.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+o.offsetWidth-t.pageX<n.scrollSensitivity?o.scrollLeft=a=o.scrollLeft+n.scrollSpeed:t.pageX-s.overflowOffset.left<n.scrollSensitivity&&(o.scrollLeft=a=o.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(t.pageY-e(r).scrollTop()<n.scrollSensitivity?a=e(r).scrollTop(e(r).scrollTop()-n.scrollSpeed):e(window).height()-(t.pageY-e(r).scrollTop())<n.scrollSensitivity&&(a=e(r).scrollTop(e(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(t.pageX-e(r).scrollLeft()<n.scrollSensitivity?a=e(r).scrollLeft(e(r).scrollLeft()-n.scrollSpeed):e(window).width()-(t.pageX-e(r).scrollLeft())<n.scrollSensitivity&&(a=e(r).scrollLeft(e(r).scrollLeft()+n.scrollSpeed)))),a!==!1&&e.ui.ddmanager&&!n.dropBehaviour&&e.ui.ddmanager.prepareOffsets(s,t)}}),e.ui.plugin.add("draggable","snap",{start:function(t,i,s){var n=s.options;s.snapElements=[],e(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var t=e(this),i=t.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:t.outerWidth(),height:t.outerHeight(),top:i.top,left:i.left})})},drag:function(t,i,s){var n,a,o,r,h,l,u,d,c,p,f=s.options,m=f.snapTolerance,g=i.offset.left,v=g+s.helperProportions.width,y=i.offset.top,b=y+s.helperProportions.height;for(c=s.snapElements.length-1;c>=0;c--)h=s.snapElements[c].left-s.margins.left,l=h+s.snapElements[c].width,u=s.snapElements[c].top-s.margins.top,d=u+s.snapElements[c].height,h-m>v||g>l+m||u-m>b||y>d+m||!e.contains(s.snapElements[c].item.ownerDocument,s.snapElements[c].item)?(s.snapElements[c].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=!1):("inner"!==f.snapMode&&(n=m>=Math.abs(u-b),a=m>=Math.abs(d-y),o=m>=Math.abs(h-v),r=m>=Math.abs(l-g),n&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.top=s._convertPositionTo("relative",{top:d,left:0}).top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left)),p=n||a||o||r,"outer"!==f.snapMode&&(n=m>=Math.abs(u-y),a=m>=Math.abs(d-b),o=m>=Math.abs(h-g),r=m>=Math.abs(l-v),n&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.top=s._convertPositionTo("relative",{top:d-s.helperProportions.height,left:0}).top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left)),!s.snapElements[c].snapping&&(n||a||o||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=n||a||o||r||p)}}),e.ui.plugin.add("draggable","stack",{start:function(t,i,s){var n,a=s.options,o=e.makeArray(e(a.stack)).sort(function(t,i){return(parseInt(e(t).css("zIndex"),10)||0)-(parseInt(e(i).css("zIndex"),10)||0)});o.length&&(n=parseInt(e(o[0]).css("zIndex"),10)||0,e(o).each(function(t){e(this).css("zIndex",n+t)}),this.css("zIndex",n+o.length))}}),e.ui.plugin.add("draggable","zIndex",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("zIndex")&&(a._zIndex=n.css("zIndex")),n.css("zIndex",a.zIndex)},stop:function(t,i,s){var n=s.options;n._zIndex&&e(i.helper).css("zIndex",n._zIndex)}}),e.ui.draggable,e.widget("ui.resizable",e.ui.mouse,{version:"1.11.2",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(e){return parseInt(e,10)||0},_isNumber:function(e){return!isNaN(parseInt(e,10))},_hasScroll:function(t,i){if("hidden"===e(t).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return t[s]>0?!0:(t[s]=1,n=t[s]>0,t[s]=0,n)},_create:function(){var t,i,s,n,a,o=this,r=this.options;if(this.element.addClass("ui-resizable"),e.extend(this,{_aspectRatio:!!r.aspectRatio,aspectRatio:r.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:r.helper||r.ghost||r.animate?r.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(e("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=r.handles||(e(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),t=this.handles.split(","),this.handles={},i=0;t.length>i;i++)s=e.trim(t[i]),a="ui-resizable-"+s,n=e("<div class='ui-resizable-handle "+a+"'></div>"),n.css({zIndex:r.zIndex}),"se"===s&&n.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(n);this._renderAxis=function(t){var i,s,n,a;t=t||this.element;for(i in this.handles)this.handles[i].constructor===String&&(this.handles[i]=this.element.children(this.handles[i]).first().show()),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)&&(s=e(this.handles[i],this.element),a=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),t.css(n,a),this._proportionallyResize()),e(this.handles[i]).length},this._renderAxis(this.element),this._handles=e(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){o.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),o.axis=n&&n[1]?n[1]:"se")}),r.autoHide&&(this._handles.hide(),e(this.element).addClass("ui-resizable-autohide").mouseenter(function(){r.disabled||(e(this).removeClass("ui-resizable-autohide"),o._handles.show())}).mouseleave(function(){r.disabled||o.resizing||(e(this).addClass("ui-resizable-autohide"),o._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var t,i=function(t){e(t).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),t=this.element,this.originalElement.css({position:t.css("position"),width:t.outerWidth(),height:t.outerHeight(),top:t.css("top"),left:t.css("left")}).insertAfter(t),t.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_mouseCapture:function(t){var i,s,n=!1;for(i in this.handles)s=e(this.handles[i])[0],(s===t.target||e.contains(s,t.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(t){var i,s,n,a=this.options,o=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),a.containment&&(i+=e(a.containment).scrollLeft()||0,s+=e(a.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:o.width(),height:o.height()},this.originalSize=this._helper?{width:o.outerWidth(),height:o.outerHeight()}:{width:o.width(),height:o.height()},this.sizeDiff={width:o.outerWidth()-o.width(),height:o.outerHeight()-o.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio="number"==typeof a.aspectRatio?a.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=e(".ui-resizable-"+this.axis).css("cursor"),e("body").css("cursor","auto"===n?this.axis+"-resize":n),o.addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(t){var i,s,n=this.originalMousePosition,a=this.axis,o=t.pageX-n.left||0,r=t.pageY-n.top||0,h=this._change[a];return this._updatePrevProperties(),h?(i=h.apply(this,[t,o,r]),this._updateVirtualBoundaries(t.shiftKey),(this._aspectRatio||t.shiftKey)&&(i=this._updateRatio(i,t)),i=this._respectSize(i,t),this._updateCache(i),this._propagate("resize",t),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),e.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",t,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(t){this.resizing=!1;var i,s,n,a,o,r,h,l=this.options,u=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:u.sizeDiff.height,a=s?0:u.sizeDiff.width,o={width:u.helper.width()-a,height:u.helper.height()-n},r=parseInt(u.element.css("left"),10)+(u.position.left-u.originalPosition.left)||null,h=parseInt(u.element.css("top"),10)+(u.position.top-u.originalPosition.top)||null,l.animate||this.element.css(e.extend(o,{top:h,left:r})),u.helper.height(u.size.height),u.helper.width(u.size.width),this._helper&&!l.animate&&this._proportionallyResize()),e("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var e={};return this.position.top!==this.prevPosition.top&&(e.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(e.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(e.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(e.height=this.size.height+"px"),this.helper.css(e),e},_updateVirtualBoundaries:function(e){var t,i,s,n,a,o=this.options;a={minWidth:this._isNumber(o.minWidth)?o.minWidth:0,maxWidth:this._isNumber(o.maxWidth)?o.maxWidth:1/0,minHeight:this._isNumber(o.minHeight)?o.minHeight:0,maxHeight:this._isNumber(o.maxHeight)?o.maxHeight:1/0},(this._aspectRatio||e)&&(t=a.minHeight*this.aspectRatio,s=a.minWidth/this.aspectRatio,i=a.maxHeight*this.aspectRatio,n=a.maxWidth/this.aspectRatio,t>a.minWidth&&(a.minWidth=t),s>a.minHeight&&(a.minHeight=s),a.maxWidth>i&&(a.maxWidth=i),a.maxHeight>n&&(a.maxHeight=n)),this._vBoundaries=a},_updateCache:function(e){this.offset=this.helper.offset(),this._isNumber(e.left)&&(this.position.left=e.left),this._isNumber(e.top)&&(this.position.top=e.top),this._isNumber(e.height)&&(this.size.height=e.height),this._isNumber(e.width)&&(this.size.width=e.width)},_updateRatio:function(e){var t=this.position,i=this.size,s=this.axis;return this._isNumber(e.height)?e.width=e.height*this.aspectRatio:this._isNumber(e.width)&&(e.height=e.width/this.aspectRatio),"sw"===s&&(e.left=t.left+(i.width-e.width),e.top=null),"nw"===s&&(e.top=t.top+(i.height-e.height),e.left=t.left+(i.width-e.width)),e},_respectSize:function(e){var t=this._vBoundaries,i=this.axis,s=this._isNumber(e.width)&&t.maxWidth&&t.maxWidth<e.width,n=this._isNumber(e.height)&&t.maxHeight&&t.maxHeight<e.height,a=this._isNumber(e.width)&&t.minWidth&&t.minWidth>e.width,o=this._isNumber(e.height)&&t.minHeight&&t.minHeight>e.height,r=this.originalPosition.left+this.originalSize.width,h=this.position.top+this.size.height,l=/sw|nw|w/.test(i),u=/nw|ne|n/.test(i);return a&&(e.width=t.minWidth),o&&(e.height=t.minHeight),s&&(e.width=t.maxWidth),n&&(e.height=t.maxHeight),a&&l&&(e.left=r-t.minWidth),s&&l&&(e.left=r-t.maxWidth),o&&u&&(e.top=h-t.minHeight),n&&u&&(e.top=h-t.maxHeight),e.width||e.height||e.left||!e.top?e.width||e.height||e.top||!e.left||(e.left=null):e.top=null,e},_getPaddingPlusBorderDimensions:function(e){for(var t=0,i=[],s=[e.css("borderTopWidth"),e.css("borderRightWidth"),e.css("borderBottomWidth"),e.css("borderLeftWidth")],n=[e.css("paddingTop"),e.css("paddingRight"),e.css("paddingBottom"),e.css("paddingLeft")];4>t;t++)i[t]=parseInt(s[t],10)||0,i[t]+=parseInt(n[t],10)||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var e,t=0,i=this.helper||this.element;this._proportionallyResizeElements.length>t;t++)e=this._proportionallyResizeElements[t],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(e)),e.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var t=this.element,i=this.options;this.elementOffset=t.offset(),this._helper?(this.helper=this.helper||e("<div style='overflow:hidden;'></div>"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(e,t){return{width:this.originalSize.width+t}},w:function(e,t){var i=this.originalSize,s=this.originalPosition;return{left:s.left+t,width:i.width-t}},n:function(e,t,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(e,t,i){return{height:this.originalSize.height+i}},se:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},sw:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,i,s]))},ne:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},nw:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,i,s]))}},_propagate:function(t,i){e.ui.plugin.call(this,t,[i,this.ui()]),"resize"!==t&&this._trigger(t,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),e.ui.plugin.add("resizable","animate",{stop:function(t){var i=e(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,a=n.length&&/textarea/i.test(n[0].nodeName),o=a&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=a?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-o},l=parseInt(i.element.css("left"),10)+(i.position.left-i.originalPosition.left)||null,u=parseInt(i.element.css("top"),10)+(i.position.top-i.originalPosition.top)||null;i.element.animate(e.extend(h,u&&l?{top:u,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseInt(i.element.css("width"),10),height:parseInt(i.element.css("height"),10),top:parseInt(i.element.css("top"),10),left:parseInt(i.element.css("left"),10)};n&&n.length&&e(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",t)}})}}),e.ui.plugin.add("resizable","containment",{start:function(){var t,i,s,n,a,o,r,h=e(this).resizable("instance"),l=h.options,u=h.element,d=l.containment,c=d instanceof e?d.get(0):/parent/.test(d)?u.parent().get(0):d;c&&(h.containerElement=e(c),/document/.test(d)||d===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}):(t=e(c),i=[],e(["Top","Right","Left","Bottom"]).each(function(e,s){i[e]=h._num(t.css("padding"+s))}),h.containerOffset=t.offset(),h.containerPosition=t.position(),h.containerSize={height:t.innerHeight()-i[3],width:t.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,a=h.containerSize.width,o=h._hasScroll(c,"left")?c.scrollWidth:a,r=h._hasScroll(c)?c.scrollHeight:n,h.parentData={element:c,left:s.left,top:s.top,width:o,height:r}))},resize:function(t){var i,s,n,a,o=e(this).resizable("instance"),r=o.options,h=o.containerOffset,l=o.position,u=o._aspectRatio||t.shiftKey,d={top:0,left:0},c=o.containerElement,p=!0;c[0]!==document&&/static/.test(c.css("position"))&&(d=h),l.left<(o._helper?h.left:0)&&(o.size.width=o.size.width+(o._helper?o.position.left-h.left:o.position.left-d.left),u&&(o.size.height=o.size.width/o.aspectRatio,p=!1),o.position.left=r.helper?h.left:0),l.top<(o._helper?h.top:0)&&(o.size.height=o.size.height+(o._helper?o.position.top-h.top:o.position.top),u&&(o.size.width=o.size.height*o.aspectRatio,p=!1),o.position.top=o._helper?h.top:0),n=o.containerElement.get(0)===o.element.parent().get(0),a=/relative|absolute/.test(o.containerElement.css("position")),n&&a?(o.offset.left=o.parentData.left+o.position.left,o.offset.top=o.parentData.top+o.position.top):(o.offset.left=o.element.offset().left,o.offset.top=o.element.offset().top),i=Math.abs(o.sizeDiff.width+(o._helper?o.offset.left-d.left:o.offset.left-h.left)),s=Math.abs(o.sizeDiff.height+(o._helper?o.offset.top-d.top:o.offset.top-h.top)),i+o.size.width>=o.parentData.width&&(o.size.width=o.parentData.width-i,u&&(o.size.height=o.size.width/o.aspectRatio,p=!1)),s+o.size.height>=o.parentData.height&&(o.size.height=o.parentData.height-s,u&&(o.size.width=o.size.height*o.aspectRatio,p=!1)),p||(o.position.left=o.prevPosition.left,o.position.top=o.prevPosition.top,o.size.width=o.prevSize.width,o.size.height=o.prevSize.height)},stop:function(){var t=e(this).resizable("instance"),i=t.options,s=t.containerOffset,n=t.containerPosition,a=t.containerElement,o=e(t.helper),r=o.offset(),h=o.outerWidth()-t.sizeDiff.width,l=o.outerHeight()-t.sizeDiff.height;t._helper&&!i.animate&&/relative/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l}),t._helper&&!i.animate&&/static/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),e.ui.plugin.add("resizable","alsoResize",{start:function(){var t=e(this).resizable("instance"),i=t.options,s=function(t){e(t).each(function(){var t=e(this);t.data("ui-resizable-alsoresize",{width:parseInt(t.width(),10),height:parseInt(t.height(),10),left:parseInt(t.css("left"),10),top:parseInt(t.css("top"),10)})})};"object"!=typeof i.alsoResize||i.alsoResize.parentNode?s(i.alsoResize):i.alsoResize.length?(i.alsoResize=i.alsoResize[0],s(i.alsoResize)):e.each(i.alsoResize,function(e){s(e)})},resize:function(t,i){var s=e(this).resizable("instance"),n=s.options,a=s.originalSize,o=s.originalPosition,r={height:s.size.height-a.height||0,width:s.size.width-a.width||0,top:s.position.top-o.top||0,left:s.position.left-o.left||0},h=function(t,s){e(t).each(function(){var t=e(this),n=e(this).data("ui-resizable-alsoresize"),a={},o=s&&s.length?s:t.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(o,function(e,t){var i=(n[t]||0)+(r[t]||0);i&&i>=0&&(a[t]=i||null)}),t.css(a)})};"object"!=typeof n.alsoResize||n.alsoResize.nodeType?h(n.alsoResize):e.each(n.alsoResize,function(e,t){h(e,t)})},stop:function(){e(this).removeData("resizable-alsoresize")}}),e.ui.plugin.add("resizable","ghost",{start:function(){var t=e(this).resizable("instance"),i=t.options,s=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof i.ghost?i.ghost:""),t.ghost.appendTo(t.helper)},resize:function(){var t=e(this).resizable("instance");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=e(this).resizable("instance");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),e.ui.plugin.add("resizable","grid",{resize:function(){var t,i=e(this).resizable("instance"),s=i.options,n=i.size,a=i.originalSize,o=i.originalPosition,r=i.axis,h="number"==typeof s.grid?[s.grid,s.grid]:s.grid,l=h[0]||1,u=h[1]||1,d=Math.round((n.width-a.width)/l)*l,c=Math.round((n.height-a.height)/u)*u,p=a.width+d,f=a.height+c,m=s.maxWidth&&p>s.maxWidth,g=s.maxHeight&&f>s.maxHeight,v=s.minWidth&&s.minWidth>p,y=s.minHeight&&s.minHeight>f;s.grid=h,v&&(p+=l),y&&(f+=u),m&&(p-=l),g&&(f-=u),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=o.top-c):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=o.left-d):((0>=f-u||0>=p-l)&&(t=i._getPaddingPlusBorderDimensions(this)),f-u>0?(i.size.height=f,i.position.top=o.top-c):(f=u-t.height,i.size.height=f,i.position.top=o.top+a.height-f),p-l>0?(i.size.width=p,i.position.left=o.left-d):(p=u-t.height,i.size.width=p,i.position.left=o.left+a.width-p))}}),e.ui.resizable,e.widget("ui.dialog",{version:"1.11.2",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"Close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(t){var i=e(this).css(t).offset().top;0>i&&e(this).css("top",t.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&e.fn.draggable&&this._makeDraggable(),this.options.resizable&&e.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var t=this.options.appendTo;return t&&(t.jquery||t.nodeType)?e(t):this.document.find(t||"body").eq(0)},_destroy:function(){var e,t=this.originalPosition;this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),e=t.parent.children().eq(t.index),e.length&&e[0]!==this.element[0]?e.before(this.element):t.parent.append(this.element)},widget:function(){return this.uiDialog},disable:e.noop,enable:e.noop,close:function(t){var i,s=this;if(this._isOpen&&this._trigger("beforeClose",t)!==!1){if(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),!this.opener.filter(":focusable").focus().length)try{i=this.document[0].activeElement,i&&"body"!==i.nodeName.toLowerCase()&&e(i).blur()}catch(n){}this._hide(this.uiDialog,this.options.hide,function(){s._trigger("close",t)})}},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+e(this).css("z-index")}).get(),a=Math.max.apply(null,n);return a>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",a+1),s=!0),s&&!i&&this._trigger("focus",t),s},open:function(){var t=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=e(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){t._focusTabbable(),t._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){var e=this._focusedElement;e||(e=this.element.find("[autofocus]")),e.length||(e=this.element.find(":tabbable")),e.length||(e=this.uiDialogButtonPane.find(":tabbable")),e.length||(e=this.uiDialogTitlebarClose.filter(":tabbable")),e.length||(e=this.uiDialog),e.eq(0).focus()},_keepFocus:function(t){function i(){var t=this.document[0].activeElement,i=this.uiDialog[0]===t||e.contains(this.uiDialog[0],t);i||this._focusTabbable()}t.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=e("<div>").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(t){if(this.options.closeOnEscape&&!t.isDefaultPrevented()&&t.keyCode&&t.keyCode===e.ui.keyCode.ESCAPE)return t.preventDefault(),this.close(t),void 0;
+if(t.keyCode===e.ui.keyCode.TAB&&!t.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");t.target!==n[0]&&t.target!==this.uiDialog[0]||t.shiftKey?t.target!==s[0]&&t.target!==this.uiDialog[0]||!t.shiftKey||(this._delay(function(){n.focus()}),t.preventDefault()):(this._delay(function(){s.focus()}),t.preventDefault())}},mousedown:function(e){this._moveToTop(e)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var t;this.uiDialogTitlebar=e("<div>").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(t){e(t.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=e("<button type='button'></button>").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(e){e.preventDefault(),this.close(e)}}),t=e("<span>").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(t),this.uiDialog.attr({"aria-labelledby":t.attr("id")})},_title:function(e){this.options.title||e.html("&#160;"),e.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=e("<div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=e("<div>").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var t=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),e.isEmptyObject(i)||e.isArray(i)&&!i.length?(this.uiDialog.removeClass("ui-dialog-buttons"),void 0):(e.each(i,function(i,s){var n,a;s=e.isFunction(s)?{click:s,text:i}:s,s=e.extend({type:"button"},s),n=s.click,s.click=function(){n.apply(t.element[0],arguments)},a={icons:s.icons,text:s.showText},delete s.icons,delete s.showText,e("<button></button>",s).button(a).appendTo(t.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function t(e){return{position:e.position,offset:e.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){e(this).addClass("ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,t(n))},drag:function(e,s){i._trigger("drag",e,t(s))},stop:function(n,a){var o=a.offset.left-i.document.scrollLeft(),r=a.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(o>=0?"+":"")+o+" "+"top"+(r>=0?"+":"")+r,of:i.window},e(this).removeClass("ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,t(a))}})},_makeResizable:function(){function t(e){return{originalPosition:e.originalPosition,originalSize:e.originalSize,position:e.position,size:e.size}}var i=this,s=this.options,n=s.resizable,a=this.uiDialog.css("position"),o="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:o,start:function(s,n){e(this).addClass("ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,t(n))},resize:function(e,s){i._trigger("resize",e,t(s))},stop:function(n,a){var o=i.uiDialog.offset(),r=o.left-i.document.scrollLeft(),h=o.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(h>=0?"+":"")+h,of:i.window},e(this).removeClass("ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,t(a))}}).css("position",a)},_trackFocus:function(){this._on(this.widget(),{focusin:function(t){this._makeFocusTarget(),this._focusedElement=e(t.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var t=this._trackingInstances(),i=e.inArray(this,t);-1!==i&&t.splice(i,1)},_trackingInstances:function(){var e=this.document.data("ui-dialog-instances");return e||(e=[],this.document.data("ui-dialog-instances",e)),e},_minHeight:function(){var e=this.options;return"auto"===e.height?e.minHeight:Math.min(e.minHeight,e.height)},_position:function(){var e=this.uiDialog.is(":visible");e||this.uiDialog.show(),this.uiDialog.position(this.options.position),e||this.uiDialog.hide()},_setOptions:function(t){var i=this,s=!1,n={};e.each(t,function(e,t){i._setOption(e,t),e in i.sizeRelatedOptions&&(s=!0),e in i.resizableRelatedOptions&&(n[e]=t)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,t){var i,s,n=this.uiDialog;"dialogClass"===e&&n.removeClass(this.options.dialogClass).addClass(t),"disabled"!==e&&(this._super(e,t),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:""+t}),"draggable"===e&&(i=n.is(":data(ui-draggable)"),i&&!t&&n.draggable("destroy"),!i&&t&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(s=n.is(":data(ui-resizable)"),s&&!t&&n.resizable("destroy"),s&&"string"==typeof t&&n.resizable("option","handles",t),s||t===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var e,t,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),e=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),t=Math.max(0,s.minHeight-e),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-e):"none","auto"===s.height?this.element.css({minHeight:t,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-e)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var t=e(this);return e("<div>").css({position:"absolute",width:t.outerWidth(),height:t.outerHeight()}).appendTo(t.parent()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(t){return e(t.target).closest(".ui-dialog").length?!0:!!e(t.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var t=!0;this._delay(function(){t=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(e){t||this._allowInteraction(e)||(e.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=e("<div>").addClass("ui-widget-overlay ui-front").appendTo(this._appendTo()),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var e=this.document.data("ui-dialog-overlays")-1;e?this.document.data("ui-dialog-overlays",e):this.document.unbind("focusin").removeData("ui-dialog-overlays"),this.overlay.remove(),this.overlay=null}}}),e.widget("ui.droppable",{version:"1.11.2",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var t,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=e.isFunction(s)?s:function(e){return e.is(s)},this.proportions=function(){return arguments.length?(t=arguments[0],void 0):t?t:t={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this.element.addClass("ui-droppable")},_addToManager:function(t){e.ui.ddmanager.droppables[t]=e.ui.ddmanager.droppables[t]||[],e.ui.ddmanager.droppables[t].push(this)},_splice:function(e){for(var t=0;e.length>t;t++)e[t]===this&&e.splice(t,1)},_destroy:function(){var t=e.ui.ddmanager.droppables[this.options.scope];this._splice(t),this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(t,i){if("accept"===t)this.accept=e.isFunction(i)?i:function(e){return e.is(i)};else if("scope"===t){var s=e.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(t,i)},_activate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),i&&this._trigger("activate",t,this.ui(i))},_deactivate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),i&&this._trigger("deactivate",t,this.ui(i))},_over:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",t,this.ui(i)))},_out:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",t,this.ui(i)))},_drop:function(t,i){var s=i||e.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=e(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&e.ui.intersect(s,e.extend(i,{offset:i.element.offset()}),i.options.tolerance,t)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",t,this.ui(s)),this.element):!1):!1},ui:function(e){return{draggable:e.currentItem||e.element,helper:e.helper,position:e.position,offset:e.positionAbs}}}),e.ui.intersect=function(){function e(e,t,i){return e>=t&&t+i>e}return function(t,i,s,n){if(!i.offset)return!1;var a=(t.positionAbs||t.position.absolute).left+t.margins.left,o=(t.positionAbs||t.position.absolute).top+t.margins.top,r=a+t.helperProportions.width,h=o+t.helperProportions.height,l=i.offset.left,u=i.offset.top,d=l+i.proportions().width,c=u+i.proportions().height;switch(s){case"fit":return a>=l&&d>=r&&o>=u&&c>=h;case"intersect":return a+t.helperProportions.width/2>l&&d>r-t.helperProportions.width/2&&o+t.helperProportions.height/2>u&&c>h-t.helperProportions.height/2;case"pointer":return e(n.pageY,u,i.proportions().height)&&e(n.pageX,l,i.proportions().width);case"touch":return(o>=u&&c>=o||h>=u&&c>=h||u>o&&h>c)&&(a>=l&&d>=a||r>=l&&d>=r||l>a&&r>d);default:return!1}}}(),e.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(t,i){var s,n,a=e.ui.ddmanager.droppables[t.options.scope]||[],o=i?i.type:null,r=(t.currentItem||t.element).find(":data(ui-droppable)").addBack();e:for(s=0;a.length>s;s++)if(!(a[s].options.disabled||t&&!a[s].accept.call(a[s].element[0],t.currentItem||t.element))){for(n=0;r.length>n;n++)if(r[n]===a[s].element[0]){a[s].proportions().height=0;continue e}a[s].visible="none"!==a[s].element.css("display"),a[s].visible&&("mousedown"===o&&a[s]._activate.call(a[s],i),a[s].offset=a[s].element.offset(),a[s].proportions({width:a[s].element[0].offsetWidth,height:a[s].element[0].offsetHeight}))}},drop:function(t,i){var s=!1;return e.each((e.ui.ddmanager.droppables[t.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&e.ui.intersect(t,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],t.currentItem||t.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(t,i){t.element.parentsUntil("body").bind("scroll.droppable",function(){t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)})},drag:function(t,i){t.options.refreshPositions&&e.ui.ddmanager.prepareOffsets(t,i),e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,a,o=e.ui.intersect(t,this,this.options.tolerance,i),r=!o&&this.isover?"isout":o&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,a=this.element.parents(":data(ui-droppable)").filter(function(){return e(this).droppable("instance").options.scope===n}),a.length&&(s=e(a[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(t,i){t.element.parentsUntil("body").unbind("scroll.droppable"),t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)}},e.ui.droppable;var y="ui-effects-",b=e;e.effects={effect:{}},function(e,t){function i(e,t,i){var s=d[t.type]||{};return null==e?i||!t.def?null:t.def:(e=s.floor?~~e:parseFloat(e),isNaN(e)?t.def:s.mod?(e+s.mod)%s.mod:0>e?0:e>s.max?s.max:e)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(e,a){var o,r=a.re.exec(i),h=r&&a.parse(r),l=a.space||"rgba";return h?(o=s[l](h),s[u[l].cache]=o[u[l].cache],n=s._rgba=o._rgba,!1):t}),n.length?("0,0,0,0"===n.join()&&e.extend(n,a.transparent),s):a[i]}function n(e,t,i){return i=(i+1)%1,1>6*i?e+6*(t-e)*i:1>2*i?t:2>3*i?e+6*(t-e)*(2/3-i):e}var a,o="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[e[1],e[2],e[3],e[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[2.55*e[1],2.55*e[2],2.55*e[3],e[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(e){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(e){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(e){return[e[1],e[2]/100,e[3]/100,e[4]]}}],l=e.Color=function(t,i,s,n){return new e.Color.fn.parse(t,i,s,n)},u={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},d={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},c=l.support={},p=e("<p>")[0],f=e.each;p.style.cssText="background-color:rgba(1,1,1,.5)",c.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(u,function(e,t){t.cache="_"+e,t.props.alpha={idx:3,type:"percent",def:1}}),l.fn=e.extend(l.prototype,{parse:function(n,o,r,h){if(n===t)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=e(n).css(o),o=t);var d=this,c=e.type(n),p=this._rgba=[];return o!==t&&(n=[n,o,r,h],c="array"),"string"===c?this.parse(s(n)||a._default):"array"===c?(f(u.rgba.props,function(e,t){p[t.idx]=i(n[t.idx],t)}),this):"object"===c?(n instanceof l?f(u,function(e,t){n[t.cache]&&(d[t.cache]=n[t.cache].slice())}):f(u,function(t,s){var a=s.cache;f(s.props,function(e,t){if(!d[a]&&s.to){if("alpha"===e||null==n[e])return;d[a]=s.to(d._rgba)}d[a][t.idx]=i(n[e],t,!0)}),d[a]&&0>e.inArray(null,d[a].slice(0,3))&&(d[a][3]=1,s.from&&(d._rgba=s.from(d[a])))}),this):t},is:function(e){var i=l(e),s=!0,n=this;return f(u,function(e,a){var o,r=i[a.cache];return r&&(o=n[a.cache]||a.to&&a.to(n._rgba)||[],f(a.props,function(e,i){return null!=r[i.idx]?s=r[i.idx]===o[i.idx]:t})),s}),s},_space:function(){var e=[],t=this;return f(u,function(i,s){t[s.cache]&&e.push(i)}),e.pop()},transition:function(e,t){var s=l(e),n=s._space(),a=u[n],o=0===this.alpha()?l("transparent"):this,r=o[a.cache]||a.to(o._rgba),h=r.slice();return s=s[a.cache],f(a.props,function(e,n){var a=n.idx,o=r[a],l=s[a],u=d[n.type]||{};null!==l&&(null===o?h[a]=l:(u.mod&&(l-o>u.mod/2?o+=u.mod:o-l>u.mod/2&&(o-=u.mod)),h[a]=i((l-o)*t+o,n)))}),this[n](h)},blend:function(t){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(t)._rgba;return l(e.map(i,function(e,t){return(1-s)*n[t]+s*e}))},toRgbaString:function(){var t="rgba(",i=e.map(this._rgba,function(e,t){return null==e?t>2?1:0:e});return 1===i[3]&&(i.pop(),t="rgb("),t+i.join()+")"},toHslaString:function(){var t="hsla(",i=e.map(this.hsla(),function(e,t){return null==e&&(e=t>2?1:0),t&&3>t&&(e=Math.round(100*e)+"%"),e});return 1===i[3]&&(i.pop(),t="hsl("),t+i.join()+")"},toHexString:function(t){var i=this._rgba.slice(),s=i.pop();return t&&i.push(~~(255*s)),"#"+e.map(i,function(e){return e=(e||0).toString(16),1===e.length?"0"+e:e}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,u.hsla.to=function(e){if(null==e[0]||null==e[1]||null==e[2])return[null,null,null,e[3]];var t,i,s=e[0]/255,n=e[1]/255,a=e[2]/255,o=e[3],r=Math.max(s,n,a),h=Math.min(s,n,a),l=r-h,u=r+h,d=.5*u;return t=h===r?0:s===r?60*(n-a)/l+360:n===r?60*(a-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=d?l/u:l/(2-u),[Math.round(t)%360,i,d,null==o?1:o]},u.hsla.from=function(e){if(null==e[0]||null==e[1]||null==e[2])return[null,null,null,e[3]];var t=e[0]/360,i=e[1],s=e[2],a=e[3],o=.5>=s?s*(1+i):s+i-s*i,r=2*s-o;return[Math.round(255*n(r,o,t+1/3)),Math.round(255*n(r,o,t)),Math.round(255*n(r,o,t-1/3)),a]},f(u,function(s,n){var a=n.props,o=n.cache,h=n.to,u=n.from;l.fn[s]=function(s){if(h&&!this[o]&&(this[o]=h(this._rgba)),s===t)return this[o].slice();var n,r=e.type(s),d="array"===r||"object"===r?s:arguments,c=this[o].slice();return f(a,function(e,t){var s=d["object"===r?e:t.idx];null==s&&(s=c[t.idx]),c[t.idx]=i(s,t)}),u?(n=l(u(c)),n[o]=c,n):l(c)},f(a,function(t,i){l.fn[t]||(l.fn[t]=function(n){var a,o=e.type(n),h="alpha"===t?this._hsla?"hsla":"rgba":s,l=this[h](),u=l[i.idx];return"undefined"===o?u:("function"===o&&(n=n.call(this,u),o=e.type(n)),null==n&&i.empty?this:("string"===o&&(a=r.exec(n),a&&(n=u+parseFloat(a[2])*("+"===a[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(t){var i=t.split(" ");f(i,function(t,i){e.cssHooks[i]={set:function(t,n){var a,o,r="";if("transparent"!==n&&("string"!==e.type(n)||(a=s(n)))){if(n=l(a||n),!c.rgba&&1!==n._rgba[3]){for(o="backgroundColor"===i?t.parentNode:t;(""===r||"transparent"===r)&&o&&o.style;)try{r=e.css(o,"backgroundColor"),o=o.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{t.style[i]=n}catch(h){}}},e.fx.step[i]=function(t){t.colorInit||(t.start=l(t.elem,i),t.end=l(t.end),t.colorInit=!0),e.cssHooks[i].set(t.elem,t.start.transition(t.end,t.pos))}})},l.hook(o),e.cssHooks.borderColor={expand:function(e){var t={};return f(["Top","Right","Bottom","Left"],function(i,s){t["border"+s+"Color"]=e}),t}},a=e.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(b),function(){function t(t){var i,s,n=t.ownerDocument.defaultView?t.ownerDocument.defaultView.getComputedStyle(t,null):t.currentStyle,a={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(a[e.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(a[i]=n[i]);return a}function i(t,i){var s,a,o={};for(s in i)a=i[s],t[s]!==a&&(n[s]||(e.fx.step[s]||!isNaN(parseFloat(a)))&&(o[s]=a));return o}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};e.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(t,i){e.fx.step[i]=function(e){("none"!==e.end&&!e.setAttr||1===e.pos&&!e.setAttr)&&(b.style(e.elem,i,e.end),e.setAttr=!0)}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e.effects.animateClass=function(n,a,o,r){var h=e.speed(a,o,r);return this.queue(function(){var a,o=e(this),r=o.attr("class")||"",l=h.children?o.find("*").addBack():o;l=l.map(function(){var i=e(this);return{el:i,start:t(this)}}),a=function(){e.each(s,function(e,t){n[t]&&o[t+"Class"](n[t])})},a(),l=l.map(function(){return this.end=t(this.el[0]),this.diff=i(this.start,this.end),this}),o.attr("class",r),l=l.map(function(){var t=this,i=e.Deferred(),s=e.extend({},h,{queue:!1,complete:function(){i.resolve(t)}});return this.el.animate(this.diff,s),i.promise()}),e.when.apply(e,l.get()).done(function(){a(),e.each(arguments,function(){var t=this.el;e.each(this.diff,function(e){t.css(e,"")})}),h.complete.call(o[0])})})},e.fn.extend({addClass:function(t){return function(i,s,n,a){return s?e.effects.animateClass.call(this,{add:i},s,n,a):t.apply(this,arguments)}}(e.fn.addClass),removeClass:function(t){return function(i,s,n,a){return arguments.length>1?e.effects.animateClass.call(this,{remove:i},s,n,a):t.apply(this,arguments)}}(e.fn.removeClass),toggleClass:function(t){return function(i,s,n,a,o){return"boolean"==typeof s||void 0===s?n?e.effects.animateClass.call(this,s?{add:i}:{remove:i},n,a,o):t.apply(this,arguments):e.effects.animateClass.call(this,{toggle:i},s,n,a)}}(e.fn.toggleClass),switchClass:function(t,i,s,n,a){return e.effects.animateClass.call(this,{add:i,remove:t},s,n,a)}})}(),function(){function t(t,i,s,n){return e.isPlainObject(t)&&(i=t,t=t.effect),t={effect:t},null==i&&(i={}),e.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||e.fx.speeds[i])&&(n=s,s=i,i={}),e.isFunction(s)&&(n=s,s=null),i&&e.extend(t,i),s=s||i.duration,t.duration=e.fx.off?0:"number"==typeof s?s:s in e.fx.speeds?e.fx.speeds[s]:e.fx.speeds._default,t.complete=n||i.complete,t}function i(t){return!t||"number"==typeof t||e.fx.speeds[t]?!0:"string"!=typeof t||e.effects.effect[t]?e.isFunction(t)?!0:"object"!=typeof t||t.effect?!1:!0:!0}e.extend(e.effects,{version:"1.11.2",save:function(e,t){for(var i=0;t.length>i;i++)null!==t[i]&&e.data(y+t[i],e[0].style[t[i]])},restore:function(e,t){var i,s;for(s=0;t.length>s;s++)null!==t[s]&&(i=e.data(y+t[s]),void 0===i&&(i=""),e.css(t[s],i))},setMode:function(e,t){return"toggle"===t&&(t=e.is(":hidden")?"show":"hide"),t},getBaseline:function(e,t){var i,s;switch(e[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=e[0]/t.height}switch(e[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=e[1]/t.width}return{x:s,y:i}},createWrapper:function(t){if(t.parent().is(".ui-effects-wrapper"))return t.parent();var i={width:t.outerWidth(!0),height:t.outerHeight(!0),"float":t.css("float")},s=e("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:t.width(),height:t.height()},a=document.activeElement;try{a.id}catch(o){a=document.body}return t.wrap(s),(t[0]===a||e.contains(t[0],a))&&e(a).focus(),s=t.parent(),"static"===t.css("position")?(s.css({position:"relative"}),t.css({position:"relative"})):(e.extend(i,{position:t.css("position"),zIndex:t.css("z-index")}),e.each(["top","left","bottom","right"],function(e,s){i[s]=t.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),t.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),t.css(n),s.css(i).show()},removeWrapper:function(t){var i=document.activeElement;return t.parent().is(".ui-effects-wrapper")&&(t.parent().replaceWith(t),(t[0]===i||e.contains(t[0],i))&&e(i).focus()),t},setTransition:function(t,i,s,n){return n=n||{},e.each(i,function(e,i){var a=t.cssUnit(i);a[0]>0&&(n[i]=a[0]*s+a[1])}),n}}),e.fn.extend({effect:function(){function i(t){function i(){e.isFunction(a)&&a.call(n[0]),e.isFunction(t)&&t()}var n=e(this),a=s.complete,r=s.mode;(n.is(":hidden")?"hide"===r:"show"===r)?(n[r](),i()):o.call(n[0],s,i)}var s=t.apply(this,arguments),n=s.mode,a=s.queue,o=e.effects.effect[s.effect];return e.fx.off||!o?n?this[n](s.duration,s.complete):this.each(function(){s.complete&&s.complete.call(this)}):a===!1?this.each(i):this.queue(a||"fx",i)},show:function(e){return function(s){if(i(s))return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="show",this.effect.call(this,n)}}(e.fn.show),hide:function(e){return function(s){if(i(s))return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(e.fn.hide),toggle:function(e){return function(s){if(i(s)||"boolean"==typeof s)return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(e.fn.toggle),cssUnit:function(t){var i=this.css(t),s=[];return e.each(["em","px","%","pt"],function(e,t){i.indexOf(t)>0&&(s=[parseFloat(i),t])}),s}})}(),function(){var t={};e.each(["Quad","Cubic","Quart","Quint","Expo"],function(e,i){t[i]=function(t){return Math.pow(t,e+2)}}),e.extend(t,{Sine:function(e){return 1-Math.cos(e*Math.PI/2)},Circ:function(e){return 1-Math.sqrt(1-e*e)},Elastic:function(e){return 0===e||1===e?e:-Math.pow(2,8*(e-1))*Math.sin((80*(e-1)-7.5)*Math.PI/15)},Back:function(e){return e*e*(3*e-2)},Bounce:function(e){for(var t,i=4;((t=Math.pow(2,--i))-1)/11>e;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*t-2)/22-e,2)}}),e.each(t,function(t,i){e.easing["easeIn"+t]=i,e.easing["easeOut"+t]=function(e){return 1-i(1-e)},e.easing["easeInOut"+t]=function(e){return.5>e?i(2*e)/2:1-i(-2*e+2)/2}})}(),e.effects,e.effects.effect.blind=function(t,i){var s,n,a,o=e(this),r=/up|down|vertical/,h=/up|left|vertical|horizontal/,l=["position","top","bottom","left","right","height","width"],u=e.effects.setMode(o,t.mode||"hide"),d=t.direction||"up",c=r.test(d),p=c?"height":"width",f=c?"top":"left",m=h.test(d),g={},v="show"===u;o.parent().is(".ui-effects-wrapper")?e.effects.save(o.parent(),l):e.effects.save(o,l),o.show(),s=e.effects.createWrapper(o).css({overflow:"hidden"}),n=s[p](),a=parseFloat(s.css(f))||0,g[p]=v?n:0,m||(o.css(c?"bottom":"right",0).css(c?"top":"left","auto").css({position:"absolute"}),g[f]=v?a:n+a),v&&(s.css(p,0),m||s.css(f,a+n)),s.animate(g,{duration:t.duration,easing:t.easing,queue:!1,complete:function(){"hide"===u&&o.hide(),e.effects.restore(o,l),e.effects.removeWrapper(o),i()}})},e.effects.effect.bounce=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","height","width"],h=e.effects.setMode(o,t.mode||"effect"),l="hide"===h,u="show"===h,d=t.direction||"up",c=t.distance,p=t.times||5,f=2*p+(u||l?1:0),m=t.duration/f,g=t.easing,v="up"===d||"down"===d?"top":"left",y="up"===d||"left"===d,b=o.queue(),_=b.length;for((u||l)&&r.push("opacity"),e.effects.save(o,r),o.show(),e.effects.createWrapper(o),c||(c=o["top"===v?"outerHeight":"outerWidth"]()/3),u&&(a={opacity:1},a[v]=0,o.css("opacity",0).css(v,y?2*-c:2*c).animate(a,m,g)),l&&(c/=Math.pow(2,p-1)),a={},a[v]=0,s=0;p>s;s++)n={},n[v]=(y?"-=":"+=")+c,o.animate(n,m,g).animate(a,m,g),c=l?2*c:c/2;l&&(n={opacity:0},n[v]=(y?"-=":"+=")+c,o.animate(n,m,g)),o.queue(function(){l&&o.hide(),e.effects.restore(o,r),e.effects.removeWrapper(o),i()}),_>1&&b.splice.apply(b,[1,0].concat(b.splice(_,f+1))),o.dequeue()},e.effects.effect.clip=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","height","width"],h=e.effects.setMode(o,t.mode||"hide"),l="show"===h,u=t.direction||"vertical",d="vertical"===u,c=d?"height":"width",p=d?"top":"left",f={};e.effects.save(o,r),o.show(),s=e.effects.createWrapper(o).css({overflow:"hidden"}),n="IMG"===o[0].tagName?s:o,a=n[c](),l&&(n.css(c,0),n.css(p,a/2)),f[c]=l?a:0,f[p]=l?0:a/2,n.animate(f,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){l||o.hide(),e.effects.restore(o,r),e.effects.removeWrapper(o),i()}})},e.effects.effect.drop=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","opacity","height","width"],o=e.effects.setMode(n,t.mode||"hide"),r="show"===o,h=t.direction||"left",l="up"===h||"down"===h?"top":"left",u="up"===h||"left"===h?"pos":"neg",d={opacity:r?1:0};e.effects.save(n,a),n.show(),e.effects.createWrapper(n),s=t.distance||n["top"===l?"outerHeight":"outerWidth"](!0)/2,r&&n.css("opacity",0).css(l,"pos"===u?-s:s),d[l]=(r?"pos"===u?"+=":"-=":"pos"===u?"-=":"+=")+s,n.animate(d,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}})},e.effects.effect.explode=function(t,i){function s(){b.push(this),b.length===d*c&&n()}function n(){p.css({visibility:"visible"}),e(b).remove(),m||p.hide(),i()}var a,o,r,h,l,u,d=t.pieces?Math.round(Math.sqrt(t.pieces)):3,c=d,p=e(this),f=e.effects.setMode(p,t.mode||"hide"),m="show"===f,g=p.show().css("visibility","hidden").offset(),v=Math.ceil(p.outerWidth()/c),y=Math.ceil(p.outerHeight()/d),b=[];for(a=0;d>a;a++)for(h=g.top+a*y,u=a-(d-1)/2,o=0;c>o;o++)r=g.left+o*v,l=o-(c-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-o*v,top:-a*y}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:v,height:y,left:r+(m?l*v:0),top:h+(m?u*y:0),opacity:m?0:1}).animate({left:r+(m?0:l*v),top:h+(m?0:u*y),opacity:m?1:0},t.duration||500,t.easing,s)},e.effects.effect.fade=function(t,i){var s=e(this),n=e.effects.setMode(s,t.mode||"toggle");s.animate({opacity:n},{queue:!1,duration:t.duration,easing:t.easing,complete:i})},e.effects.effect.fold=function(t,i){var s,n,a=e(this),o=["position","top","bottom","left","right","height","width"],r=e.effects.setMode(a,t.mode||"hide"),h="show"===r,l="hide"===r,u=t.size||15,d=/([0-9]+)%/.exec(u),c=!!t.horizFirst,p=h!==c,f=p?["width","height"]:["height","width"],m=t.duration/2,g={},v={};e.effects.save(a,o),a.show(),s=e.effects.createWrapper(a).css({overflow:"hidden"}),n=p?[s.width(),s.height()]:[s.height(),s.width()],d&&(u=parseInt(d[1],10)/100*n[l?0:1]),h&&s.css(c?{height:0,width:u}:{height:u,width:0}),g[f[0]]=h?n[0]:u,v[f[1]]=h?n[1]:0,s.animate(g,m,t.easing).animate(v,m,t.easing,function(){l&&a.hide(),e.effects.restore(a,o),e.effects.removeWrapper(a),i()})},e.effects.effect.highlight=function(t,i){var s=e(this),n=["backgroundImage","backgroundColor","opacity"],a=e.effects.setMode(s,t.mode||"show"),o={backgroundColor:s.css("backgroundColor")};"hide"===a&&(o.opacity=0),e.effects.save(s,n),s.show().css({backgroundImage:"none",backgroundColor:t.color||"#ffff99"}).animate(o,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===a&&s.hide(),e.effects.restore(s,n),i()}})},e.effects.effect.size=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],l=["width","height","overflow"],u=["fontSize"],d=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],c=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=e.effects.setMode(o,t.mode||"effect"),f=t.restore||"effect"!==p,m=t.scale||"both",g=t.origin||["middle","center"],v=o.css("position"),y=f?r:h,b={height:0,width:0,outerHeight:0,outerWidth:0};"show"===p&&o.show(),s={height:o.height(),width:o.width(),outerHeight:o.outerHeight(),outerWidth:o.outerWidth()},"toggle"===t.mode&&"show"===p?(o.from=t.to||b,o.to=t.from||s):(o.from=t.from||("show"===p?b:s),o.to=t.to||("hide"===p?b:s)),a={from:{y:o.from.height/s.height,x:o.from.width/s.width},to:{y:o.to.height/s.height,x:o.to.width/s.width}},("box"===m||"both"===m)&&(a.from.y!==a.to.y&&(y=y.concat(d),o.from=e.effects.setTransition(o,d,a.from.y,o.from),o.to=e.effects.setTransition(o,d,a.to.y,o.to)),a.from.x!==a.to.x&&(y=y.concat(c),o.from=e.effects.setTransition(o,c,a.from.x,o.from),o.to=e.effects.setTransition(o,c,a.to.x,o.to))),("content"===m||"both"===m)&&a.from.y!==a.to.y&&(y=y.concat(u).concat(l),o.from=e.effects.setTransition(o,u,a.from.y,o.from),o.to=e.effects.setTransition(o,u,a.to.y,o.to)),e.effects.save(o,y),o.show(),e.effects.createWrapper(o),o.css("overflow","hidden").css(o.from),g&&(n=e.effects.getBaseline(g,s),o.from.top=(s.outerHeight-o.outerHeight())*n.y,o.from.left=(s.outerWidth-o.outerWidth())*n.x,o.to.top=(s.outerHeight-o.to.outerHeight)*n.y,o.to.left=(s.outerWidth-o.to.outerWidth)*n.x),o.css(o.from),("content"===m||"both"===m)&&(d=d.concat(["marginTop","marginBottom"]).concat(u),c=c.concat(["marginLeft","marginRight"]),l=r.concat(d).concat(c),o.find("*[width]").each(function(){var i=e(this),s={height:i.height(),width:i.width(),outerHeight:i.outerHeight(),outerWidth:i.outerWidth()};
+f&&e.effects.save(i,l),i.from={height:s.height*a.from.y,width:s.width*a.from.x,outerHeight:s.outerHeight*a.from.y,outerWidth:s.outerWidth*a.from.x},i.to={height:s.height*a.to.y,width:s.width*a.to.x,outerHeight:s.height*a.to.y,outerWidth:s.width*a.to.x},a.from.y!==a.to.y&&(i.from=e.effects.setTransition(i,d,a.from.y,i.from),i.to=e.effects.setTransition(i,d,a.to.y,i.to)),a.from.x!==a.to.x&&(i.from=e.effects.setTransition(i,c,a.from.x,i.from),i.to=e.effects.setTransition(i,c,a.to.x,i.to)),i.css(i.from),i.animate(i.to,t.duration,t.easing,function(){f&&e.effects.restore(i,l)})})),o.animate(o.to,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){0===o.to.opacity&&o.css("opacity",o.from.opacity),"hide"===p&&o.hide(),e.effects.restore(o,y),f||("static"===v?o.css({position:"relative",top:o.to.top,left:o.to.left}):e.each(["top","left"],function(e,t){o.css(t,function(t,i){var s=parseInt(i,10),n=e?o.to.left:o.to.top;return"auto"===i?n+"px":s+n+"px"})})),e.effects.removeWrapper(o),i()}})},e.effects.effect.scale=function(t,i){var s=e(this),n=e.extend(!0,{},t),a=e.effects.setMode(s,t.mode||"effect"),o=parseInt(t.percent,10)||(0===parseInt(t.percent,10)?0:"hide"===a?0:100),r=t.direction||"both",h=t.origin,l={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()},u={y:"horizontal"!==r?o/100:1,x:"vertical"!==r?o/100:1};n.effect="size",n.queue=!1,n.complete=i,"effect"!==a&&(n.origin=h||["middle","center"],n.restore=!0),n.from=t.from||("show"===a?{height:0,width:0,outerHeight:0,outerWidth:0}:l),n.to={height:l.height*u.y,width:l.width*u.x,outerHeight:l.outerHeight*u.y,outerWidth:l.outerWidth*u.x},n.fade&&("show"===a&&(n.from.opacity=0,n.to.opacity=1),"hide"===a&&(n.from.opacity=1,n.to.opacity=0)),s.effect(n)},e.effects.effect.puff=function(t,i){var s=e(this),n=e.effects.setMode(s,t.mode||"hide"),a="hide"===n,o=parseInt(t.percent,10)||150,r=o/100,h={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()};e.extend(t,{effect:"scale",queue:!1,fade:!0,mode:n,complete:i,percent:a?o:100,from:a?h:{height:h.height*r,width:h.width*r,outerHeight:h.outerHeight*r,outerWidth:h.outerWidth*r}}),s.effect(t)},e.effects.effect.pulsate=function(t,i){var s,n=e(this),a=e.effects.setMode(n,t.mode||"show"),o="show"===a,r="hide"===a,h=o||"hide"===a,l=2*(t.times||5)+(h?1:0),u=t.duration/l,d=0,c=n.queue(),p=c.length;for((o||!n.is(":visible"))&&(n.css("opacity",0).show(),d=1),s=1;l>s;s++)n.animate({opacity:d},u,t.easing),d=1-d;n.animate({opacity:d},u,t.easing),n.queue(function(){r&&n.hide(),i()}),p>1&&c.splice.apply(c,[1,0].concat(c.splice(p,l+1))),n.dequeue()},e.effects.effect.shake=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","height","width"],o=e.effects.setMode(n,t.mode||"effect"),r=t.direction||"left",h=t.distance||20,l=t.times||3,u=2*l+1,d=Math.round(t.duration/u),c="up"===r||"down"===r?"top":"left",p="up"===r||"left"===r,f={},m={},g={},v=n.queue(),y=v.length;for(e.effects.save(n,a),n.show(),e.effects.createWrapper(n),f[c]=(p?"-=":"+=")+h,m[c]=(p?"+=":"-=")+2*h,g[c]=(p?"-=":"+=")+2*h,n.animate(f,d,t.easing),s=1;l>s;s++)n.animate(m,d,t.easing).animate(g,d,t.easing);n.animate(m,d,t.easing).animate(f,d/2,t.easing).queue(function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}),y>1&&v.splice.apply(v,[1,0].concat(v.splice(y,u+1))),n.dequeue()},e.effects.effect.slide=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","width","height"],o=e.effects.setMode(n,t.mode||"show"),r="show"===o,h=t.direction||"left",l="up"===h||"down"===h?"top":"left",u="up"===h||"left"===h,d={};e.effects.save(n,a),n.show(),s=t.distance||n["top"===l?"outerHeight":"outerWidth"](!0),e.effects.createWrapper(n).css({overflow:"hidden"}),r&&n.css(l,u?isNaN(s)?"-"+s:-s:s),d[l]=(r?u?"+=":"-=":u?"-=":"+=")+s,n.animate(d,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}})},e.effects.effect.transfer=function(t,i){var s=e(this),n=e(t.to),a="fixed"===n.css("position"),o=e("body"),r=a?o.scrollTop():0,h=a?o.scrollLeft():0,l=n.offset(),u={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},d=s.offset(),c=e("<div class='ui-effects-transfer'></div>").appendTo(document.body).addClass(t.className).css({top:d.top-r,left:d.left-h,height:s.innerHeight(),width:s.innerWidth(),position:a?"fixed":"absolute"}).animate(u,t.duration,t.easing,function(){c.remove(),i()})},e.widget("ui.progressbar",{version:"1.11.2",options:{max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min}),this.valueDiv=e("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this._refreshValue()},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()},value:function(e){return void 0===e?this.options.value:(this.options.value=this._constrainedValue(e),this._refreshValue(),void 0)},_constrainedValue:function(e){return void 0===e&&(e=this.options.value),this.indeterminate=e===!1,"number"!=typeof e&&(e=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,e))},_setOptions:function(e){var t=e.value;delete e.value,this._super(e),this.options.value=this._constrainedValue(t),this._refreshValue()},_setOption:function(e,t){"max"===e&&(t=Math.max(this.min,t)),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var t=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||t>this.min).toggleClass("ui-corner-right",t===this.options.max).width(i.toFixed(0)+"%"),this.element.toggleClass("ui-progressbar-indeterminate",this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=e("<div class='ui-progressbar-overlay'></div>").appendTo(this.valueDiv))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":t}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==t&&(this.oldValue=t,this._trigger("change")),t===this.options.max&&this._trigger("complete")}}),e.widget("ui.selectable",e.ui.mouse,{version:"1.11.2",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var t,i=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){t=e(i.options.filter,i.element[0]),t.addClass("ui-selectee"),t.each(function(){var t=e(this),i=t.offset();e.data(this,"selectable-item",{element:this,$element:t,left:i.left,top:i.top,right:i.left+t.outerWidth(),bottom:i.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=t.addClass("ui-selectee"),this._mouseInit(),this.helper=e("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(t){var i=this,s=this.options;this.opos=[t.pageX,t.pageY],this.options.disabled||(this.selectees=e(s.filter,this.element[0]),this._trigger("start",t),e(s.appendTo).append(this.helper),this.helper.css({left:t.pageX,top:t.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=e.data(this,"selectable-item");s.startselected=!0,t.metaKey||t.ctrlKey||(s.$element.removeClass("ui-selected"),s.selected=!1,s.$element.addClass("ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",t,{unselecting:s.element}))}),e(t.target).parents().addBack().each(function(){var s,n=e.data(this,"selectable-item");return n?(s=!t.metaKey&&!t.ctrlKey||!n.$element.hasClass("ui-selected"),n.$element.removeClass(s?"ui-unselecting":"ui-selected").addClass(s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",t,{selecting:n.element}):i._trigger("unselecting",t,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(t){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,a=this.opos[0],o=this.opos[1],r=t.pageX,h=t.pageY;return a>r&&(i=r,r=a,a=i),o>h&&(i=h,h=o,o=i),this.helper.css({left:a,top:o,width:r-a,height:h-o}),this.selectees.each(function(){var i=e.data(this,"selectable-item"),l=!1;i&&i.element!==s.element[0]&&("touch"===n.tolerance?l=!(i.left>r||a>i.right||i.top>h||o>i.bottom):"fit"===n.tolerance&&(l=i.left>a&&r>i.right&&i.top>o&&h>i.bottom),l?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,s._trigger("selecting",t,{selecting:i.element}))):(i.selecting&&((t.metaKey||t.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",t,{unselecting:i.element}))),i.selected&&(t.metaKey||t.ctrlKey||i.startselected||(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",t,{unselecting:i.element})))))}),!1}},_mouseStop:function(t){var i=this;return this.dragged=!1,e(".ui-unselecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",t,{unselected:s.element})}),e(".ui-selecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-selecting").addClass("ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",t,{selected:s.element})}),this._trigger("stop",t),this.helper.remove(),!1}}),e.widget("ui.selectmenu",{version:"1.11.2",defaultElement:"<select>",options:{appendTo:null,disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:null,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this.options.disabled&&this.disable()},_drawButton:function(){var t=this,i=this.element.attr("tabindex");this.label=e("label[for='"+this.ids.element+"']").attr("for",this.ids.button),this._on(this.label,{click:function(e){this.button.focus(),e.preventDefault()}}),this.element.hide(),this.button=e("<span>",{"class":"ui-selectmenu-button ui-widget ui-state-default ui-corner-all",tabindex:i||this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true"}).insertAfter(this.element),e("<span>",{"class":"ui-icon "+this.options.icons.button}).prependTo(this.button),this.buttonText=e("<span>",{"class":"ui-selectmenu-text"}).appendTo(this.button),this._setText(this.buttonText,this.element.find("option:selected").text()),this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){t.menuItems||t._refreshMenu()}),this._hoverable(this.button),this._focusable(this.button)},_drawMenu:function(){var t=this;this.menu=e("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=e("<div>",{"class":"ui-selectmenu-menu ui-front"}).append(this.menu).appendTo(this._appendTo()),this.menuInstance=this.menu.menu({role:"listbox",select:function(e,i){e.preventDefault(),t._setSelection(),t._select(i.item.data("ui-selectmenu-item"),e)},focus:function(e,i){var s=i.item.data("ui-selectmenu-item");null!=t.focusIndex&&s.index!==t.focusIndex&&(t._trigger("focus",e,{item:s}),t.isOpen||t._select(s,e)),t.focusIndex=s.index,t.button.attr("aria-activedescendant",t.menuItems.eq(s.index).attr("id"))}}).menu("instance"),this.menu.addClass("ui-corner-bottom").removeClass("ui-corner-all"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this._setText(this.buttonText,this._getSelectedItem().text()),this.options.width||this._resizeButton()},_refreshMenu:function(){this.menu.empty();var e,t=this.element.find("option");t.length&&(this._parseOptions(t),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup"),e=this._getSelectedItem(),this.menuInstance.focus(null,e),this._setAria(e.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(e){this.options.disabled||(this.menuItems?(this.menu.find(".ui-state-focus").removeClass("ui-state-focus"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",e))},_position:function(){this.menuWrap.position(e.extend({of:this.button},this.options.position))},close:function(e){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",e))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderMenu:function(t,i){var s=this,n="";e.each(i,function(i,a){a.optgroup!==n&&(e("<li>",{"class":"ui-selectmenu-optgroup ui-menu-divider"+(a.element.parent("optgroup").prop("disabled")?" ui-state-disabled":""),text:a.optgroup}).appendTo(t),n=a.optgroup),s._renderItemData(t,a)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-selectmenu-item",t)},_renderItem:function(t,i){var s=e("<li>");return i.disabled&&s.addClass("ui-state-disabled"),this._setText(s,i.label),s.appendTo(t)},_setText:function(e,t){t?e.text(t):e.html("&#160;")},_move:function(e,t){var i,s,n=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex):(i=this.menuItems.eq(this.element[0].selectedIndex),n+=":not(.ui-state-disabled)"),s="first"===e||"last"===e?i["first"===e?"prevAll":"nextAll"](n).eq(-1):i[e+"All"](n).eq(0),s.length&&this.menuInstance.focus(t,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex)},_toggle:function(e){this[this.isOpen?"close":"open"](e)},_setSelection:function(){var e;this.range&&(window.getSelection?(e=window.getSelection(),e.removeAllRanges(),e.addRange(this.range)):this.range.select(),this.button.focus())},_documentClick:{mousedown:function(t){this.isOpen&&(e(t.target).closest(".ui-selectmenu-menu, #"+this.ids.button).length||this.close(t))}},_buttonEvents:{mousedown:function(){var e;window.getSelection?(e=window.getSelection(),e.rangeCount&&(this.range=e.getRangeAt(0))):this.range=document.selection.createRange()},click:function(e){this._setSelection(),this._toggle(e)},keydown:function(t){var i=!0;switch(t.keyCode){case e.ui.keyCode.TAB:case e.ui.keyCode.ESCAPE:this.close(t),i=!1;break;case e.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(t);break;case e.ui.keyCode.UP:t.altKey?this._toggle(t):this._move("prev",t);break;case e.ui.keyCode.DOWN:t.altKey?this._toggle(t):this._move("next",t);break;case e.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(t):this._toggle(t);break;case e.ui.keyCode.LEFT:this._move("prev",t);break;case e.ui.keyCode.RIGHT:this._move("next",t);break;case e.ui.keyCode.HOME:case e.ui.keyCode.PAGE_UP:this._move("first",t);break;case e.ui.keyCode.END:case e.ui.keyCode.PAGE_DOWN:this._move("last",t);break;default:this.menu.trigger(t),i=!1}i&&t.preventDefault()}},_selectFocusedItem:function(e){var t=this.menuItems.eq(this.focusIndex);t.hasClass("ui-state-disabled")||this._select(t.data("ui-selectmenu-item"),e)},_select:function(e,t){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=e.index,this._setText(this.buttonText,e.label),this._setAria(e),this._trigger("select",t,{item:e}),e.index!==i&&this._trigger("change",t,{item:e}),this.close(t)},_setAria:function(e){var t=this.menuItems.eq(e.index).attr("id");this.button.attr({"aria-labelledby":t,"aria-activedescendant":t}),this.menu.attr("aria-activedescendant",t)},_setOption:function(e,t){"icons"===e&&this.button.find("span.ui-icon").removeClass(this.options.icons.button).addClass(t.button),this._super(e,t),"appendTo"===e&&this.menuWrap.appendTo(this._appendTo()),"disabled"===e&&(this.menuInstance.option("disabled",t),this.button.toggleClass("ui-state-disabled",t).attr("aria-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)),"width"===e&&this._resizeButton()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t&&t[0]||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_toggleAttr:function(){this.button.toggleClass("ui-corner-top",this.isOpen).toggleClass("ui-corner-all",!this.isOpen).attr("aria-expanded",this.isOpen),this.menuWrap.toggleClass("ui-selectmenu-open",this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var e=this.options.width;e||(e=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(e)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){return{disabled:this.element.prop("disabled")}},_parseOptions:function(t){var i=[];t.each(function(t,s){var n=e(s),a=n.parent("optgroup");i.push({element:n,index:t,value:n.attr("value"),label:n.text(),optgroup:a.attr("label")||"",disabled:a.prop("disabled")||n.prop("disabled")})}),this.items=i},_destroy:function(){this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.label.attr("for",this.ids.element)}}),e.widget("ui.slider",e.ui.mouse,{version:"1.11.2",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"),this._refresh(),this._setOption("disabled",this.options.disabled),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var t,i,s=this.options,n=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),a="<span class='ui-slider-handle ui-state-default ui-corner-all' tabindex='0'></span>",o=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),t=n.length;i>t;t++)o.push(a);this.handles=n.add(e(o.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.each(function(t){e(this).data("ui-slider-handle-index",t)})},_createRange:function(){var t=this.options,i="";t.range?(t.range===!0&&(t.values?t.values.length&&2!==t.values.length?t.values=[t.values[0],t.values[0]]:e.isArray(t.values)&&(t.values=t.values.slice(0)):t.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?this.range.removeClass("ui-slider-range-min ui-slider-range-max").css({left:"",bottom:""}):(this.range=e("<div></div>").appendTo(this.element),i="ui-slider-range ui-widget-header ui-corner-all"),this.range.addClass(i+("min"===t.range||"max"===t.range?" ui-slider-range-"+t.range:""))):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(t){var i,s,n,a,o,r,h,l,u=this,d=this.options;return d.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:t.pageX,y:t.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(t){var i=Math.abs(s-u.values(t));(n>i||n===i&&(t===u._lastChangedValue||u.values(t)===d.min))&&(n=i,a=e(this),o=t)}),r=this._start(t,o),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=o,a.addClass("ui-state-active").focus(),h=a.offset(),l=!e(t.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:t.pageX-h.left-a.width()/2,top:t.pageY-h.top-a.height()/2-(parseInt(a.css("borderTopWidth"),10)||0)-(parseInt(a.css("borderBottomWidth"),10)||0)+(parseInt(a.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(t,o,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(e){var t={x:e.pageX,y:e.pageY},i=this._normValueFromMouse(t);return this._slide(e,this._handleIndex,i),!1},_mouseStop:function(e){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(e,this._handleIndex),this._change(e,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(e){var t,i,s,n,a;return"horizontal"===this.orientation?(t=this.elementSize.width,i=e.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(t=this.elementSize.height,i=e.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/t,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),a=this._valueMin()+s*n,this._trimAlignValue(a)},_start:function(e,t){var i={handle:this.handles[t],value:this.value()};return this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._trigger("start",e,i)},_slide:function(e,t,i){var s,n,a;this.options.values&&this.options.values.length?(s=this.values(t?0:1),2===this.options.values.length&&this.options.range===!0&&(0===t&&i>s||1===t&&s>i)&&(i=s),i!==this.values(t)&&(n=this.values(),n[t]=i,a=this._trigger("slide",e,{handle:this.handles[t],value:i,values:n}),s=this.values(t?0:1),a!==!1&&this.values(t,i))):i!==this.value()&&(a=this._trigger("slide",e,{handle:this.handles[t],value:i}),a!==!1&&this.value(i))},_stop:function(e,t){var i={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._trigger("stop",e,i)},_change:function(e,t){if(!this._keySliding&&!this._mouseSliding){var i={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._lastChangedValue=t,this._trigger("change",e,i)}},value:function(e){return arguments.length?(this.options.value=this._trimAlignValue(e),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(t,i){var s,n,a;if(arguments.length>1)return this.options.values[t]=this._trimAlignValue(i),this._refreshValue(),this._change(null,t),void 0;if(!arguments.length)return this._values();if(!e.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(t):this.value();for(s=this.options.values,n=arguments[0],a=0;s.length>a;a+=1)s[a]=this._trimAlignValue(n[a]),this._change(null,a);this._refreshValue()},_setOption:function(t,i){var s,n=0;switch("range"===t&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),e.isArray(this.options.values)&&(n=this.options.values.length),"disabled"===t&&this.element.toggleClass("ui-state-disabled",!!i),this._super(t,i),t){case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue(),this.handles.css("horizontal"===i?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=0;n>s;s+=1)this._change(null,s);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_value:function(){var e=this.options.value;return e=this._trimAlignValue(e)},_values:function(e){var t,i,s;if(arguments.length)return t=this.options.values[e],t=this._trimAlignValue(t);if(this.options.values&&this.options.values.length){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(e){if(this._valueMin()>=e)return this._valueMin();if(e>=this._valueMax())return this._valueMax();var t=this.options.step>0?this.options.step:1,i=(e-this._valueMin())%t,s=e-i;return 2*Math.abs(i)>=t&&(s+=i>0?t:-t),parseFloat(s.toFixed(5))},_calculateNewMax:function(){var e=(this.options.max-this._valueMin())%this.options.step;this.max=this.options.max-e},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshValue:function(){var t,i,s,n,a,o=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,u={};this.options.values&&this.options.values.length?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),u["horizontal"===h.orientation?"left":"bottom"]=i+"%",e(this).stop(1,1)[l?"animate":"css"](u,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-t+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-t+"%"},{queue:!1,duration:r.animate}))),t=i}):(s=this.value(),n=this._valueMin(),a=this._valueMax(),i=a!==n?100*((s-n)/(a-n)):0,u["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](u,r.animate),"min"===o&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===o&&"horizontal"===this.orientation&&this.range[l?"animate":"css"]({width:100-i+"%"},{queue:!1,duration:r.animate}),"min"===o&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===o&&"vertical"===this.orientation&&this.range[l?"animate":"css"]({height:100-i+"%"},{queue:!1,duration:r.animate}))},_handleEvents:{keydown:function(t){var i,s,n,a,o=e(t.target).data("ui-slider-handle-index");switch(t.keyCode){case e.ui.keyCode.HOME:case e.ui.keyCode.END:case e.ui.keyCode.PAGE_UP:case e.ui.keyCode.PAGE_DOWN:case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(t.preventDefault(),!this._keySliding&&(this._keySliding=!0,e(t.target).addClass("ui-state-active"),i=this._start(t,o),i===!1))return}switch(a=this.options.step,s=n=this.options.values&&this.options.values.length?this.values(o):this.value(),t.keyCode){case e.ui.keyCode.HOME:n=this._valueMin();break;case e.ui.keyCode.END:n=this._valueMax();break;case e.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case e.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+a);break;case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-a)}this._slide(t,o,n)},keyup:function(t){var i=e(t.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(t,i),this._change(t,i),e(t.target).removeClass("ui-state-active"))}}}),e.widget("ui.sortable",e.ui.mouse,{version:"1.11.2",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(e,t,i){return e>=t&&t+i>e},_isFloating:function(e){return/left|right/.test(e.css("float"))||/inline|table-cell/.test(e.css("display"))},_create:function(){var e=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?"x"===e.axis||this._isFloating(this.items[0].item):!1,this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(e,t){this._super(e,t),"handle"===e&&this._setHandleClassName()},_setHandleClassName:function(){this.element.find(".ui-sortable-handle").removeClass("ui-sortable-handle"),e.each(this.items,function(){(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item).addClass("ui-sortable-handle")})},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").find(".ui-sortable-handle").removeClass("ui-sortable-handle"),this._mouseDestroy();for(var e=this.items.length-1;e>=0;e--)this.items[e].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(t,i){var s=null,n=!1,a=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(t),e(t.target).parents().each(function(){return e.data(this,a.widgetName+"-item")===a?(s=e(this),!1):void 0}),e.data(t.target,a.widgetName+"-item")===a&&(s=e(t.target)),s?!this.options.handle||i||(e(this.options.handle,s).find("*").addBack().each(function(){this===t.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(t,i,s){var n,a,o=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(t),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,o.cursorAt&&this._adjustOffsetFromHelper(o.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),o.containment&&this._setContainment(),o.cursor&&"auto"!==o.cursor&&(a=this.document.find("body"),this.storedCursor=a.css("cursor"),a.css("cursor",o.cursor),this.storedStylesheet=e("<style>*{ cursor: "+o.cursor+" !important; }</style>").appendTo(a)),o.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",o.opacity)),o.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",o.zIndex)),this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",t,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",t,this._uiHash(this));
+return e.ui.ddmanager&&(e.ui.ddmanager.current=this),e.ui.ddmanager&&!o.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(t),!0},_mouseDrag:function(t){var i,s,n,a,o=this.options,r=!1;for(this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-t.pageY<o.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+o.scrollSpeed:t.pageY-this.overflowOffset.top<o.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-o.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-t.pageX<o.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+o.scrollSpeed:t.pageX-this.overflowOffset.left<o.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-o.scrollSpeed)):(t.pageY-e(document).scrollTop()<o.scrollSensitivity?r=e(document).scrollTop(e(document).scrollTop()-o.scrollSpeed):e(window).height()-(t.pageY-e(document).scrollTop())<o.scrollSensitivity&&(r=e(document).scrollTop(e(document).scrollTop()+o.scrollSpeed)),t.pageX-e(document).scrollLeft()<o.scrollSensitivity?r=e(document).scrollLeft(e(document).scrollLeft()-o.scrollSpeed):e(window).width()-(t.pageX-e(document).scrollLeft())<o.scrollSensitivity&&(r=e(document).scrollLeft(e(document).scrollLeft()+o.scrollSpeed))),r!==!1&&e.ui.ddmanager&&!o.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],a=this._intersectsWithPointer(s),a&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===a?"next":"prev"]()[0]!==n&&!e.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!e.contains(this.element[0],n):!0)){if(this.direction=1===a?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(t,s),this._trigger("change",t,this._uiHash());break}return this._contactContainers(t),e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),this._trigger("sort",t,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(t,i){if(t){if(e.ui.ddmanager&&!this.options.dropBehaviour&&e.ui.ddmanager.drop(this,t),this.options.revert){var s=this,n=this.placeholder.offset(),a=this.options.axis,o={};a&&"x"!==a||(o.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollLeft)),a&&"y"!==a||(o.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,e(this.helper).animate(o,parseInt(this.options.revert,10)||500,function(){s._clear(t)})}else this._clear(t,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var t=this.containers.length-1;t>=0;t--)this.containers[t]._trigger("deactivate",null,this._uiHash(this)),this.containers[t].containerCache.over&&(this.containers[t]._trigger("out",null,this._uiHash(this)),this.containers[t].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),e.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?e(this.domPosition.prev).after(this.currentItem):e(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(t){var i=this._getItemsAsjQuery(t&&t.connected),s=[];return t=t||{},e(i).each(function(){var i=(e(t.item||this).attr(t.attribute||"id")||"").match(t.expression||/(.+)[\-=_](.+)/);i&&s.push((t.key||i[1]+"[]")+"="+(t.key&&t.expression?i[1]:i[2]))}),!s.length&&t.key&&s.push(t.key+"="),s.join("&")},toArray:function(t){var i=this._getItemsAsjQuery(t&&t.connected),s=[];return t=t||{},i.each(function(){s.push(e(t.item||this).attr(t.attribute||"id")||"")}),s},_intersectsWith:function(e){var t=this.positionAbs.left,i=t+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,a=e.left,o=a+e.width,r=e.top,h=r+e.height,l=this.offset.click.top,u=this.offset.click.left,d="x"===this.options.axis||s+l>r&&h>s+l,c="y"===this.options.axis||t+u>a&&o>t+u,p=d&&c;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>e[this.floating?"width":"height"]?p:t+this.helperProportions.width/2>a&&o>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(e){var t="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,e.top,e.height),i="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,e.left,e.width),s=t&&i,n=this._getDragVerticalDirection(),a=this._getDragHorizontalDirection();return s?this.floating?a&&"right"===a||"down"===n?2:1:n&&("down"===n?2:1):!1},_intersectsWithSides:function(e){var t=this._isOverAxis(this.positionAbs.top+this.offset.click.top,e.top+e.height/2,e.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,e.left+e.width/2,e.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&t||"up"===s&&!t)},_getDragVerticalDirection:function(){var e=this.positionAbs.top-this.lastPositionAbs.top;return 0!==e&&(e>0?"down":"up")},_getDragHorizontalDirection:function(){var e=this.positionAbs.left-this.lastPositionAbs.left;return 0!==e&&(e>0?"right":"left")},refresh:function(e){return this._refreshItems(e),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var e=this.options;return e.connectWith.constructor===String?[e.connectWith]:e.connectWith},_getItemsAsjQuery:function(t){function i(){r.push(this)}var s,n,a,o,r=[],h=[],l=this._connectWith();if(l&&t)for(s=l.length-1;s>=0;s--)for(a=e(l[s]),n=a.length-1;n>=0;n--)o=e.data(a[n],this.widgetFullName),o&&o!==this&&!o.options.disabled&&h.push([e.isFunction(o.options.items)?o.options.items.call(o.element):e(o.options.items,o.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),o]);for(h.push([e.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):e(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return e(r)},_removeCurrentsFromItems:function(){var t=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=e.grep(this.items,function(e){for(var i=0;t.length>i;i++)if(t[i]===e.item[0])return!1;return!0})},_refreshItems:function(t){this.items=[],this.containers=[this];var i,s,n,a,o,r,h,l,u=this.items,d=[[e.isFunction(this.options.items)?this.options.items.call(this.element[0],t,{item:this.currentItem}):e(this.options.items,this.element),this]],c=this._connectWith();if(c&&this.ready)for(i=c.length-1;i>=0;i--)for(n=e(c[i]),s=n.length-1;s>=0;s--)a=e.data(n[s],this.widgetFullName),a&&a!==this&&!a.options.disabled&&(d.push([e.isFunction(a.options.items)?a.options.items.call(a.element[0],t,{item:this.currentItem}):e(a.options.items,a.element),a]),this.containers.push(a));for(i=d.length-1;i>=0;i--)for(o=d[i][1],r=d[i][0],s=0,l=r.length;l>s;s++)h=e(r[s]),h.data(this.widgetName+"-item",o),u.push({item:h,instance:o,width:0,height:0,left:0,top:0})},refreshPositions:function(t){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,a;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?e(this.options.toleranceElement,s.item):s.item,t||(s.width=n.outerWidth(),s.height=n.outerHeight()),a=n.offset(),s.left=a.left,s.top=a.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)a=this.containers[i].element.offset(),this.containers[i].containerCache.left=a.left,this.containers[i].containerCache.top=a.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(t){t=t||this;var i,s=t.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=t.currentItem[0].nodeName.toLowerCase(),n=e("<"+s+">",t.document[0]).addClass(i||t.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tr"===s?t.currentItem.children().each(function(){e("<td>&#160;</td>",t.document[0]).attr("colspan",e(this).attr("colspan")||1).appendTo(n)}):"img"===s&&n.attr("src",t.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(e,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(t.currentItem.innerHeight()-parseInt(t.currentItem.css("paddingTop")||0,10)-parseInt(t.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(t.currentItem.innerWidth()-parseInt(t.currentItem.css("paddingLeft")||0,10)-parseInt(t.currentItem.css("paddingRight")||0,10)))}}),t.placeholder=e(s.placeholder.element.call(t.element,t.currentItem)),t.currentItem.after(t.placeholder),s.placeholder.update(t,t.placeholder)},_contactContainers:function(t){var i,s,n,a,o,r,h,l,u,d,c=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!e.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(c&&e.contains(this.containers[i].element[0],c.element[0]))continue;c=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",t,this._uiHash(this)),this.containers[i].containerCache.over=0);if(c)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",t,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,a=null,u=c.floating||this._isFloating(this.currentItem),o=u?"left":"top",r=u?"width":"height",d=u?"clientX":"clientY",s=this.items.length-1;s>=0;s--)e.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(h=this.items[s].item.offset()[o],l=!1,t[d]-h>this.items[s][r]/2&&(l=!0),n>Math.abs(t[d]-h)&&(n=Math.abs(t[d]-h),a=this.items[s],this.direction=l?"up":"down"));if(!a&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",t,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;a?this._rearrange(t,a,null,!0):this._rearrange(t,null,this.containers[p].element,!0),this._trigger("change",t,this._uiHash()),this.containers[p]._trigger("change",t,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",t,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper)?e(i.helper.apply(this.element[0],[t,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||e("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&e.ui.ie)&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var e=this.currentItem.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,e("document"===n.containment?document:window).width()-this.helperProportions.width-this.margins.left,(e("document"===n.containment?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(t=e(n.containment)[0],i=e(n.containment).offset(),s="hidden"!==e(t).css("overflow"),this.containment=[i.left+(parseInt(e(t).css("borderLeftWidth"),10)||0)+(parseInt(e(t).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(e(t).css("borderTopWidth"),10)||0)+(parseInt(e(t).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(t.scrollWidth,t.offsetWidth):t.offsetWidth)-(parseInt(e(t).css("borderLeftWidth"),10)||0)-(parseInt(e(t).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(t.scrollHeight,t.offsetHeight):t.offsetHeight)-(parseInt(e(t).css("borderTopWidth"),10)||0)-(parseInt(e(t).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(t,i){i||(i=this.position);var s="absolute"===t?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,a=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():a?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():a?0:n.scrollLeft())*s}},_generatePosition:function(t){var i,s,n=this.options,a=t.pageX,o=t.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==document&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(t.pageX-this.offset.click.left<this.containment[0]&&(a=this.containment[0]+this.offset.click.left),t.pageY-this.offset.click.top<this.containment[1]&&(o=this.containment[1]+this.offset.click.top),t.pageX-this.offset.click.left>this.containment[2]&&(a=this.containment[2]+this.offset.click.left),t.pageY-this.offset.click.top>this.containment[3]&&(o=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((o-this.originalPageY)/n.grid[1])*n.grid[1],o=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((a-this.originalPageX)/n.grid[0])*n.grid[0],a=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:o-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:a-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(e,t,i,s){i?i[0].appendChild(this.placeholder[0]):t.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?t.item[0]:t.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(e,t){function i(e,t,i){return function(s){i._trigger(e,s,t._uiHash(t))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!t&&n.push(function(e){this._trigger("receive",e,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||t||n.push(function(e){this._trigger("update",e,this._uiHash())}),this!==this.currentContainer&&(t||(n.push(function(e){this._trigger("remove",e,this._uiHash())}),n.push(function(e){return function(t){e._trigger("receive",t,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(e){return function(t){e._trigger("update",t,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)t||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,t||this._trigger("beforeStop",e,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!t){for(s=0;n.length>s;s++)n[s].call(this,e);this._trigger("stop",e,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){e.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(t){var i=t||this;return{helper:i.helper,placeholder:i.placeholder||e([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:t?t.element:null}}}),e.widget("ui.spinner",{version:"1.11.2",defaultElement:"<input>",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var t={},i=this.element;return e.each(["min","max","step"],function(e,s){var n=i.attr(s);void 0!==n&&n.length&&(t[s]=n)}),t},_events:{keydown:function(e){this._start(e)&&this._keydown(e)&&e.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",e),void 0)},mousewheel:function(e,t){if(t){if(!this.spinning&&!this._start(e))return!1;this._spin((t>0?1:-1)*this.options.step,e),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(e)},100),e.preventDefault()}},"mousedown .ui-spinner-button":function(t){function i(){var e=this.element[0]===this.document[0].activeElement;e||(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),t.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(t)!==!1&&this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(t){return e(t.currentTarget).hasClass("ui-state-active")?this._start(t)===!1?!1:(this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var e=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=e.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(.5*e.height())&&e.height()>0&&e.height(e.height()),this.options.disabled&&this.disable()},_keydown:function(t){var i=this.options,s=e.ui.keyCode;switch(t.keyCode){case s.UP:return this._repeat(null,1,t),!0;case s.DOWN:return this._repeat(null,-1,t),!0;case s.PAGE_UP:return this._repeat(null,i.page,t),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,t),!0}return!1},_uiSpinnerHtml:function(){return"<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>"},_buttonHtml:function(){return"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'><span class='ui-icon "+this.options.icons.up+"'>&#9650;</span>"+"</a>"+"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>"+"<span class='ui-icon "+this.options.icons.down+"'>&#9660;</span>"+"</a>"},_start:function(e){return this.spinning||this._trigger("start",e)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(e,t,i){e=e||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,t,i)},e),this._spin(t*this.options.step,i)},_spin:function(e,t){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+e*this._increment(this.counter)),this.spinning&&this._trigger("spin",t,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(t){var i=this.options.incremental;return i?e.isFunction(i)?i(t):Math.floor(t*t*t/5e4-t*t/500+17*t/200+1):1},_precision:function(){var e=this._precisionOf(this.options.step);return null!==this.options.min&&(e=Math.max(e,this._precisionOf(this.options.min))),e},_precisionOf:function(e){var t=""+e,i=t.indexOf(".");return-1===i?0:t.length-i-1},_adjustValue:function(e){var t,i,s=this.options;return t=null!==s.min?s.min:0,i=e-t,i=Math.round(i/s.step)*s.step,e=t+i,e=parseFloat(e.toFixed(this._precision())),null!==s.max&&e>s.max?s.max:null!==s.min&&s.min>e?s.min:e},_stop:function(e){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",e))},_setOption:function(e,t){if("culture"===e||"numberFormat"===e){var i=this._parse(this.element.val());return this.options[e]=t,this.element.val(this._format(i)),void 0}("max"===e||"min"===e||"step"===e)&&"string"==typeof t&&(t=this._parse(t)),"icons"===e&&(this.buttons.first().find(".ui-icon").removeClass(this.options.icons.up).addClass(t.up),this.buttons.last().find(".ui-icon").removeClass(this.options.icons.down).addClass(t.down)),this._super(e,t),"disabled"===e&&(this.widget().toggleClass("ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable"))},_setOptions:h(function(e){this._super(e)}),_parse:function(e){return"string"==typeof e&&""!==e&&(e=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(e,10,this.options.culture):+e),""===e||isNaN(e)?null:e},_format:function(e){return""===e?"":window.Globalize&&this.options.numberFormat?Globalize.format(e,this.options.numberFormat,this.options.culture):e},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var e=this.value();return null===e?!1:e===this._adjustValue(e)},_value:function(e,t){var i;""!==e&&(i=this._parse(e),null!==i&&(t||(i=this._adjustValue(i)),e=this._format(i))),this.element.val(e),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:h(function(e){this._stepUp(e)}),_stepUp:function(e){this._start()&&(this._spin((e||1)*this.options.step),this._stop())},stepDown:h(function(e){this._stepDown(e)}),_stepDown:function(e){this._start()&&(this._spin((e||1)*-this.options.step),this._stop())},pageUp:h(function(e){this._stepUp((e||1)*this.options.page)}),pageDown:h(function(e){this._stepDown((e||1)*this.options.page)}),value:function(e){return arguments.length?(h(this._value).call(this,e),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),e.widget("ui.tabs",{version:"1.11.2",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var e=/#.*$/;return function(t){var i,s;t=t.cloneNode(!1),i=t.href.replace(e,""),s=location.href.replace(e,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return t.hash.length>1&&i===s}}(),_create:function(){var t=this,i=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",i.collapsible),this._processTabs(),i.active=this._initialActive(),e.isArray(i.disabled)&&(i.disabled=e.unique(i.disabled.concat(e.map(this.tabs.filter(".ui-state-disabled"),function(e){return t.tabs.index(e)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):e(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var t=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===t&&(s&&this.tabs.each(function(i,n){return e(n).attr("aria-controls")===s?(t=i,!1):void 0}),null===t&&(t=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===t||-1===t)&&(t=this.tabs.length?0:!1)),t!==!1&&(t=this.tabs.index(this.tabs.eq(t)),-1===t&&(t=i?!1:0)),!i&&t===!1&&this.anchors.length&&(t=0),t},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):e()}},_tabKeydown:function(t){var i=e(this.document[0].activeElement).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(t)){switch(t.keyCode){case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:s++;break;case e.ui.keyCode.UP:case e.ui.keyCode.LEFT:n=!1,s--;break;case e.ui.keyCode.END:s=this.anchors.length-1;break;case e.ui.keyCode.HOME:s=0;break;case e.ui.keyCode.SPACE:return t.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case e.ui.keyCode.ENTER:return t.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}t.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),t.ctrlKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(t){this._handlePageNav(t)||t.ctrlKey&&t.keyCode===e.ui.keyCode.UP&&(t.preventDefault(),this.active.focus())},_handlePageNav:function(t){return t.altKey&&t.keyCode===e.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):t.altKey&&t.keyCode===e.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(t,i){function s(){return t>n&&(t=0),0>t&&(t=n),t}for(var n=this.tabs.length-1;-1!==e.inArray(s(),this.options.disabled);)t=i?t+1:t-1;return t},_focusNextTab:function(e,t){return e=this._findNextTab(e,t),this.tabs.eq(e).focus(),e},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):"disabled"===e?(this._setupDisabled(t),void 0):(this._super(e,t),"collapsible"===e&&(this.element.toggleClass("ui-tabs-collapsible",t),t||this.options.active!==!1||this._activate(0)),"event"===e&&this._setupEvents(t),"heightStyle"===e&&this._setupHeightStyle(t),void 0)},_sanitizeSelector:function(e){return e?e.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var t=this.options,i=this.tablist.children(":has(a[href])");t.disabled=e.map(i.filter(".ui-state-disabled"),function(e){return i.index(e)}),this._processTabs(),t.active!==!1&&this.anchors.length?this.active.length&&!e.contains(this.tablist[0],this.active[0])?this.tabs.length===t.disabled.length?(t.active=!1,this.active=e()):this._activate(this._findNextTab(Math.max(0,t.active-1),!1)):t.active=this.tabs.index(this.active):(t.active=!1,this.active=e()),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var t=this,i=this.tabs,s=this.anchors,n=this.panels;this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist").delegate("> li","mousedown"+this.eventNamespace,function(t){e(this).is(".ui-state-disabled")&&t.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){e(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return e("a",this)[0]
+}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=e(),this.anchors.each(function(i,s){var n,a,o,r=e(s).uniqueId().attr("id"),h=e(s).closest("li"),l=h.attr("aria-controls");t._isLocal(s)?(n=s.hash,o=n.substring(1),a=t.element.find(t._sanitizeSelector(n))):(o=h.attr("aria-controls")||e({}).uniqueId()[0].id,n="#"+o,a=t.element.find(n),a.length||(a=t._createPanel(o),a.insertAfter(t.panels[i-1]||t.tablist)),a.attr("aria-live","polite")),a.length&&(t.panels=t.panels.add(a)),l&&h.data("ui-tabs-aria-controls",l),h.attr({"aria-controls":o,"aria-labelledby":r}),a.attr("aria-labelledby",r)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol,ul").eq(0)},_createPanel:function(t){return e("<div>").attr("id",t).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(t){e.isArray(t)&&(t.length?t.length===this.anchors.length&&(t=!0):t=!1);for(var i,s=0;i=this.tabs[s];s++)t===!0||-1!==e.inArray(s,t)?e(i).addClass("ui-state-disabled").attr("aria-disabled","true"):e(i).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=t},_setupEvents:function(t){var i={};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(e){e.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(t){var i,s=this.element.parent();"fill"===t?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var t=e(this),s=t.css("position");"absolute"!==s&&"fixed"!==s&&(i-=t.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=e(this).outerHeight(!0)}),this.panels.each(function(){e(this).height(Math.max(0,i-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===t&&(i=0,this.panels.each(function(){i=Math.max(i,e(this).height("").height())}).height(i))},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n.closest("li"),o=a[0]===s[0],r=o&&i.collapsible,h=r?e():this._getPanelForTab(a),l=s.length?this._getPanelForTab(s):e(),u={oldTab:s,oldPanel:l,newTab:r?e():a,newPanel:h};t.preventDefault(),a.hasClass("ui-state-disabled")||a.hasClass("ui-tabs-loading")||this.running||o&&!i.collapsible||this._trigger("beforeActivate",t,u)===!1||(i.active=r?!1:this.tabs.index(a),this.active=o?e():a,this.xhr&&this.xhr.abort(),l.length||h.length||e.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(a),t),this._toggle(t,u))},_toggle:function(t,i){function s(){a.running=!1,a._trigger("activate",t,i)}function n(){i.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),o.length&&a.options.show?a._show(o,a.options.show,s):(o.show(),s())}var a=this,o=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),n()}):(i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),o.length&&r.length?i.oldTab.attr("tabIndex",-1):o.length&&this.tabs.filter(function(){return 0===e(this).attr("tabIndex")}).attr("tabIndex",-1),o.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(t){var i,s=this._findActive(t);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return t===!1?e():this.tabs.eq(t)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+e+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tablist.unbind(this.eventNamespace),this.tabs.add(this.panels).each(function(){e.data(this,"ui-tabs-destroy")?e(this).remove():e(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var t=e(this),i=t.data("ui-tabs-aria-controls");i?t.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):t.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(t){var i=this.options.disabled;i!==!1&&(void 0===t?i=!1:(t=this._getIndex(t),i=e.isArray(i)?e.map(i,function(e){return e!==t?e:null}):e.map(this.tabs,function(e,i){return i!==t?i:null})),this._setupDisabled(i))},disable:function(t){var i=this.options.disabled;if(i!==!0){if(void 0===t)i=!0;else{if(t=this._getIndex(t),-1!==e.inArray(t,i))return;i=e.isArray(i)?e.merge([t],i).sort():[t]}this._setupDisabled(i)}},load:function(t,i){t=this._getIndex(t);var s=this,n=this.tabs.eq(t),a=n.find(".ui-tabs-anchor"),o=this._getPanelForTab(n),r={tab:n,panel:o};this._isLocal(a[0])||(this.xhr=e.ajax(this._ajaxSettings(a,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(n.addClass("ui-tabs-loading"),o.attr("aria-busy","true"),this.xhr.success(function(e){setTimeout(function(){o.html(e),s._trigger("load",i,r)},1)}).complete(function(e,t){setTimeout(function(){"abort"===t&&s.panels.stop(!1,!0),n.removeClass("ui-tabs-loading"),o.removeAttr("aria-busy"),e===s.xhr&&delete s.xhr},1)})))},_ajaxSettings:function(t,i,s){var n=this;return{url:t.attr("href"),beforeSend:function(t,a){return n._trigger("beforeLoad",i,e.extend({jqXHR:t,ajaxSettings:a},s))}}},_getPanelForTab:function(t){var i=e(t).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),e.widget("ui.tooltip",{version:"1.11.2",options:{content:function(){var t=e(this).attr("title")||"";return e("<a>").text(t).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_addDescribedBy:function(t,i){var s=(t.attr("aria-describedby")||"").split(/\s+/);s.push(i),t.data("ui-tooltip-id",i).attr("aria-describedby",e.trim(s.join(" ")))},_removeDescribedBy:function(t){var i=t.data("ui-tooltip-id"),s=(t.attr("aria-describedby")||"").split(/\s+/),n=e.inArray(i,s);-1!==n&&s.splice(n,1),t.removeData("ui-tooltip-id"),s=e.trim(s.join(" ")),s?t.attr("aria-describedby",s):t.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable(),this.liveRegion=e("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body)},_setOption:function(t,i){var s=this;return"disabled"===t?(this[i?"_disable":"_enable"](),this.options[t]=i,void 0):(this._super(t,i),"content"===t&&e.each(this.tooltips,function(e,t){s._updateContent(t.element)}),void 0)},_disable:function(){var t=this;e.each(this.tooltips,function(i,s){var n=e.Event("blur");n.target=n.currentTarget=s.element[0],t.close(n,!0)}),this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.is("[title]")&&t.data("ui-tooltip-title",t.attr("title")).removeAttr("title")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.data("ui-tooltip-title")&&t.attr("title",t.data("ui-tooltip-title"))})},open:function(t){var i=this,s=e(t?t.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),t&&"mouseover"===t.type&&s.parents().each(function(){var t,s=e(this);s.data("ui-tooltip-open")&&(t=e.Event("blur"),t.target=t.currentTarget=this,i.close(t,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._updateContent(s,t))},_updateContent:function(e,t){var i,s=this.options.content,n=this,a=t?t.type:null;return"string"==typeof s?this._open(t,e,s):(i=s.call(e[0],function(i){e.data("ui-tooltip-open")&&n._delay(function(){t&&(t.type=a),this._open(t,e,i)})}),i&&this._open(t,e,i),void 0)},_open:function(t,i,s){function n(e){u.of=e,o.is(":hidden")||o.position(u)}var a,o,r,h,l,u=e.extend({},this.options.position);if(s){if(a=this._find(i))return a.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(t&&"mouseover"===t.type?i.attr("title",""):i.removeAttr("title")),a=this._tooltip(i),o=a.tooltip,this._addDescribedBy(i,o.attr("id")),o.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),s.clone?(l=s.clone(),l.removeAttr("id").find("[id]").removeAttr("id")):l=s,e("<div>").html(l).appendTo(this.liveRegion),this.options.track&&t&&/^mouse/.test(t.type)?(this._on(this.document,{mousemove:n}),n(t)):o.position(e.extend({of:i},this.options.position)),o.hide(),this._show(o,this.options.show),this.options.show&&this.options.show.delay&&(h=this.delayedShow=setInterval(function(){o.is(":visible")&&(n(u.of),clearInterval(h))},e.fx.interval)),this._trigger("open",t,{tooltip:o}),r={keyup:function(t){if(t.keyCode===e.ui.keyCode.ESCAPE){var s=e.Event(t);s.currentTarget=i[0],this.close(s,!0)}}},i[0]!==this.element[0]&&(r.remove=function(){this._removeTooltip(o)}),t&&"mouseover"!==t.type||(r.mouseleave="close"),t&&"focusin"!==t.type||(r.focusout="close"),this._on(!0,i,r)}},close:function(t){var i,s=this,n=e(t?t.currentTarget:this.element),a=this._find(n);a&&(i=a.tooltip,a.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),a.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(e(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),t&&"mouseleave"===t.type&&e.each(this.parents,function(t,i){e(i.element).attr("title",i.title),delete s.parents[t]}),a.closing=!0,this._trigger("close",t,{tooltip:i}),a.hiding||(a.closing=!1)))},_tooltip:function(t){var i=e("<div>").attr("role","tooltip").addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||"")),s=i.uniqueId().attr("id");return e("<div>").addClass("ui-tooltip-content").appendTo(i),i.appendTo(this.document[0].body),this.tooltips[s]={element:t,tooltip:i}},_find:function(e){var t=e.data("ui-tooltip-id");return t?this.tooltips[t]:null},_removeTooltip:function(e){e.remove(),delete this.tooltips[e.attr("id")]},_destroy:function(){var t=this;e.each(this.tooltips,function(i,s){var n=e.Event("blur"),a=s.element;n.target=n.currentTarget=a[0],t.close(n,!0),e("#"+i).remove(),a.data("ui-tooltip-title")&&(a.attr("title")||a.attr("title",a.data("ui-tooltip-title")),a.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}})});
\ No newline at end of file
diff --git a/ext/autocomplete/lib/jquery-ui.theme.min.css b/ext/autocomplete/lib/jquery-ui.theme.min.css
new file mode 100644
index 000000000..1b9f9bfa5
--- /dev/null
+++ b/ext/autocomplete/lib/jquery-ui.theme.min.css
@@ -0,0 +1,5 @@
+/*! jQuery UI - v1.11.2 - 2015-01-31
+* http://jqueryui.com
+* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-widget{font-family:Helvetica,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Helvetica,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #ddd;background:#fff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;color:#444}.ui-widget-content a{color:#444}.ui-widget-header{border:1px solid #ddd;background:#ddd url("images/ui-bg_highlight-soft_50_dddddd_1x100.png") 50% 50% repeat-x;color:#444;font-weight:bold}.ui-widget-header a{color:#444}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #ddd;background:#f6f6f6 url("images/ui-bg_highlight-soft_100_f6f6f6_1x100.png") 50% 50% repeat-x;font-weight:bold;color:#0073ea}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#0073ea;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #0073ea;background:#0073ea url("images/ui-bg_highlight-soft_25_0073ea_1x100.png") 50% 50% repeat-x;font-weight:bold;color:#fff}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#fff;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #ddd;background:#fff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;font-weight:bold;color:#ff0084}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#ff0084;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #ccc;background:#fff url("images/ui-bg_flat_55_ffffff_40x100.png") 50% 50% repeat-x;color:#444}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#444}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #ff0084;background:#fff url("images/ui-bg_flat_55_ffffff_40x100.png") 50% 50% repeat-x;color:#222}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#222}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#222}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_ff0084_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_0073ea_256x240.png")}.ui-state-default .ui-icon{background-image:url("images/ui-icons_666666_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url("images/ui-icons_ffffff_256x240.png")}.ui-state-active .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-highlight .ui-icon{background-image:url("images/ui-icons_0073ea_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_ff0084_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:2px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:2px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:2px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:2px}.ui-widget-overlay{background:#eee url("images/ui-bg_flat_0_eeeeee_40x100.png") 50% 50% repeat-x;opacity:.8;filter:Alpha(Opacity=80)}.ui-widget-shadow{margin:-4px 0 0 -4px;padding:4px;background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;opacity:.6;filter:Alpha(Opacity=60);border-radius:0}
\ No newline at end of file
diff --git a/ext/autocomplete/lib/jquery.tagit.css b/ext/autocomplete/lib/jquery.tagit.css
new file mode 100644
index 000000000..f18650d91
--- /dev/null
+++ b/ext/autocomplete/lib/jquery.tagit.css
@@ -0,0 +1,69 @@
+ul.tagit {
+    padding: 1px 5px;
+    overflow: auto;
+    margin-left: inherit; /* usually we don't want the regular ul margins. */
+    margin-right: inherit;
+}
+ul.tagit li {
+    display: block;
+    float: left;
+    margin: 2px 5px 2px 0;
+}
+ul.tagit li.tagit-choice {    
+    position: relative;
+    line-height: inherit;
+}
+input.tagit-hidden-field {
+    display: none;
+}
+ul.tagit li.tagit-choice-read-only { 
+    padding: .2em .5em .2em .5em; 
+} 
+
+ul.tagit li.tagit-choice-editable { 
+    padding: .2em 18px .2em .5em; 
+} 
+
+ul.tagit li.tagit-new {
+    padding: .25em 4px .25em 0;
+}
+
+ul.tagit li.tagit-choice a.tagit-label {
+    cursor: pointer;
+    text-decoration: none;
+}
+ul.tagit li.tagit-choice .tagit-close {
+    cursor: pointer;
+    position: absolute;
+    right: .1em;
+    top: 50%;
+    margin-top: -8px;
+    line-height: 17px;
+}
+
+/* used for some custom themes that don't need image icons */
+ul.tagit li.tagit-choice .tagit-close .text-icon {
+    display: none;
+}
+
+ul.tagit li.tagit-choice input {
+    display: block;
+    float: left;
+    margin: 2px 5px 2px 0;
+}
+ul.tagit input[type="text"] {
+    -moz-box-sizing:    border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing:         border-box;
+
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+
+    border: none;
+    margin: 0;
+    padding: 0;
+    width: inherit;
+    background-color: inherit;
+    outline: none;
+}
diff --git a/ext/autocomplete/lib/tag-it.min.js b/ext/autocomplete/lib/tag-it.min.js
new file mode 100644
index 000000000..5c5b12798
--- /dev/null
+++ b/ext/autocomplete/lib/tag-it.min.js
@@ -0,0 +1,17 @@
+;(function(b){b.widget("ui.tagit",{options:{allowDuplicates:!1,caseSensitive:!0,fieldName:"tags",placeholderText:null,readOnly:!1,removeConfirmation:!1,tagLimit:null,availableTags:[],autocomplete:{},showAutocompleteOnFocus:!1,allowSpaces:!1,singleField:!1,singleFieldDelimiter:",",singleFieldNode:null,animate:!0,tabIndex:null,beforeTagAdded:null,afterTagAdded:null,beforeTagRemoved:null,afterTagRemoved:null,onTagClicked:null,onTagLimitExceeded:null,onTagAdded:null,onTagRemoved:null,tagSource:null},_create:function(){var a=
+this;this.element.is("input")?(this.tagList=b("<ul></ul>").insertAfter(this.element),this.options.singleField=!0,this.options.singleFieldNode=this.element,this.element.addClass("tagit-hidden-field")):this.tagList=this.element.find("ul, ol").andSelf().last();this.tagInput=b('<input type="text" />').addClass("ui-widget-content");this.options.readOnly&&this.tagInput.attr("disabled","disabled");this.options.tabIndex&&this.tagInput.attr("tabindex",this.options.tabIndex);this.options.placeholderText&&this.tagInput.attr("placeholder",
+this.options.placeholderText);this.options.autocomplete.source||(this.options.autocomplete.source=function(a,e){var d=a.term.toLowerCase(),c=b.grep(this.options.availableTags,function(a){return 0===a.toLowerCase().indexOf(d)});this.options.allowDuplicates||(c=this._subtractArray(c,this.assignedTags()));e(c)});this.options.showAutocompleteOnFocus&&(this.tagInput.focus(function(b,d){a._showAutocomplete()}),"undefined"===typeof this.options.autocomplete.minLength&&(this.options.autocomplete.minLength=
+0));b.isFunction(this.options.autocomplete.source)&&(this.options.autocomplete.source=b.proxy(this.options.autocomplete.source,this));b.isFunction(this.options.tagSource)&&(this.options.tagSource=b.proxy(this.options.tagSource,this));this.tagList.addClass("tagit").addClass("ui-widget ui-widget-content ui-corner-all").append(b('<li class="tagit-new"></li>').append(this.tagInput)).click(function(d){var c=b(d.target);c.hasClass("tagit-label")?(c=c.closest(".tagit-choice"),c.hasClass("removed")||a._trigger("onTagClicked",
+d,{tag:c,tagLabel:a.tagLabel(c)})):a.tagInput.focus()});var c=!1;if(this.options.singleField)if(this.options.singleFieldNode){var d=b(this.options.singleFieldNode),f=d.val().split(this.options.singleFieldDelimiter);d.val("");b.each(f,function(b,d){a.createTag(d,null,!0);c=!0})}else this.options.singleFieldNode=b('<input type="hidden" style="display:none;" value="" name="'+this.options.fieldName+'" />'),this.tagList.after(this.options.singleFieldNode);c||this.tagList.children("li").each(function(){b(this).hasClass("tagit-new")||
+(a.createTag(b(this).text(),b(this).attr("class"),!0),b(this).remove())});this.tagInput.keydown(function(c){if(c.which==b.ui.keyCode.BACKSPACE&&""===a.tagInput.val()){var d=a._lastTag();!a.options.removeConfirmation||d.hasClass("remove")?a.removeTag(d):a.options.removeConfirmation&&d.addClass("remove ui-state-highlight")}else a.options.removeConfirmation&&a._lastTag().removeClass("remove ui-state-highlight");if(c.which===b.ui.keyCode.COMMA&&!1===c.shiftKey||c.which===b.ui.keyCode.ENTER||c.which==
+b.ui.keyCode.TAB&&""!==a.tagInput.val()||c.which==b.ui.keyCode.SPACE&&!0!==a.options.allowSpaces&&('"'!=b.trim(a.tagInput.val()).replace(/^s*/,"").charAt(0)||'"'==b.trim(a.tagInput.val()).charAt(0)&&'"'==b.trim(a.tagInput.val()).charAt(b.trim(a.tagInput.val()).length-1)&&0!==b.trim(a.tagInput.val()).length-1))c.which===b.ui.keyCode.ENTER&&""===a.tagInput.val()||c.preventDefault(),a.options.autocomplete.autoFocus&&a.tagInput.data("autocomplete-open")||(a.tagInput.autocomplete("close"),a.createTag(a._cleanedInput()))}).blur(function(b){a.tagInput.data("autocomplete-open")||
+a.createTag(a._cleanedInput())});if(this.options.availableTags||this.options.tagSource||this.options.autocomplete.source)d={select:function(b,c){a.createTag(c.item.value);return!1}},b.extend(d,this.options.autocomplete),d.source=this.options.tagSource||d.source,this.tagInput.autocomplete(d).bind("autocompleteopen.tagit",function(b,c){a.tagInput.data("autocomplete-open",!0)}).bind("autocompleteclose.tagit",function(b,c){a.tagInput.data("autocomplete-open",!1)}),this.tagInput.autocomplete("widget").addClass("tagit-autocomplete")},
+destroy:function(){b.Widget.prototype.destroy.call(this);this.element.unbind(".tagit");this.tagList.unbind(".tagit");this.tagInput.removeData("autocomplete-open");this.tagList.removeClass("tagit ui-widget ui-widget-content ui-corner-all tagit-hidden-field");this.element.is("input")?(this.element.removeClass("tagit-hidden-field"),this.tagList.remove()):(this.element.children("li").each(function(){b(this).hasClass("tagit-new")?b(this).remove():(b(this).removeClass("tagit-choice ui-widget-content ui-state-default ui-state-highlight ui-corner-all remove tagit-choice-editable tagit-choice-read-only"),
+b(this).text(b(this).children(".tagit-label").text()))}),this.singleFieldNode&&this.singleFieldNode.remove());return this},_cleanedInput:function(){return b.trim(this.tagInput.val().replace(/^"(.*)"$/,"$1"))},_lastTag:function(){return this.tagList.find(".tagit-choice:last:not(.removed)")},_tags:function(){return this.tagList.find(".tagit-choice:not(.removed)")},assignedTags:function(){var a=this,c=[];this.options.singleField?(c=b(this.options.singleFieldNode).val().split(this.options.singleFieldDelimiter),
+""===c[0]&&(c=[])):this._tags().each(function(){c.push(a.tagLabel(this))});return c},_updateSingleTagsField:function(a){b(this.options.singleFieldNode).val(a.join(this.options.singleFieldDelimiter)).trigger("change")},_subtractArray:function(a,c){for(var d=[],f=0;f<a.length;f++)-1==b.inArray(a[f],c)&&d.push(a[f]);return d},tagLabel:function(a){return this.options.singleField?b(a).find(".tagit-label:first").text():b(a).find("input:first").val()},_showAutocomplete:function(){this.tagInput.autocomplete("search",
+"")},_findTagByLabel:function(a){var c=this,d=null;this._tags().each(function(f){if(c._formatStr(a)==c._formatStr(c.tagLabel(this)))return d=b(this),!1});return d},_isNew:function(a){return!this._findTagByLabel(a)},_formatStr:function(a){return this.options.caseSensitive?a:b.trim(a.toLowerCase())},_effectExists:function(a){return Boolean(b.effects&&(b.effects[a]||b.effects.effect&&b.effects.effect[a]))},createTag:function(a,c,d){var f=this;a=b.trim(a);this.options.preprocessTag&&(a=this.options.preprocessTag(a));
+if(""===a)return!1;if(!this.options.allowDuplicates&&!this._isNew(a))return a=this._findTagByLabel(a),!1!==this._trigger("onTagExists",null,{existingTag:a,duringInitialization:d})&&this._effectExists("highlight")&&a.effect("highlight"),!1;if(this.options.tagLimit&&this._tags().length>=this.options.tagLimit)return this._trigger("onTagLimitExceeded",null,{duringInitialization:d}),!1;var g=b(this.options.onTagClicked?'<a class="tagit-label"></a>':'<span class="tagit-label"></span>').text(a),e=b("<li></li>").addClass("tagit-choice ui-widget-content ui-state-default ui-corner-all").addClass(c).append(g);
+this.options.readOnly?e.addClass("tagit-choice-read-only"):(e.addClass("tagit-choice-editable"),c=b("<span></span>").addClass("ui-icon ui-icon-close"),c=b('<a><span class="text-icon">\u00d7</span></a>').addClass("tagit-close").append(c).click(function(a){f.removeTag(e)}),e.append(c));this.options.singleField||(g=g.html(),e.append('<input type="hidden" value="'+g+'" name="'+this.options.fieldName+'" class="tagit-hidden-field" />'));!1!==this._trigger("beforeTagAdded",null,{tag:e,tagLabel:this.tagLabel(e),
+duringInitialization:d})&&(this.options.singleField&&(g=this.assignedTags(),g.push(a),this._updateSingleTagsField(g)),this._trigger("onTagAdded",null,e),this.tagInput.val(""),this.tagInput.parent().before(e),this._trigger("afterTagAdded",null,{tag:e,tagLabel:this.tagLabel(e),duringInitialization:d}),this.options.showAutocompleteOnFocus&&!d&&setTimeout(function(){f._showAutocomplete()},0))},removeTag:function(a,c){c="undefined"===typeof c?this.options.animate:c;a=b(a);this._trigger("onTagRemoved",
+null,a);if(!1!==this._trigger("beforeTagRemoved",null,{tag:a,tagLabel:this.tagLabel(a)})){if(this.options.singleField){var d=this.assignedTags(),f=this.tagLabel(a),d=b.grep(d,function(a){return a!=f});this._updateSingleTagsField(d)}if(c){a.addClass("removed");var d=this._effectExists("blind")?["blind",{direction:"horizontal"},"fast"]:["fast"],g=this;d.push(function(){a.remove();g._trigger("afterTagRemoved",null,{tag:a,tagLabel:g.tagLabel(a)})});a.fadeOut("fast").hide.apply(a,d).dequeue()}else a.remove(),
+this._trigger("afterTagRemoved",null,{tag:a,tagLabel:this.tagLabel(a)})}},removeTagByLabel:function(a,b){var d=this._findTagByLabel(a);if(!d)throw"No such tag exists with the name '"+a+"'";this.removeTag(d,b)},removeAll:function(){var a=this;this._tags().each(function(b,d){a.removeTag(d,!1)})}})})(jQuery);
diff --git a/ext/autocomplete/lib/tagit.ui-zendesk.css b/ext/autocomplete/lib/tagit.ui-zendesk.css
new file mode 100644
index 000000000..b91181bf3
--- /dev/null
+++ b/ext/autocomplete/lib/tagit.ui-zendesk.css
@@ -0,0 +1,98 @@
+
+/* Optional scoped theme for tag-it which mimics the zendesk widget. */
+
+
+ul.tagit {
+    border-style: solid;
+    border-width: 1px;
+    border-color: #C6C6C6;
+    background: inherit;
+}
+ul.tagit li.tagit-choice {
+    -moz-border-radius: 6px;
+    border-radius: 6px;
+    -webkit-border-radius: 6px;
+    border: 1px solid #CAD8F3;
+
+    background: none;
+    background-color: #DEE7F8;
+
+    font-weight: normal;
+}
+ul.tagit li.tagit-choice .tagit-label:not(a) {
+    color: #555;
+}
+ul.tagit li.tagit-choice a.tagit-close {
+    text-decoration: none;
+}
+ul.tagit li.tagit-choice .tagit-close {
+    right: .4em;
+}
+ul.tagit li.tagit-choice .ui-icon {
+    display: none;
+}
+ul.tagit li.tagit-choice .tagit-close .text-icon {
+    display: inline;
+    font-family: arial, sans-serif;
+    font-size: 16px;
+    line-height: 16px;
+    color: #777;
+}
+ul.tagit li.tagit-choice:hover, ul.tagit li.tagit-choice.remove {
+    background-color: #bbcef1;
+    border-color: #6d95e0;
+}
+ul.tagit li.tagit-choice a.tagLabel:hover,
+ul.tagit li.tagit-choice a.tagit-close .text-icon:hover {
+    color: #222;
+}
+ul.tagit input[type="text"] {
+    color: #333333;
+    background: none;
+}
+.ui-widget {
+    font-size: 1.1em;
+}
+
+/* Forked from a jQuery UI theme, so that we don't require the jQuery UI CSS as a dependency. */
+.tagit-autocomplete.ui-autocomplete { position: absolute; cursor: default; }
+* html .tagit-autocomplete.ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+.tagit-autocomplete.ui-menu {
+    list-style:none;
+    padding: 2px;
+    margin: 0;
+    display:block;
+    float: left;
+}
+.tagit-autocomplete.ui-menu .ui-menu {
+    margin-top: -3px;
+}
+.tagit-autocomplete.ui-menu .ui-menu-item {
+    margin:0;
+    padding: 0;
+    zoom: 1;
+    float: left;
+    clear: left;
+    width: 100%;
+}
+.tagit-autocomplete.ui-menu .ui-menu-item a {
+    text-decoration:none;
+    display:block;
+    padding:.2em .4em;
+    line-height:1.5;
+    zoom:1;
+}
+.tagit-autocomplete .ui-menu .ui-menu-item a.ui-state-hover,
+.tagit-autocomplete .ui-menu .ui-menu-item a.ui-state-active {
+    font-weight: normal;
+    margin: -1px;
+}
+.tagit-autocomplete.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff 50% 50% repeat-x; color: #222222; }
+.tagit-autocomplete.ui-corner-all, .tagit-autocomplete .ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; -khtml-border-radius: 4px; border-radius: 4px; }
+.tagit-autocomplete .ui-state-hover, .tagit-autocomplete .ui-state-focus { border: 1px solid #999999; background: #dadada; font-weight: normal; color: #212121; }
+.tagit-autocomplete .ui-state-active  { border: 1px solid #aaaaaa; }
+
+.tagit-autocomplete .ui-widget-content { border: 1px solid #aaaaaa; }
+.tagit .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px,1px,1px,1px); }
+
+
diff --git a/ext/autocomplete/main.php b/ext/autocomplete/main.php
new file mode 100644
index 000000000..cd373c63b
--- /dev/null
+++ b/ext/autocomplete/main.php
@@ -0,0 +1,33 @@
+<?php
+/*
+ * Name: Autocomplete
+ * Author: Daku <admin@codeanimu.net>
+ * Description: Adds autocomplete to search & tagging.
+ */
+
+class AutoComplete extends Extension {
+	public function onPageRequest(PageRequestEvent $event) {
+		global $page, $database;
+
+		if($event->page_matches("api/internal/autocomplete")) {
+			if(!isset($_GET["s"])) return;
+
+			//$limit = 0;
+			$limitSQL = "";
+			$SQLarr = array("search"=>$_GET["s"]."%");
+			if(isset($_GET["limit"]) && $_GET["limit"] !== 0){
+				$limitSQL = "LIMIT :limit";
+				$SQLarr['limit'] = $_GET["limit"];
+			}
+
+			$res = $database->get_col(
+					"SELECT tag FROM tags WHERE tag LIKE :search AND count > 0 $limitSQL", $SQLarr);
+
+			$page->set_mode("data");
+			$page->set_type("application/json");
+			$page->set_data(json_encode($res));
+		}
+
+		$this->theme->build_autocomplete($page);
+	}
+}
diff --git a/ext/autocomplete/style.css b/ext/autocomplete/style.css
new file mode 100644
index 000000000..582af0023
--- /dev/null
+++ b/ext/autocomplete/style.css
@@ -0,0 +1,8 @@
+#Navigationleft .blockbody { overflow: visible; }
+
+.tagit { background: white !important; border: 1px solid grey !important; cursor: text; }
+.tagit-choice { cursor: initial; }
+input[name=search] ~ input[type=submit] { display: block !important; }
+
+.tag-negative { background: #ff8080 !important; }
+.tag-positive { background: #40bf40 !important; }
\ No newline at end of file
diff --git a/ext/autocomplete/theme.php b/ext/autocomplete/theme.php
new file mode 100644
index 000000000..88cec8106
--- /dev/null
+++ b/ext/autocomplete/theme.php
@@ -0,0 +1,29 @@
+<?php
+
+class AutoCompleteTheme extends Themelet {
+	public function build_autocomplete(Page $page) {
+		$base_href = get_base_href();
+		// TODO: AJAX test and fallback.
+
+		$page->add_html_header("<script src='$base_href/ext/autocomplete/lib/jquery-ui.min.js' type='text/javascript'></script>");
+		$page->add_html_header("<script src='$base_href/ext/autocomplete/lib/tag-it.min.js' type='text/javascript'></script>");
+		$page->add_html_header('<link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1/themes/flick/jquery-ui.css">');
+		$page->add_html_header("<link rel='stylesheet' type='text/css' href='$base_href/ext/autocomplete/lib/jquery.tagit.css' />");
+
+		$page->add_html_header("<script>
+			$(function(){
+				$('[name=search]').tagit({
+					singleFieldDelimiter: ' ',
+					beforeTagAdded: function(event, ui) {
+						// give special class to negative tags
+						if(ui.tagLabel[0] === '-') {
+							ui.tag.addClass('tag-negative');
+						}else{
+							ui.tag.addClass('tag-positive');
+						}
+					}
+				});
+			});
+		</script>");
+	}
+}

From f17812c64b39a6dbbad4c7b3b68d3c067c530a0b Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 1 Feb 2015 01:34:49 +0000
Subject: [PATCH 063/250] working autocomplete

---
 ext/autocomplete/lib/tag-it.min.js |  3 ++-
 ext/autocomplete/theme.php         | 38 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/ext/autocomplete/lib/tag-it.min.js b/ext/autocomplete/lib/tag-it.min.js
index 5c5b12798..af48aee1a 100644
--- a/ext/autocomplete/lib/tag-it.min.js
+++ b/ext/autocomplete/lib/tag-it.min.js
@@ -1,10 +1,11 @@
+//Removed TAB keybind
 ;(function(b){b.widget("ui.tagit",{options:{allowDuplicates:!1,caseSensitive:!0,fieldName:"tags",placeholderText:null,readOnly:!1,removeConfirmation:!1,tagLimit:null,availableTags:[],autocomplete:{},showAutocompleteOnFocus:!1,allowSpaces:!1,singleField:!1,singleFieldDelimiter:",",singleFieldNode:null,animate:!0,tabIndex:null,beforeTagAdded:null,afterTagAdded:null,beforeTagRemoved:null,afterTagRemoved:null,onTagClicked:null,onTagLimitExceeded:null,onTagAdded:null,onTagRemoved:null,tagSource:null},_create:function(){var a=
 this;this.element.is("input")?(this.tagList=b("<ul></ul>").insertAfter(this.element),this.options.singleField=!0,this.options.singleFieldNode=this.element,this.element.addClass("tagit-hidden-field")):this.tagList=this.element.find("ul, ol").andSelf().last();this.tagInput=b('<input type="text" />').addClass("ui-widget-content");this.options.readOnly&&this.tagInput.attr("disabled","disabled");this.options.tabIndex&&this.tagInput.attr("tabindex",this.options.tabIndex);this.options.placeholderText&&this.tagInput.attr("placeholder",
 this.options.placeholderText);this.options.autocomplete.source||(this.options.autocomplete.source=function(a,e){var d=a.term.toLowerCase(),c=b.grep(this.options.availableTags,function(a){return 0===a.toLowerCase().indexOf(d)});this.options.allowDuplicates||(c=this._subtractArray(c,this.assignedTags()));e(c)});this.options.showAutocompleteOnFocus&&(this.tagInput.focus(function(b,d){a._showAutocomplete()}),"undefined"===typeof this.options.autocomplete.minLength&&(this.options.autocomplete.minLength=
 0));b.isFunction(this.options.autocomplete.source)&&(this.options.autocomplete.source=b.proxy(this.options.autocomplete.source,this));b.isFunction(this.options.tagSource)&&(this.options.tagSource=b.proxy(this.options.tagSource,this));this.tagList.addClass("tagit").addClass("ui-widget ui-widget-content ui-corner-all").append(b('<li class="tagit-new"></li>').append(this.tagInput)).click(function(d){var c=b(d.target);c.hasClass("tagit-label")?(c=c.closest(".tagit-choice"),c.hasClass("removed")||a._trigger("onTagClicked",
 d,{tag:c,tagLabel:a.tagLabel(c)})):a.tagInput.focus()});var c=!1;if(this.options.singleField)if(this.options.singleFieldNode){var d=b(this.options.singleFieldNode),f=d.val().split(this.options.singleFieldDelimiter);d.val("");b.each(f,function(b,d){a.createTag(d,null,!0);c=!0})}else this.options.singleFieldNode=b('<input type="hidden" style="display:none;" value="" name="'+this.options.fieldName+'" />'),this.tagList.after(this.options.singleFieldNode);c||this.tagList.children("li").each(function(){b(this).hasClass("tagit-new")||
 (a.createTag(b(this).text(),b(this).attr("class"),!0),b(this).remove())});this.tagInput.keydown(function(c){if(c.which==b.ui.keyCode.BACKSPACE&&""===a.tagInput.val()){var d=a._lastTag();!a.options.removeConfirmation||d.hasClass("remove")?a.removeTag(d):a.options.removeConfirmation&&d.addClass("remove ui-state-highlight")}else a.options.removeConfirmation&&a._lastTag().removeClass("remove ui-state-highlight");if(c.which===b.ui.keyCode.COMMA&&!1===c.shiftKey||c.which===b.ui.keyCode.ENTER||c.which==
-b.ui.keyCode.TAB&&""!==a.tagInput.val()||c.which==b.ui.keyCode.SPACE&&!0!==a.options.allowSpaces&&('"'!=b.trim(a.tagInput.val()).replace(/^s*/,"").charAt(0)||'"'==b.trim(a.tagInput.val()).charAt(0)&&'"'==b.trim(a.tagInput.val()).charAt(b.trim(a.tagInput.val()).length-1)&&0!==b.trim(a.tagInput.val()).length-1))c.which===b.ui.keyCode.ENTER&&""===a.tagInput.val()||c.preventDefault(),a.options.autocomplete.autoFocus&&a.tagInput.data("autocomplete-open")||(a.tagInput.autocomplete("close"),a.createTag(a._cleanedInput()))}).blur(function(b){a.tagInput.data("autocomplete-open")||
+c.which==b.ui.keyCode.SPACE&&!0!==a.options.allowSpaces&&('"'!=b.trim(a.tagInput.val()).replace(/^s*/,"").charAt(0)||'"'==b.trim(a.tagInput.val()).charAt(0)&&'"'==b.trim(a.tagInput.val()).charAt(b.trim(a.tagInput.val()).length-1)&&0!==b.trim(a.tagInput.val()).length-1))c.which===b.ui.keyCode.ENTER&&""===a.tagInput.val()||c.preventDefault(),a.options.autocomplete.autoFocus&&a.tagInput.data("autocomplete-open")||(a.tagInput.autocomplete("close"),a.createTag(a._cleanedInput()))}).blur(function(b){a.tagInput.data("autocomplete-open")||
 a.createTag(a._cleanedInput())});if(this.options.availableTags||this.options.tagSource||this.options.autocomplete.source)d={select:function(b,c){a.createTag(c.item.value);return!1}},b.extend(d,this.options.autocomplete),d.source=this.options.tagSource||d.source,this.tagInput.autocomplete(d).bind("autocompleteopen.tagit",function(b,c){a.tagInput.data("autocomplete-open",!0)}).bind("autocompleteclose.tagit",function(b,c){a.tagInput.data("autocomplete-open",!1)}),this.tagInput.autocomplete("widget").addClass("tagit-autocomplete")},
 destroy:function(){b.Widget.prototype.destroy.call(this);this.element.unbind(".tagit");this.tagList.unbind(".tagit");this.tagInput.removeData("autocomplete-open");this.tagList.removeClass("tagit ui-widget ui-widget-content ui-corner-all tagit-hidden-field");this.element.is("input")?(this.element.removeClass("tagit-hidden-field"),this.tagList.remove()):(this.element.children("li").each(function(){b(this).hasClass("tagit-new")?b(this).remove():(b(this).removeClass("tagit-choice ui-widget-content ui-state-default ui-state-highlight ui-corner-all remove tagit-choice-editable tagit-choice-read-only"),
 b(this).text(b(this).children(".tagit-label").text()))}),this.singleFieldNode&&this.singleFieldNode.remove());return this},_cleanedInput:function(){return b.trim(this.tagInput.val().replace(/^"(.*)"$/,"$1"))},_lastTag:function(){return this.tagList.find(".tagit-choice:last:not(.removed)")},_tags:function(){return this.tagList.find(".tagit-choice:not(.removed)")},assignedTags:function(){var a=this,c=[];this.options.singleField?(c=b(this.options.singleFieldNode).val().split(this.options.singleFieldDelimiter),
diff --git a/ext/autocomplete/theme.php b/ext/autocomplete/theme.php
index 88cec8106..e99935bfc 100644
--- a/ext/autocomplete/theme.php
+++ b/ext/autocomplete/theme.php
@@ -21,6 +21,44 @@ public function build_autocomplete(Page $page) {
 						}else{
 							ui.tag.addClass('tag-positive');
 						}
+					},
+					autocomplete : ({
+						source: function (request, response) {
+							var isNegative = (request.term[0] === '-');
+							$.ajax({
+								url: base_href + '/api/internal/autocomplete',
+								data: {'s': (isNegative ? request.term.substring(1) : request.term)},
+								dataType : 'json',
+								type : 'GET',
+								success : function (data) {
+									response($.map(data, function (item) {
+										item = (isNegative ? '-'+item : item);
+										return {
+											label : item,
+											value : item
+										}
+									}));
+								},
+								error : function (request, status, error) {
+									alert(error);
+								}
+							});
+						},
+						minLength: 1
+					})
+				});
+
+				$('.ui-autocomplete-input').keydown(function(e) {
+					var keyCode = e.keyCode || e.which;
+
+					if (keyCode == 9) {
+						e.preventDefault();
+
+						var tag = $('.tagit-autocomplete:not([style*=\"display: none\"]) > li:first').text();
+						if(tag){
+							$('[name=search]').tagit('createTag', tag);
+							$('.ui-autocomplete-input').autocomplete('close');
+						}
 					}
 				});
 			});

From ef898394f006cecb02e77274578092eee337bb39 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Wed, 11 May 2016 22:16:28 +0100
Subject: [PATCH 064/250] autocomplete has moved to ext

---
 lib/jquery.autocomplete-2.4.4.min.css |  7 -------
 lib/jquery.autocomplete-2.4.4.min.js  |  9 ---------
 lib/shimmie.js                        | 19 -------------------
 3 files changed, 35 deletions(-)
 delete mode 100644 lib/jquery.autocomplete-2.4.4.min.css
 delete mode 100644 lib/jquery.autocomplete-2.4.4.min.js

diff --git a/lib/jquery.autocomplete-2.4.4.min.css b/lib/jquery.autocomplete-2.4.4.min.css
deleted file mode 100644
index fe1b98b39..000000000
--- a/lib/jquery.autocomplete-2.4.4.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * @fileOverview CSS for jquery-autocomplete, the jQuery Autocompleter
- * @author <a href="mailto:dylan@dyve.net">Dylan Verheul</a>
- * @license MIT | GPL | Apache 2.0, see LICENSE.txt
- * @see https://github.com/dyve/jquery-autocomplete
- */
-.acResults{padding:0;border:1px solid WindowFrame;background-color:Window;overflow:hidden}.acResults ul{margin:0;padding:0;list-style-position:outside;list-style:none}.acResults ul li{margin:0;padding:2px 5px;cursor:pointer;display:block;font:menu;font-size:12px;overflow:hidden}.acLoading{background:url(indicator.gif) right center no-repeat}.acSelect{background-color:Highlight;color:HighlightText}
diff --git a/lib/jquery.autocomplete-2.4.4.min.js b/lib/jquery.autocomplete-2.4.4.min.js
deleted file mode 100644
index d474a98b3..000000000
--- a/lib/jquery.autocomplete-2.4.4.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @fileOverview jquery-autocomplete, the jQuery Autocompleter
- * @author <a href="mailto:dylan@dyve.net">Dylan Verheul</a>
- * @version 2.4.4
- * @requires jQuery 1.6+
- * @license MIT | GPL | Apache 2.0, see LICENSE.txt
- * @see https://github.com/dyve/jquery-autocomplete
- */
-(function($){"use strict";$.fn.autocomplete=function(options){var url;if(arguments.length>1){url=options;options=arguments[1];options.url=url}else if(typeof options==="string"){url=options;options={url:url}}var opts=$.extend({},$.fn.autocomplete.defaults,options);return this.each(function(){var $this=$(this);$this.data("autocompleter",new $.Autocompleter($this,$.meta?$.extend({},opts,$this.data()):opts))})};$.fn.autocomplete.defaults={inputClass:"acInput",loadingClass:"acLoading",resultsClass:"acResults",selectClass:"acSelect",queryParamName:"q",extraParams:{},remoteDataType:false,lineSeparator:"\n",cellSeparator:"|",minChars:2,maxItemsToShow:10,delay:400,useCache:true,maxCacheLength:10,matchSubset:true,matchCase:false,matchInside:true,mustMatch:false,selectFirst:false,selectOnly:false,showResult:null,preventDefaultReturn:1,preventDefaultTab:0,autoFill:false,filterResults:true,filter:true,sortResults:true,sortFunction:null,onItemSelect:null,onNoMatch:null,onFinish:null,matchStringConverter:null,beforeUseConverter:null,autoWidth:"min-width",useDelimiter:false,delimiterChar:",",delimiterKeyCode:188,processData:null,onError:null,enabled:true};var sanitizeResult=function(result){var value,data;var type=typeof result;if(type==="string"){value=result;data={}}else if($.isArray(result)){value=result[0];data=result.slice(1)}else if(type==="object"){value=result.value;data=result.data}value=String(value);if(typeof data!=="object"){data={}}return{value:value,data:data}};var sanitizeInteger=function(value,stdValue,options){var num=parseInt(value,10);options=options||{};if(isNaN(num)||options.min&&num<options.min){num=stdValue}return num};var makeUrlParam=function(name,value){return[name,encodeURIComponent(value)].join("=")};var makeUrl=function(url,params){var urlAppend=[];$.each(params,function(index,value){urlAppend.push(makeUrlParam(index,value))});if(urlAppend.length){url+=url.indexOf("?")===-1?"?":"&";url+=urlAppend.join("&")}return url};var sortValueAlpha=function(a,b,matchCase){a=String(a.value);b=String(b.value);if(!matchCase){a=a.toLowerCase();b=b.toLowerCase()}if(a>b){return 1}if(a<b){return-1}return 0};var plainTextParser=function(text,lineSeparator,cellSeparator){var results=[];var i,j,data,line,value,lines;lines=String(text).replace("\r\n","\n").split(lineSeparator);for(i=0;i<lines.length;i++){line=lines[i].split(cellSeparator);data=[];for(j=0;j<line.length;j++){data.push(decodeURIComponent(line[j]))}value=data.shift();results.push({value:value,data:data})}return results};$.Autocompleter=function($elem,options){if(!$elem||!($elem instanceof $)||$elem.length!==1||$elem.get(0).tagName.toUpperCase()!=="INPUT"){throw new Error("Invalid parameter for jquery.Autocompleter, jQuery object with one element with INPUT tag expected.")}var self=this;this.options=options;this.cacheData_={};this.cacheLength_=0;this.selectClass_="jquery-autocomplete-selected-item";this.keyTimeout_=null;this.finishTimeout_=null;this.lastKeyPressed_=null;this.lastProcessedValue_=null;this.lastSelectedValue_=null;this.active_=false;this.finishOnBlur_=true;this.options.minChars=sanitizeInteger(this.options.minChars,$.fn.autocomplete.defaults.minChars,{min:0});this.options.maxItemsToShow=sanitizeInteger(this.options.maxItemsToShow,$.fn.autocomplete.defaults.maxItemsToShow,{min:0});this.options.maxCacheLength=sanitizeInteger(this.options.maxCacheLength,$.fn.autocomplete.defaults.maxCacheLength,{min:1});this.options.delay=sanitizeInteger(this.options.delay,$.fn.autocomplete.defaults.delay,{min:0});if(this.options.preventDefaultReturn!=2){this.options.preventDefaultReturn=this.options.preventDefaultReturn?1:0}if(this.options.preventDefaultTab!=2){this.options.preventDefaultTab=this.options.preventDefaultTab?1:0}this.dom={};this.dom.$elem=$elem;this.dom.$elem.attr("autocomplete","off").addClass(this.options.inputClass);this.dom.$results=$("<div></div>").hide().addClass(this.options.resultsClass).css({position:"absolute"});$("body").append(this.dom.$results);$elem.keydown(function(e){self.lastKeyPressed_=e.keyCode;switch(self.lastKeyPressed_){case self.options.delimiterKeyCode:if(self.options.useDelimiter&&self.active_){self.selectCurrent()}break;case 35:case 36:case 16:case 17:case 18:case 37:case 39:break;case 38:e.preventDefault();if(self.active_){self.focusPrev()}else{self.activate()}return false;case 40:e.preventDefault();if(self.active_){self.focusNext()}else{self.activate()}return false;case 9:if(self.active_){self.selectCurrent();if(self.options.preventDefaultTab){e.preventDefault();return false}}if(self.options.preventDefaultTab===2){e.preventDefault();return false}break;case 13:if(self.active_){self.selectCurrent();if(self.options.preventDefaultReturn){e.preventDefault();return false}}if(self.options.preventDefaultReturn===2){e.preventDefault();return false}break;case 27:if(self.active_){e.preventDefault();self.deactivate(true);return false}break;default:self.activate()}});$elem.on("paste",function(){self.activate()});var onBlurFunction=function(){self.deactivate(true)};$elem.blur(function(){if(self.finishOnBlur_){self.finishTimeout_=setTimeout(onBlurFunction,200)}});$elem.parents("form").on("submit",onBlurFunction)};$.Autocompleter.prototype.position=function(){var offset=this.dom.$elem.offset();var height=this.dom.$results.outerHeight();var totalHeight=$(window).outerHeight();var inputBottom=offset.top+this.dom.$elem.outerHeight();var bottomIfDown=inputBottom+height;var position={top:inputBottom,left:offset.left};if(bottomIfDown>totalHeight){var topIfUp=offset.top-height;if(topIfUp>=0){position.top=topIfUp}}this.dom.$results.css(position)};$.Autocompleter.prototype.cacheRead=function(filter){var filterLength,searchLength,search,maxPos,pos;if(this.options.useCache){filter=String(filter);filterLength=filter.length;if(this.options.matchSubset){searchLength=1}else{searchLength=filterLength}while(searchLength<=filterLength){if(this.options.matchInside){maxPos=filterLength-searchLength}else{maxPos=0}pos=0;while(pos<=maxPos){search=filter.substr(0,searchLength);if(this.cacheData_[search]!==undefined){return this.cacheData_[search]}pos++}searchLength++}}return false};$.Autocompleter.prototype.cacheWrite=function(filter,data){if(this.options.useCache){if(this.cacheLength_>=this.options.maxCacheLength){this.cacheFlush()}filter=String(filter);if(this.cacheData_[filter]!==undefined){this.cacheLength_++}this.cacheData_[filter]=data;return this.cacheData_[filter]}return false};$.Autocompleter.prototype.cacheFlush=function(){this.cacheData_={};this.cacheLength_=0};$.Autocompleter.prototype.callHook=function(hook,data){var f=this.options[hook];if(f&&$.isFunction(f)){return f(data,this)}return false};$.Autocompleter.prototype.activate=function(){if(!this.options.enabled)return;var self=this;if(this.keyTimeout_){clearTimeout(this.keyTimeout_)}this.keyTimeout_=setTimeout(function(){self.activateNow()},this.options.delay)};$.Autocompleter.prototype.activateNow=function(){var value=this.beforeUseConverter(this.dom.$elem.val());if(value!==this.lastProcessedValue_&&value!==this.lastSelectedValue_){this.fetchData(value)}};$.Autocompleter.prototype.fetchData=function(value){var self=this;var processResults=function(results,filter){if(self.options.processData){results=self.options.processData(results)}self.showResults(self.filterResults(results,filter),filter)};this.lastProcessedValue_=value;if(value.length<this.options.minChars){processResults([],value)}else if(this.options.data){processResults(this.options.data,value)}else{this.fetchRemoteData(value,function(remoteData){processResults(remoteData,value)})}};$.Autocompleter.prototype.fetchRemoteData=function(filter,callback){var data=this.cacheRead(filter);if(data){callback(data)}else{var self=this;var dataType=self.options.remoteDataType==="json"?"json":"text";var ajaxCallback=function(data){var parsed=false;if(data!==false){parsed=self.parseRemoteData(data);self.cacheWrite(filter,parsed)}self.dom.$elem.removeClass(self.options.loadingClass);callback(parsed)};this.dom.$elem.addClass(this.options.loadingClass);$.ajax({url:this.makeUrl(filter),success:ajaxCallback,error:function(jqXHR,textStatus,errorThrown){if($.isFunction(self.options.onError)){self.options.onError(jqXHR,textStatus,errorThrown)}else{ajaxCallback(false)}},dataType:dataType})}};$.Autocompleter.prototype.setExtraParam=function(name,value){var index=$.trim(String(name));if(index){if(!this.options.extraParams){this.options.extraParams={}}if(this.options.extraParams[index]!==value){this.options.extraParams[index]=value;this.cacheFlush()}}};$.Autocompleter.prototype.makeUrl=function(param){var self=this;var url=this.options.url;var params=$.extend({},this.options.extraParams);if(this.options.queryParamName===false){url+=encodeURIComponent(param)}else{params[this.options.queryParamName]=param}return makeUrl(url,params)};$.Autocompleter.prototype.parseRemoteData=function(remoteData){var remoteDataType;var data=remoteData;if(this.options.remoteDataType==="json"){remoteDataType=typeof remoteData;switch(remoteDataType){case"object":data=remoteData;break;case"string":data=$.parseJSON(remoteData);break;default:throw new Error("Unexpected remote data type: "+remoteDataType)}return data}return plainTextParser(data,this.options.lineSeparator,this.options.cellSeparator)};$.Autocompleter.prototype.defaultFilter=function(result,filter){if(!result.value){return false}if(this.options.filterResults){var pattern=this.matchStringConverter(filter);var testValue=this.matchStringConverter(result.value);if(!this.options.matchCase){pattern=pattern.toLowerCase();testValue=testValue.toLowerCase()}var patternIndex=testValue.indexOf(pattern);if(this.options.matchInside){return patternIndex>-1}else{return patternIndex===0}}return true};$.Autocompleter.prototype.filterResult=function(result,filter){if(this.options.filter===false){return true}if($.isFunction(this.options.filter)){return this.options.filter(result,filter)}return this.defaultFilter(result,filter)};$.Autocompleter.prototype.filterResults=function(results,filter){var filtered=[];var i,result;for(i=0;i<results.length;i++){result=sanitizeResult(results[i]);if(this.filterResult(result,filter)){filtered.push(result)}}if(this.options.sortResults){filtered=this.sortResults(filtered,filter)}if(this.options.maxItemsToShow>0&&this.options.maxItemsToShow<filtered.length){filtered.length=this.options.maxItemsToShow}return filtered};$.Autocompleter.prototype.sortResults=function(results,filter){var self=this;var sortFunction=this.options.sortFunction;if(!$.isFunction(sortFunction)){sortFunction=function(a,b,f){return sortValueAlpha(a,b,self.options.matchCase)}}results.sort(function(a,b){return sortFunction(a,b,filter,self.options)});return results};$.Autocompleter.prototype.matchStringConverter=function(s,a,b){var converter=this.options.matchStringConverter;if($.isFunction(converter)){s=converter(s,a,b)}return s};$.Autocompleter.prototype.beforeUseConverter=function(s){s=this.getValue(s);var converter=this.options.beforeUseConverter;if($.isFunction(converter)){s=converter(s)}return s};$.Autocompleter.prototype.enableFinishOnBlur=function(){this.finishOnBlur_=true};$.Autocompleter.prototype.disableFinishOnBlur=function(){this.finishOnBlur_=false};$.Autocompleter.prototype.createItemFromResult=function(result){var self=this;var $li=$("<li/>");$li.text(this.showResult(result.value,result.data));$li.data({value:result.value,data:result.data}).click(function(){self.selectItem($li)}).mousedown(self.disableFinishOnBlur).mouseup(self.enableFinishOnBlur);return $li};$.Autocompleter.prototype.getItems=function(){return $(">ul>li",this.dom.$results)};$.Autocompleter.prototype.showResults=function(results,filter){var numResults=results.length;var self=this;var $ul=$("<ul></ul>");var i,result,$li,autoWidth,first=false,$first=false;if(numResults){for(i=0;i<numResults;i++){result=results[i];$li=this.createItemFromResult(result);$ul.append($li);if(first===false){first=String(result.value);$first=$li;$li.addClass(this.options.firstItemClass)}if(i===numResults-1){$li.addClass(this.options.lastItemClass)}}this.dom.$results.html($ul).show();this.position();if(this.options.autoWidth){autoWidth=this.dom.$elem.outerWidth()-this.dom.$results.outerWidth()+this.dom.$results.width();this.dom.$results.css(this.options.autoWidth,autoWidth)}this.getItems().hover(function(){self.focusItem(this)},function(){});if(this.autoFill(first,filter)||this.options.selectFirst||this.options.selectOnly&&numResults===1){this.focusItem($first)}this.active_=true}else{this.hideResults();this.active_=false}};$.Autocompleter.prototype.showResult=function(value,data){if($.isFunction(this.options.showResult)){return this.options.showResult(value,data)}else{return value}};$.Autocompleter.prototype.autoFill=function(value,filter){var lcValue,lcFilter,valueLength,filterLength;if(this.options.autoFill&&this.lastKeyPressed_!==8){lcValue=String(value).toLowerCase();lcFilter=String(filter).toLowerCase();valueLength=value.length;filterLength=filter.length;if(lcValue.substr(0,filterLength)===lcFilter){var d=this.getDelimiterOffsets();var pad=d.start?" ":"";this.setValue(pad+value);var start=filterLength+d.start+pad.length;var end=valueLength+d.start+pad.length;this.selectRange(start,end);return true}}return false};$.Autocompleter.prototype.focusNext=function(){this.focusMove(+1)};$.Autocompleter.prototype.focusPrev=function(){this.focusMove(-1)};$.Autocompleter.prototype.focusMove=function(modifier){var $items=this.getItems();modifier=sanitizeInteger(modifier,0);if(modifier){for(var i=0;i<$items.length;i++){if($($items[i]).hasClass(this.selectClass_)){this.focusItem(i+modifier);return}}}this.focusItem(0)};$.Autocompleter.prototype.focusItem=function(item){var $item,$items=this.getItems();if($items.length){$items.removeClass(this.selectClass_).removeClass(this.options.selectClass);if(typeof item==="number"){if(item<0){item=0}else if(item>=$items.length){item=$items.length-1}$item=$($items[item])}else{$item=$(item)}if($item){$item.addClass(this.selectClass_).addClass(this.options.selectClass)}}};$.Autocompleter.prototype.selectCurrent=function(){var $item=$("li."+this.selectClass_,this.dom.$results);if($item.length===1){this.selectItem($item)}else{this.deactivate(false)}};$.Autocompleter.prototype.selectItem=function($li){var value=$li.data("value");var data=$li.data("data");var displayValue=this.displayValue(value,data);var processedDisplayValue=this.beforeUseConverter(displayValue);this.lastProcessedValue_=processedDisplayValue;this.lastSelectedValue_=processedDisplayValue;var d=this.getDelimiterOffsets();var delimiter=this.options.delimiterChar;var elem=this.dom.$elem;var extraCaretPos=0;if(this.options.useDelimiter){if(elem.val().substring(d.start-1,d.start)==delimiter&&delimiter!=" "){displayValue=" "+displayValue}if(elem.val().substring(d.end,d.end+1)!=delimiter&&this.lastKeyPressed_!=this.options.delimiterKeyCode){displayValue=displayValue+delimiter}else{extraCaretPos=1}}this.setValue(displayValue);this.setCaret(d.start+displayValue.length+extraCaretPos);this.callHook("onItemSelect",{value:value,data:data});this.deactivate(true);elem.focus()};$.Autocompleter.prototype.displayValue=function(value,data){if($.isFunction(this.options.displayValue)){return this.options.displayValue(value,data)}return value};$.Autocompleter.prototype.hideResults=function(){this.dom.$results.hide()};$.Autocompleter.prototype.deactivate=function(finish){if(this.finishTimeout_){clearTimeout(this.finishTimeout_)}if(this.keyTimeout_){clearTimeout(this.keyTimeout_)}if(finish){if(this.lastProcessedValue_!==this.lastSelectedValue_){if(this.options.mustMatch){this.setValue("")}this.callHook("onNoMatch")}if(this.active_){this.callHook("onFinish")}this.lastKeyPressed_=null;this.lastProcessedValue_=null;this.lastSelectedValue_=null;this.active_=false}this.hideResults()};$.Autocompleter.prototype.selectRange=function(start,end){var input=this.dom.$elem.get(0);if(input.setSelectionRange){input.focus();input.setSelectionRange(start,end)}else if(input.createTextRange){var range=input.createTextRange();range.collapse(true);range.moveEnd("character",end);range.moveStart("character",start);range.select()}};$.Autocompleter.prototype.setCaret=function(pos){this.selectRange(pos,pos)};$.Autocompleter.prototype.getCaret=function(){var $elem=this.dom.$elem;var elem=$elem[0];var val,selection,range,start,end,stored_range;if(elem.createTextRange){selection=document.selection;if(elem.tagName.toLowerCase()!="textarea"){val=$elem.val();range=selection.createRange().duplicate();range.moveEnd("character",val.length);if(range.text===""){start=val.length}else{start=val.lastIndexOf(range.text)}range=selection.createRange().duplicate();range.moveStart("character",-val.length);end=range.text.length}else{range=selection.createRange();stored_range=range.duplicate();stored_range.moveToElementText(elem);stored_range.setEndPoint("EndToEnd",range);start=stored_range.text.length-range.text.length;end=start+range.text.length}}else{start=$elem[0].selectionStart;end=$elem[0].selectionEnd}return{start:start,end:end}};$.Autocompleter.prototype.setValue=function(value){if(this.options.useDelimiter){var val=this.dom.$elem.val();var d=this.getDelimiterOffsets();var preVal=val.substring(0,d.start);var postVal=val.substring(d.end);value=preVal+value+postVal}this.dom.$elem.val(value)};$.Autocompleter.prototype.getValue=function(value){if(this.options.useDelimiter){var d=this.getDelimiterOffsets();return value.substring(d.start,d.end).trim()}else{return value}};$.Autocompleter.prototype.getDelimiterOffsets=function(){var val=this.dom.$elem.val();if(this.options.useDelimiter){var preCaretVal=val.substring(0,this.getCaret().start);var start=preCaretVal.lastIndexOf(this.options.delimiterChar)+1;var postCaretVal=val.substring(this.getCaret().start);var end=postCaretVal.indexOf(this.options.delimiterChar);if(end==-1)end=val.length;end+=this.getCaret().start}else{start=0;end=val.length}return{start:start,end:end}}})(jQuery);
diff --git a/lib/shimmie.js b/lib/shimmie.js
index b899ebda0..8fb892cd4 100644
--- a/lib/shimmie.js
+++ b/lib/shimmie.js
@@ -6,25 +6,6 @@ $(document).ready(function() {
 	jQuery.timeago.settings.cutoff = 365 * dayMS;
 	$("time").timeago();
 
-	//TODO: Possibly move to using TextExtJS for autocomplete? - http://textextjs.com/
-	//      Also use autocomplete in tag box?
-	$('.autocomplete_tags').autocomplete(base_href + '/api/internal/tag_list/complete', {
-		//extraParams: {limit: 10},
-		queryParamName: 's',
-		minChars: 1,
-		delay: 0,
-		useCache: true,
-		maxCacheLength: 10,
-		matchInside: false,
-		selectFirst: false,
-		selectOnly: false,
-		preventDefaultReturn: 1,
-		preventDefaultTab: 1,
-		useDelimiter: true,
-		delimiterChar : " ",
-		delimiterKeyCode : 48
-	});
-
 	$("TABLE.sortable").tablesorter();
 
 	$(".shm-clink").each(function(idx, elm) {

From d00d0ee4bbeea554da8f7be5edaac6ef794299a1 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Wed, 11 May 2016 22:57:07 +0100
Subject: [PATCH 065/250] asset-plugin doesn't need to be required as it is
 installed globally instead

---
 composer.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/composer.json b/composer.json
index 2751ea0cd..aaca157d1 100644
--- a/composer.json
+++ b/composer.json
@@ -5,9 +5,7 @@
 	"require" : {
 		"php" : ">=5.4.8",
 
-		"fxp/composer-asset-plugin": "~1.1",
 		"bower-asset/jquery": "1.12.3"
-
 	},
 
 	"vendor-copy": {

From 895df8c22b637688e8809911c0ddae049483a47a Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Wed, 11 May 2016 23:27:42 +0100
Subject: [PATCH 066/250] load flexihash via composer

---
 composer.json            |   2 +
 core/_bootstrap.inc.php  |   1 +
 core/imageboard.pack.php |   5 +-
 lib/flexihash.php        | 269 ---------------------------------------
 4 files changed, 4 insertions(+), 273 deletions(-)
 delete mode 100644 lib/flexihash.php

diff --git a/composer.json b/composer.json
index aaca157d1..71c996e14 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,8 @@
 	"require" : {
 		"php" : ">=5.4.8",
 
+		"flexihash/flexihash": "^2.0.0",
+
 		"bower-asset/jquery": "1.12.3"
 	},
 
diff --git a/core/_bootstrap.inc.php b/core/_bootstrap.inc.php
index 77fcbc1d1..df92da947 100644
--- a/core/_bootstrap.inc.php
+++ b/core/_bootstrap.inc.php
@@ -9,6 +9,7 @@
 require_once "core/sys_config.inc.php";
 require_once "core/util.inc.php";
 require_once "lib/context.php";
+require_once "vendor/autoload.php";
 
 // set up and purify the environment
 _version_check();
diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index c4111c893..9a426a031 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -23,9 +23,6 @@
 * Classes                                                                   *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-
-require_once "lib/flexihash.php";
-
 /**
  * Class Image
  *
@@ -724,7 +721,7 @@ public function parse_link_template($tmpl, $_escape="url_escape") {
 
 			if($opts != $fh_last_opts) {
 				$fh_last_opts = $opts;
-				$flexihash = new Flexihash();
+				$flexihash = new Flexihash\Flexihash();
 				foreach(explode(",", $opts) as $opt) {
 					$parts = explode("=", $opt);
 					$parts_count = count($parts);
diff --git a/lib/flexihash.php b/lib/flexihash.php
deleted file mode 100644
index f9d25db54..000000000
--- a/lib/flexihash.php
+++ /dev/null
@@ -1,269 +0,0 @@
-<?php
-
-interface Flexihash_Hasher
-{
-	public function hash($string);
-}
-
-class Flexihash_Crc32Hasher
-	implements Flexihash_Hasher
-{
-
-	public function hash($string)
-	{
-		return crc32($string);
-	}
-
-}
-
-class Flexihash_Exception extends Exception
-{
-}
-
-
-
-/**
- * A simple consistent hashing implementation with pluggable hash algorithms.
- *
- * @author Paul Annesley
- * @package Flexihash
- * @licence http://www.opensource.org/licenses/mit-license.php
- */
-class Flexihash
-{
-
-	/**
-	 * The number of positions to hash each target to.
-	 *
-	 * @var int
-	 */
-	private $_replicas = 64;
-
-	/**
-	 * The hash algorithm, encapsulated in a Flexihash_Hasher implementation.
-	 * @var object Flexihash_Hasher
-	 */
-	private $_hasher;
-
-	/**
-	 * Internal counter for current number of targets.
-	 * @var int
-	 */
-	private $_targetCount = 0;
-
-	/**
-	 * Internal map of positions (hash outputs) to targets
-	 * @var array { position => target, ... }
-	 */
-	private $_positionToTarget = array();
-
-	/**
-	 * Internal map of targets to lists of positions that target is hashed to.
-	 * @var array { target => [ position, position, ... ], ... }
-	 */
-	private $_targetToPositions = array();
-
-	/**
-	 * Whether the internal map of positions to targets is already sorted.
-	 * @var boolean
-	 */
-	private $_positionToTargetSorted = false;
-
-	/**
-	 * Constructor
-	 * @param object $hasher Flexihash_Hasher
-	 * @param int $replicas Amount of positions to hash each target to.
-	 */
-	public function __construct(Flexihash_Hasher $hasher = null, $replicas = null)
-	{
-		$this->_hasher = $hasher ? $hasher : new Flexihash_Crc32Hasher();
-		if (!empty($replicas)) $this->_replicas = $replicas;
-	}
-
-	/**
-	 * Add a target.
-	 * @param string $target
-         * @param float $weight
-	 * @chainable
-	 */
-	public function addTarget($target, $weight=1)
-	{
-		if (isset($this->_targetToPositions[$target]))
-		{
-			throw new Flexihash_Exception("Target '$target' already exists.");
-		}
-
-		$this->_targetToPositions[$target] = array();
-
-		// hash the target into multiple positions
-		for ($i = 0; $i < round($this->_replicas*$weight); $i++)
-		{
-			$position = $this->_hasher->hash($target . $i);
-			$this->_positionToTarget[$position] = $target; // lookup
-			$this->_targetToPositions[$target] []= $position; // target removal
-		}
-
-		$this->_positionToTargetSorted = false;
-		$this->_targetCount++;
-
-		return $this;
-	}
-
-	/**
-	 * Add a list of targets.
-	 * @param array $targets
-         * @param float $weight
-	 * @chainable
-	 */
-	public function addTargets($targets, $weight=1)
-	{
-		foreach ($targets as $target)
-		{
-			$this->addTarget($target,$weight);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Remove a target.
-	 * @param string $target
-	 * @chainable
-	 */
-	public function removeTarget($target)
-	{
-		if (!isset($this->_targetToPositions[$target]))
-		{
-			throw new Flexihash_Exception("Target '$target' does not exist.");
-		}
-
-		foreach ($this->_targetToPositions[$target] as $position)
-		{
-			unset($this->_positionToTarget[$position]);
-		}
-
-		unset($this->_targetToPositions[$target]);
-
-		$this->_targetCount--;
-
-		return $this;
-	}
-
-	/**
-	 * A list of all potential targets
-	 * @return array
-	 */
-	public function getAllTargets()
-	{
-		return array_keys($this->_targetToPositions);
-	}
-
-	/**
-	 * Looks up the target for the given resource.
-	 * @param string $resource
-	 * @return string
-	 */
-	public function lookup($resource)
-	{
-		$targets = $this->lookupList($resource, 1);
-		if (empty($targets)) throw new Flexihash_Exception('No targets exist');
-		return $targets[0];
-	}
-
-	/**
-	 * Get a list of targets for the resource, in order of precedence.
-	 * Up to $requestedCount targets are returned, less if there are fewer in total.
-	 *
-	 * @param string $resource
-	 * @param int $requestedCount The length of the list to return
-	 * @return array List of targets
-	 */
-	public function lookupList($resource, $requestedCount)
-	{
-		if (!$requestedCount)
-			throw new Flexihash_Exception('Invalid count requested');
-
-		// handle no targets
-		if (empty($this->_positionToTarget))
-			return array();
-
-		// optimize single target
-		if ($this->_targetCount == 1)
-			return array_unique(array_values($this->_positionToTarget));
-
-		// hash resource to a position
-		$resourcePosition = $this->_hasher->hash($resource);
-
-		$results = array();
-		$collect = false;
-
-		$this->_sortPositionTargets();
-
-		// search values above the resourcePosition
-		foreach ($this->_positionToTarget as $key => $value)
-		{
-			// start collecting targets after passing resource position
-			if (!$collect && $key > $resourcePosition)
-			{
-				$collect = true;
-			}
-
-			// only collect the first instance of any target
-			if ($collect && !in_array($value, $results))
-			{
-				$results []= $value;
-			}
-
-			// return when enough results, or list exhausted
-			if (count($results) == $requestedCount || count($results) == $this->_targetCount)
-			{
-				return $results;
-			}
-		}
-
-		// loop to start - search values below the resourcePosition
-		foreach ($this->_positionToTarget as $key => $value)
-		{
-			if (!in_array($value, $results))
-			{
-				$results []= $value;
-			}
-
-			// return when enough results, or list exhausted
-			if (count($results) == $requestedCount || count($results) == $this->_targetCount)
-			{
-				return $results;
-			}
-		}
-
-		// return results after iterating through both "parts"
-		return $results;
-	}
-
-	public function __toString()
-	{
-		return sprintf(
-			'%s{targets:[%s]}',
-			get_class($this),
-			implode(',', $this->getAllTargets())
-		);
-	}
-
-	// ----------------------------------------
-	// private methods
-
-	/**
-	 * Sorts the internal mapping (positions to targets) by position
-	 */
-	private function _sortPositionTargets()
-	{
-		// sort by key (position) if not already
-		if (!$this->_positionToTargetSorted)
-		{
-			ksort($this->_positionToTarget, SORT_REGULAR);
-			$this->_positionToTargetSorted = true;
-		}
-	}
-
-}
-

From 516488a62507ee90a4a8e490e6a19412f6b8ce50 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 12 May 2016 15:25:30 +0100
Subject: [PATCH 067/250] load akismet via composer note: we should probably be
 using a more recent library for this, but there doesn't seem to be any
 general ones..

---
 composer.json         |  20 ++-
 ext/comment/main.php  |   2 +-
 lib/akismet.class.php | 356 ------------------------------------------
 3 files changed, 19 insertions(+), 359 deletions(-)
 delete mode 100644 lib/akismet.class.php

diff --git a/composer.json b/composer.json
index 71c996e14..9bd91507f 100644
--- a/composer.json
+++ b/composer.json
@@ -2,12 +2,28 @@
 	"type"    : "project",
 	"license" : "GPL-2.0",
 
+	"repositories" : [
+		{
+			"type" : "package",
+			"package" : {
+				"name" : "ifixit/php-akismet",
+				"version" : "1.0",
+				"source" : {
+					"url"       : "https://github.com/iFixit/php-akismet.git",
+					"type"      : "git",
+					"reference" : "126b4b9182230678a585338be4cfca24c9129dc9"
+				}
+			}
+		}
+	],
+
 	"require" : {
 		"php" : ">=5.4.8",
 
-		"flexihash/flexihash": "^2.0.0",
+		"flexihash/flexihash" : "^2.0.0",
+		"ifixit/php-akismet"  : "1.*",
 
-		"bower-asset/jquery": "1.12.3"
+		"bower-asset/jquery"  : "1.12.3"
 	},
 
 	"vendor-copy": {
diff --git a/ext/comment/main.php b/ext/comment/main.php
index a36f2166c..b8bdd4819 100644
--- a/ext/comment/main.php
+++ b/ext/comment/main.php
@@ -9,7 +9,7 @@
  *  Formatting is done with the standard formatting API (normally BBCode)
  */
 
-require_once "lib/akismet.class.php";
+require_once "vendor/ifixit/php-akismet/akismet.class.php";
 
 class CommentPostingEvent extends Event {
 	/** @var  int */
diff --git a/lib/akismet.class.php b/lib/akismet.class.php
deleted file mode 100644
index 3f57c6108..000000000
--- a/lib/akismet.class.php
+++ /dev/null
@@ -1,356 +0,0 @@
-<?php
-/**
- * 01.26.2006 12:29:28est
- * 
- * Akismet PHP4 class
- * 
- * <b>Usage</b>
- * <code>
- *    $comment = array(
- *           'author'    => 'viagra-test-123',
- *           'email'     => 'test@example.com',
- *           'website'   => 'http://www.example.com/',
- *           'body'      => 'This is a test comment',
- *           'permalink' => 'http://yourdomain.com/yourblogpost.url',
- *        );
- *
- *    $akismet = new Akismet('http://www.yourdomain.com/', 'YOUR_WORDPRESS_API_KEY', $comment);
- *
- *    if($akismet->isError()) {
- *        echo"Couldn't connected to Akismet server!";
- *    } else {
- *        if($akismet->isSpam()) {
- *            echo"Spam detected";
- *        } else {
- *            echo"yay, no spam!";
- *        }
- *    }
- * </code>
- * 
- * @author Bret Kuhns {@link www.miphp.net}
- * @link http://www.miphp.net/blog/view/php4_akismet_class/
- * @version 0.3.3
- * @license http://www.opensource.org/licenses/mit-license.php MIT License
- */
-
-
-
-// Error constants
-define("AKISMET_SERVER_NOT_FOUND",	0);
-define("AKISMET_RESPONSE_FAILED",	1);
-define("AKISMET_INVALID_KEY",		2);
-
-
-
-// Base class to assist in error handling between Akismet classes
-class AkismetObject {
-	var $errors = array();
-	
-	
-	/**
-	 * Add a new error to the errors array in the object
-	 *
-	 * @param	String	$name	A name (array key) for the error
-	 * @param	String	$string	The error message
-	 * @return void
-	 */ 
-	// Set an error in the object
-	function setError($name, $message) {
-		$this->errors[$name] = $message;
-	}
-	
-
-	/**
-	 * Return a specific error message from the errors array
-	 *
-	 * @param	String	$name	The name of the error you want
-	 * @return mixed	Returns a String if the error exists, a false boolean if it does not exist
-	 */
-	function getError($name) {
-		if($this->isError($name)) {
-			return $this->errors[$name];
-		} else {
-			return false;
-		}
-	}
-	
-	
-	/**
-	 * Return all errors in the object
-	 *
-	 * @return String[]
-	 */ 
-	function getErrors() {
-		return (array)$this->errors;
-	}
-	
-	
-	/**
-	 * Check if a certain error exists
-	 *
-	 * @param	String	$name	The name of the error you want
-	 * @return boolean
-	 */ 
-	function isError($name) {
-		return isset($this->errors[$name]);
-	}
-	
-	
-	/**
-	 * Check if any errors exist
-	 *
-	 * @return boolean
-	 */
-	function errorsExist() {
-		return (count($this->errors) > 0);
-	}
-	
-	
-}
-
-
-
-
-
-// Used by the Akismet class to communicate with the Akismet service
-class AkismetHttpClient extends AkismetObject {
-	var $akismetVersion = '1.1';
-	var $con;
-	var $host;
-	var $port;
-	var $apiKey;
-	var $blogUrl;
-	var $errors = array();
-	
-	
-	// Constructor
-	function __construct($host, $blogUrl, $apiKey, $port = 80) {
-		$this->host = $host;
-		$this->port = $port;
-		$this->blogUrl = $blogUrl;
-		$this->apiKey = $apiKey;
-	}
-	
-	
-	// Use the connection active in $con to get a response from the server and return that response
-	function getResponse($request, $path, $type = "post", $responseLength = 1160) {
-		$this->_connect();
-		
-		if($this->con && !$this->isError(AKISMET_SERVER_NOT_FOUND)) {
-			$request  = 
-					strToUpper($type)." /{$this->akismetVersion}/$path HTTP/1.1\r\n" .
-					"Host: ".((!empty($this->apiKey)) ? $this->apiKey."." : null)."{$this->host}\r\n" .
-					"Content-Type: application/x-www-form-urlencoded; charset=utf-8\r\n" .
-					"Content-Length: ".strlen($request)."\r\n" .
-					"User-Agent: Akismet PHP4 Class\r\n" .
-					"\r\n" .
-					$request
-				;
-			$response = "";
-
-			@fwrite($this->con, $request);
-
-			while(!feof($this->con)) {
-				$response .= @fgets($this->con, $responseLength);
-			}
-
-			$response = explode("\r\n\r\n", $response, 2);
-			return $response[1];
-		} else {
-			$this->setError(AKISMET_RESPONSE_FAILED, "The response could not be retrieved.");
-		}
-		
-		$this->_disconnect();
-	}
-	
-	
-	// Connect to the Akismet server and store that connection in the instance variable $con
-	function _connect() {
-		if(!($this->con = @fsockopen($this->host, $this->port))) {
-			$this->setError(AKISMET_SERVER_NOT_FOUND, "Could not connect to akismet server.");
-		}
-	}
-	
-	
-	// Close the connection to the Akismet server
-	function _disconnect() {
-		@fclose($this->con);
-	}
-	
-	
-}
-
-
-
-
-
-// The controlling class. This is the ONLY class the user should instantiate in
-// order to use the Akismet service!
-class Akismet extends AkismetObject {
-	var $apiPort = 80;
-	var $akismetServer = 'rest.akismet.com';
-	var $akismetVersion = '1.1';
-	var $http;
-	
-	var $ignore = array(
-			'HTTP_COOKIE',
-			'HTTP_X_FORWARDED_FOR',
-			'HTTP_X_FORWARDED_HOST',
-			'HTTP_MAX_FORWARDS',
-			'HTTP_X_FORWARDED_SERVER',
-			'REDIRECT_STATUS',
-			'SERVER_PORT',
-			'PATH',
-			'DOCUMENT_ROOT',
-			'SERVER_ADMIN',
-			'QUERY_STRING',
-			'PHP_SELF'
-		);
-	
-	var $blogUrl = "";
-	var $apiKey  = "";
-	var $comment = array();
-	
-	
-	/**
-	 * Constructor
-	 * 
-	 * Set instance variables, connect to Akismet, and check API key
-	 * 
-	 * @param	String	$blogUrl	The URL to your own blog
-	 * @param 	String	$apiKey		Your wordpress API key
-	 * @param 	String[]	$comment	A formatted comment array to be examined by the Akismet service
-	 */
-	function __construct($blogUrl, $apiKey, $comment) {
-		$this->blogUrl = $blogUrl;
-		$this->apiKey  = $apiKey;
-		
-		// Populate the comment array with information needed by Akismet
-		$this->comment = $comment;
-		$this->_formatCommentArray();
-		
-		if(!isset($this->comment['user_ip'])) {
-			$this->comment['user_ip'] = ($_SERVER['REMOTE_ADDR'] != getenv('SERVER_ADDR')) ? $_SERVER['REMOTE_ADDR'] : getenv('HTTP_X_FORWARDED_FOR');
-		}
-		if(!isset($this->comment['user_agent'])) {
-			$this->comment['user_agent'] = $_SERVER['HTTP_USER_AGENT'];
-		}
-		if(!isset($this->comment['referrer'])) {
-			$this->comment['referrer'] = $_SERVER['HTTP_REFERER'];
-		}
-		$this->comment['blog'] = $blogUrl;
-		
-		// Connect to the Akismet server and populate errors if they exist
-		$this->http = new AkismetHttpClient($this->akismetServer, $blogUrl, $apiKey);
-		if($this->http->errorsExist()) {
-			$this->errors = array_merge($this->errors, $this->http->getErrors());
-		}
-		
-		// Check if the API key is valid
-		if(!$this->_isValidApiKey($apiKey)) {
-			$this->setError(AKISMET_INVALID_KEY, "Your Akismet API key is not valid.");
-		}
-	}
-	
-	
-	/**
-	 * Query the Akismet and determine if the comment is spam or not
-	 * 
-	 * @return	boolean
-	 */
-	function isSpam() {
-		$response = $this->http->getResponse($this->_getQueryString(), 'comment-check');
-		
-		return ($response == "true");
-	}
-	
-	
-	/**
-	 * Submit this comment as an unchecked spam to the Akismet server
-	 * 
-	 * @return	void
-	 */
-	function submitSpam() {
-		$this->http->getResponse($this->_getQueryString(), 'submit-spam');
-	}
-	
-	
-	/**
-	 * Submit a false-positive comment as "ham" to the Akismet server
-	 *
-	 * @return	void
-	 */
-	function submitHam() {
-		$this->http->getResponse($this->_getQueryString(), 'submit-ham');
-	}
-	
-	
-	/**
-	 * Check with the Akismet server to determine if the API key is valid
-	 *
-	 * @access	Protected
-	 * @param	String	$key	The Wordpress API key passed from the constructor argument
-	 * @return	boolean
-	 */
-	function _isValidApiKey($key) {
-		$keyCheck = $this->http->getResponse("key=".$this->apiKey."&blog=".$this->blogUrl, 'verify-key');
-			
-		return ($keyCheck == "valid");
-	}
-	
-	
-	/**
-	 * Format the comment array in accordance to the Akismet API
-	 *
-	 * @access	Protected
-	 * @return	void
-	 */
-	function _formatCommentArray() {
-		$format = array(
-				'type' => 'comment_type',
-				'author' => 'comment_author',
-				'email' => 'comment_author_email',
-				'website' => 'comment_author_url',
-				'body' => 'comment_content'
-			);
-		
-		foreach($format as $short => $long) {
-			if(isset($this->comment[$short])) {
-				$this->comment[$long] = $this->comment[$short];
-				unset($this->comment[$short]);
-			}
-		}
-	}
-	
-	
-	/**
-	 * Build a query string for use with HTTP requests
-	 *
-	 * @access	Protected
-	 * @return	String
-	 */
-	function _getQueryString() {
-		foreach($_SERVER as $key => $value) {
-			if(!in_array($key, $this->ignore)) {
-				if($key == 'REMOTE_ADDR') {
-					$this->comment[$key] = $this->comment['user_ip'];
-				} else {
-					$this->comment[$key] = $value;
-				}
-			}
-		}
-
-		$query_string = '';
-
-		foreach($this->comment as $key => $data) {
-			if(is_string($data)) {
-				$query_string .= $key . '=' . urlencode(stripslashes($data)) . '&';
-			}
-		}
-
-		return $query_string;
-	}
-	
-	
-}
-?>

From 7b82ec3a00d7e7b7bbd84c3d80af3fc43d64b11f Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 12 May 2016 15:40:33 +0100
Subject: [PATCH 068/250] grab jQuery.timeago lib with composer

---
 composer.json                   | 10 ++++++----
 lib/jquery.timeago-1.3.1.min.js | 17 -----------------
 lib/shimmie.js                  |  5 ++---
 3 files changed, 8 insertions(+), 24 deletions(-)
 delete mode 100644 lib/jquery.timeago-1.3.1.min.js

diff --git a/composer.json b/composer.json
index 9bd91507f..d93a5511c 100644
--- a/composer.json
+++ b/composer.json
@@ -23,13 +23,15 @@
 		"flexihash/flexihash" : "^2.0.0",
 		"ifixit/php-akismet"  : "1.*",
 
-		"bower-asset/jquery"  : "1.12.3"
+		"bower-asset/jquery"         : "1.12.3",
+		"bower-asset/jquery-timeago" : "1.5.2"
 	},
 
 	"vendor-copy": {
-		"vendor/bower-asset/jquery/dist/jquery.js"      : "lib/vendor/js/jquery-1.12.3.js",
-		"vendor/bower-asset/jquery/dist/jquery.min.js"  : "lib/vendor/js/jquery-1.12.3.min.js",
-		"vendor/bower-asset/jquery/dist/jquery.min.map" : "lib/vendor/js/jquery-1.12.3.min.map"
+		"vendor/bower-asset/jquery/dist/jquery.js"            : "lib/vendor/js/jquery-1.12.3.js",
+		"vendor/bower-asset/jquery/dist/jquery.min.js"        : "lib/vendor/js/jquery-1.12.3.min.js",
+		"vendor/bower-asset/jquery/dist/jquery.min.map"       : "lib/vendor/js/jquery-1.12.3.min.map",
+		"vendor/bower-asset/jquery-timeago/jquery.timeago.js" : "lib/vendor/js/jquery.timeago.js"
 	},
 
 	"scripts": {
diff --git a/lib/jquery.timeago-1.3.1.min.js b/lib/jquery.timeago-1.3.1.min.js
deleted file mode 100644
index 6c4b22381..000000000
--- a/lib/jquery.timeago-1.3.1.min.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Timeago is a jQuery plugin that makes it easy to support automatically
- * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
- *
- * @name timeago
- * @version 1.3.1
- * @requires jQuery v1.2.3+
- * @author Ryan McGeary
- * @license MIT License - http://www.opensource.org/licenses/mit-license.php
- *
- * For usage and examples, visit:
- * http://timeago.yarp.com/
- *
- * Copyright (c) 2008-2013, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org)
- */
-
-(function(e){if(typeof define==="function"&&define.amd){define(["jquery"],e)}else{e(jQuery)}})(function(e){function r(){var n=i(this);var r=t.settings;if(!isNaN(n.datetime)){if(r.cutoff==0||o(n.datetime)<r.cutoff){e(this).text(s(n.datetime))}}return this}function i(n){n=e(n);if(!n.data("timeago")){n.data("timeago",{datetime:t.datetime(n)});var r=e.trim(n.text());if(t.settings.localeTitle){n.attr("title",n.data("timeago").datetime.toLocaleString())}else if(r.length>0&&!(t.isTime(n)&&n.attr("title"))){n.attr("title",r)}}return n.data("timeago")}function s(e){return t.inWords(o(e))}function o(e){return(new Date).getTime()-e.getTime()}e.timeago=function(t){if(t instanceof Date){return s(t)}else if(typeof t==="string"){return s(e.timeago.parse(t))}else if(typeof t==="number"){return s(new Date(t))}else{return s(e.timeago.datetime(t))}};var t=e.timeago;e.extend(e.timeago,{settings:{refreshMillis:6e4,allowFuture:false,localeTitle:false,cutoff:0,strings:{prefixAgo:null,prefixFromNow:null,suffixAgo:"ago",suffixFromNow:"from now",seconds:"less than a minute",minute:"about a minute",minutes:"%d minutes",hour:"about an hour",hours:"about %d hours",day:"a day",days:"%d days",month:"about a month",months:"%d months",year:"about a year",years:"%d years",wordSeparator:" ",numbers:[]}},inWords:function(t){function l(r,i){var s=e.isFunction(r)?r(i,t):r;var o=n.numbers&&n.numbers[i]||i;return s.replace(/%d/i,o)}var n=this.settings.strings;var r=n.prefixAgo;var i=n.suffixAgo;if(this.settings.allowFuture){if(t<0){r=n.prefixFromNow;i=n.suffixFromNow}}var s=Math.abs(t)/1e3;var o=s/60;var u=o/60;var a=u/24;var f=a/365;var c=s<45&&l(n.seconds,Math.round(s))||s<90&&l(n.minute,1)||o<45&&l(n.minutes,Math.round(o))||o<90&&l(n.hour,1)||u<24&&l(n.hours,Math.round(u))||u<42&&l(n.day,1)||a<30&&l(n.days,Math.round(a))||a<45&&l(n.month,1)||a<365&&l(n.months,Math.round(a/30))||f<1.5&&l(n.year,1)||l(n.years,Math.round(f));var h=n.wordSeparator||"";if(n.wordSeparator===undefined){h=" "}return e.trim([r,c,i].join(h))},parse:function(t){var n=e.trim(t);n=n.replace(/\.\d+/,"");n=n.replace(/-/,"/").replace(/-/,"/");n=n.replace(/T/," ").replace(/Z/," UTC");n=n.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2");return new Date(n)},datetime:function(n){var r=t.isTime(n)?e(n).attr("datetime"):e(n).attr("title");return t.parse(r)},isTime:function(t){return e(t).get(0).tagName.toLowerCase()==="time"}});var n={init:function(){var n=e.proxy(r,this);n();var i=t.settings;if(i.refreshMillis>0){setInterval(n,i.refreshMillis)}},update:function(n){e(this).data("timeago",{datetime:t.parse(n)});r.apply(this)}};e.fn.timeago=function(e,t){var r=e?n[e]:n.init;if(!r){throw new Error("Unknown function name '"+e+"' for timeago")}this.each(function(){r.call(this,t)});return this};document.createElement("abbr");document.createElement("time")});
diff --git a/lib/shimmie.js b/lib/shimmie.js
index 8fb892cd4..e573be3d2 100644
--- a/lib/shimmie.js
+++ b/lib/shimmie.js
@@ -1,9 +1,8 @@
 /*jshint bitwise:false, curly:true, eqeqeq:true, evil:true, forin:false, noarg:true, noempty:true, nonew:true, undef:false, strict:false, browser:true */
 
-// Adding jQuery ui stuff
 $(document).ready(function() {
-	var dayMS = 1000 * 60 * 60 * 24;
-	jQuery.timeago.settings.cutoff = 365 * dayMS;
+	/** Setup jQuery.timeago **/
+	jQuery.timeago.settings.cutoff = 365 * 24 * 60 * 60 * 1000; // Display original dates older than 1 year
 	$("time").timeago();
 
 	$("TABLE.sortable").tablesorter();

From a2d9d14b6f997b7b02c0d173edef2e12ede7ad8f Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 12 May 2016 15:41:05 +0100
Subject: [PATCH 069/250] there isn't any reason to grab both versions of the
 js lib

---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index d93a5511c..13de015a9 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,6 @@
 	},
 
 	"vendor-copy": {
-		"vendor/bower-asset/jquery/dist/jquery.js"            : "lib/vendor/js/jquery-1.12.3.js",
 		"vendor/bower-asset/jquery/dist/jquery.min.js"        : "lib/vendor/js/jquery-1.12.3.min.js",
 		"vendor/bower-asset/jquery/dist/jquery.min.map"       : "lib/vendor/js/jquery-1.12.3.min.map",
 		"vendor/bower-asset/jquery-timeago/jquery.timeago.js" : "lib/vendor/js/jquery.timeago.js"

From 5f4ba464638bd78ed0278932e9df8094067445a7 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 12 May 2016 15:41:14 +0100
Subject: [PATCH 070/250] forgot to remove this

---
 lib/jquery-1.11.0.min.js | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 lib/jquery-1.11.0.min.js

diff --git a/lib/jquery-1.11.0.min.js b/lib/jquery-1.11.0.min.js
deleted file mode 100644
index 73f33fb3a..000000000
--- a/lib/jquery-1.11.0.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.11.0 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k="".trim,l={},m="1.11.0",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(l.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:k&&!k.call("\ufeff\xa0")?function(a){return null==a?"":k.call(a)}:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||n.guid++,e):void 0},now:function(){return+new Date},support:l}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="sizzle"+-new Date,t=a.document,u=0,v=0,w=eb(),x=eb(),y=eb(),z=function(a,b){return a===b&&(j=!0),0},A="undefined",B=1<<31,C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=D.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",M=L.replace("w","w#"),N="\\["+K+"*("+L+")"+K+"*(?:([*^$|!~]?=)"+K+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+M+")|)|)"+K+"*\\]",O=":("+L+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+N.replace(3,8)+")*)|.*)\\)|)",P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(O),U=new RegExp("^"+M+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L.replace("w","w*")+")"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=/'|\\/g,ab=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),bb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{G.apply(D=H.call(t.childNodes),t.childNodes),D[t.childNodes.length].nodeType}catch(cb){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function db(a,b,d,e){var f,g,h,i,j,m,p,q,u,v;if((b?b.ownerDocument||b:t)!==l&&k(b),b=b||l,d=d||[],!a||"string"!=typeof a)return d;if(1!==(i=b.nodeType)&&9!==i)return[];if(n&&!e){if(f=Z.exec(a))if(h=f[1]){if(9===i){if(g=b.getElementById(h),!g||!g.parentNode)return d;if(g.id===h)return d.push(g),d}else if(b.ownerDocument&&(g=b.ownerDocument.getElementById(h))&&r(b,g)&&g.id===h)return d.push(g),d}else{if(f[2])return G.apply(d,b.getElementsByTagName(a)),d;if((h=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(h)),d}if(c.qsa&&(!o||!o.test(a))){if(q=p=s,u=b,v=9===i&&a,1===i&&"object"!==b.nodeName.toLowerCase()){m=ob(a),(p=b.getAttribute("id"))?q=p.replace(_,"\\$&"):b.setAttribute("id",q),q="[id='"+q+"'] ",j=m.length;while(j--)m[j]=q+pb(m[j]);u=$.test(a)&&mb(b.parentNode)||b,v=m.join(",")}if(v)try{return G.apply(d,u.querySelectorAll(v)),d}catch(w){}finally{p||b.removeAttribute("id")}}}return xb(a.replace(P,"$1"),b,d,e)}function eb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function fb(a){return a[s]=!0,a}function gb(a){var b=l.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function hb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function ib(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||B)-(~a.sourceIndex||B);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function jb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function kb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function lb(a){return fb(function(b){return b=+b,fb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function mb(a){return a&&typeof a.getElementsByTagName!==A&&a}c=db.support={},f=db.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},k=db.setDocument=function(a){var b,e=a?a.ownerDocument||a:t,g=e.defaultView;return e!==l&&9===e.nodeType&&e.documentElement?(l=e,m=e.documentElement,n=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){k()},!1):g.attachEvent&&g.attachEvent("onunload",function(){k()})),c.attributes=gb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=gb(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(e.getElementsByClassName)&&gb(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=gb(function(a){return m.appendChild(a).id=s,!e.getElementsByName||!e.getElementsByName(s).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==A&&n){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){var c=typeof a.getAttributeNode!==A&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==A?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==A&&n?b.getElementsByClassName(a):void 0},p=[],o=[],(c.qsa=Y.test(e.querySelectorAll))&&(gb(function(a){a.innerHTML="<select t=''><option selected=''></option></select>",a.querySelectorAll("[t^='']").length&&o.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||o.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll(":checked").length||o.push(":checked")}),gb(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&o.push("name"+K+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||o.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),o.push(",.*:")})),(c.matchesSelector=Y.test(q=m.webkitMatchesSelector||m.mozMatchesSelector||m.oMatchesSelector||m.msMatchesSelector))&&gb(function(a){c.disconnectedMatch=q.call(a,"div"),q.call(a,"[s!='']:x"),p.push("!=",O)}),o=o.length&&new RegExp(o.join("|")),p=p.length&&new RegExp(p.join("|")),b=Y.test(m.compareDocumentPosition),r=b||Y.test(m.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},z=b?function(a,b){if(a===b)return j=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===t&&r(t,a)?-1:b===e||b.ownerDocument===t&&r(t,b)?1:i?I.call(i,a)-I.call(i,b):0:4&d?-1:1)}:function(a,b){if(a===b)return j=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],k=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:i?I.call(i,a)-I.call(i,b):0;if(f===g)return ib(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)k.unshift(c);while(h[d]===k[d])d++;return d?ib(h[d],k[d]):h[d]===t?-1:k[d]===t?1:0},e):l},db.matches=function(a,b){return db(a,null,null,b)},db.matchesSelector=function(a,b){if((a.ownerDocument||a)!==l&&k(a),b=b.replace(S,"='$1']"),!(!c.matchesSelector||!n||p&&p.test(b)||o&&o.test(b)))try{var d=q.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return db(b,l,null,[a]).length>0},db.contains=function(a,b){return(a.ownerDocument||a)!==l&&k(a),r(a,b)},db.attr=function(a,b){(a.ownerDocument||a)!==l&&k(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!n):void 0;return void 0!==f?f:c.attributes||!n?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},db.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},db.uniqueSort=function(a){var b,d=[],e=0,f=0;if(j=!c.detectDuplicates,i=!c.sortStable&&a.slice(0),a.sort(z),j){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return i=null,a},e=db.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=db.selectors={cacheLength:50,createPseudo:fb,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ab,bb),a[3]=(a[4]||a[5]||"").replace(ab,bb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||db.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&db.error(a[0]),a},PSEUDO:function(a){var b,c=!a[5]&&a[2];return V.CHILD.test(a[0])?null:(a[3]&&void 0!==a[4]?a[2]=a[4]:c&&T.test(c)&&(b=ob(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ab,bb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=w[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&w(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==A&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=db.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),t=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&t){k=q[s]||(q[s]={}),j=k[a]||[],n=j[0]===u&&j[1],m=j[0]===u&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[u,n,m];break}}else if(t&&(j=(b[s]||(b[s]={}))[a])&&j[0]===u)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(t&&((l[s]||(l[s]={}))[a]=[u,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||db.error("unsupported pseudo: "+a);return e[s]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?fb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:fb(function(a){var b=[],c=[],d=g(a.replace(P,"$1"));return d[s]?fb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:fb(function(a){return function(b){return db(a,b).length>0}}),contains:fb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:fb(function(a){return U.test(a||"")||db.error("unsupported lang: "+a),a=a.replace(ab,bb).toLowerCase(),function(b){var c;do if(c=n?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===m},focus:function(a){return a===l.activeElement&&(!l.hasFocus||l.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:lb(function(){return[0]}),last:lb(function(a,b){return[b-1]}),eq:lb(function(a,b,c){return[0>c?c+b:c]}),even:lb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:lb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:lb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:lb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=jb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=kb(b);function nb(){}nb.prototype=d.filters=d.pseudos,d.setFilters=new nb;function ob(a,b){var c,e,f,g,h,i,j,k=x[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=Q.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?db.error(a):x(a,i).slice(0)}function pb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function qb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=v++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[u,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[s]||(b[s]={}),(h=i[d])&&h[0]===u&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function rb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function sb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function tb(a,b,c,d,e,f){return d&&!d[s]&&(d=tb(d)),e&&!e[s]&&(e=tb(e,f)),fb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||wb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:sb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=sb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=sb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ub(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],i=g||d.relative[" "],j=g?1:0,k=qb(function(a){return a===b},i,!0),l=qb(function(a){return I.call(b,a)>-1},i,!0),m=[function(a,c,d){return!g&&(d||c!==h)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>j;j++)if(c=d.relative[a[j].type])m=[qb(rb(m),c)];else{if(c=d.filter[a[j].type].apply(null,a[j].matches),c[s]){for(e=++j;f>e;e++)if(d.relative[a[e].type])break;return tb(j>1&&rb(m),j>1&&pb(a.slice(0,j-1).concat({value:" "===a[j-2].type?"*":""})).replace(P,"$1"),c,e>j&&ub(a.slice(j,e)),f>e&&ub(a=a.slice(e)),f>e&&pb(a))}m.push(c)}return rb(m)}function vb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,i,j,k){var m,n,o,p=0,q="0",r=f&&[],s=[],t=h,v=f||e&&d.find.TAG("*",k),w=u+=null==t?1:Math.random()||.1,x=v.length;for(k&&(h=g!==l&&g);q!==x&&null!=(m=v[q]);q++){if(e&&m){n=0;while(o=a[n++])if(o(m,g,i)){j.push(m);break}k&&(u=w)}c&&((m=!o&&m)&&p--,f&&r.push(m))}if(p+=q,c&&q!==p){n=0;while(o=b[n++])o(r,s,g,i);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=E.call(j));s=sb(s)}G.apply(j,s),k&&!f&&s.length>0&&p+b.length>1&&db.uniqueSort(j)}return k&&(u=w,h=t),r};return c?fb(f):f}g=db.compile=function(a,b){var c,d=[],e=[],f=y[a+" "];if(!f){b||(b=ob(a)),c=b.length;while(c--)f=ub(b[c]),f[s]?d.push(f):e.push(f);f=y(a,vb(e,d))}return f};function wb(a,b,c){for(var d=0,e=b.length;e>d;d++)db(a,b[d],c);return c}function xb(a,b,e,f){var h,i,j,k,l,m=ob(a);if(!f&&1===m.length){if(i=m[0]=m[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&c.getById&&9===b.nodeType&&n&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(ab,bb),b)||[])[0],!b)return e;a=a.slice(i.shift().value.length)}h=V.needsContext.test(a)?0:i.length;while(h--){if(j=i[h],d.relative[k=j.type])break;if((l=d.find[k])&&(f=l(j.matches[0].replace(ab,bb),$.test(i[0].type)&&mb(b.parentNode)||b))){if(i.splice(h,1),a=f.length&&pb(i),!a)return G.apply(e,f),e;break}}}return g(a,m)(f,b,!n,e,$.test(a)&&mb(b.parentNode)||b),e}return c.sortStable=s.split("").sort(z).join("")===s,c.detectDuplicates=!!j,k(),c.sortDetached=gb(function(a){return 1&a.compareDocumentPosition(l.createElement("div"))}),gb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||hb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&gb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||hb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),gb(function(a){return null==a.getAttribute("disabled")})||hb(J,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),db}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=a.document,A=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,B=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:A.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:z,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=z.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return y.find(a);this.length=1,this[0]=d}return this.context=z,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};B.prototype=n.fn,y=n(z);var C=/^(?:parents|prev(?:Until|All))/,D={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!n(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function E(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return E(a,"nextSibling")},prev:function(a){return E(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(D[a]||(e=n.unique(e)),C.test(a)&&(e=e.reverse())),this.pushStack(e)}});var F=/\S+/g,G={};function H(a){var b=G[a]={};return n.each(a.match(F)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?G[a]||H(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&n.each(arguments,function(a,c){var d;while((d=n.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){if(a===!0?!--n.readyWait:!n.isReady){if(!z.body)return setTimeout(n.ready);n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(z,[n]),n.fn.trigger&&n(z).trigger("ready").off("ready"))}}});function J(){z.addEventListener?(z.removeEventListener("DOMContentLoaded",K,!1),a.removeEventListener("load",K,!1)):(z.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(z.addEventListener||"load"===event.type||"complete"===z.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===z.readyState)setTimeout(n.ready);else if(z.addEventListener)z.addEventListener("DOMContentLoaded",K,!1),a.addEventListener("load",K,!1);else{z.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&z.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!n.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}J(),n.ready()}}()}return I.promise(b)};var L="undefined",M;for(M in n(l))break;l.ownLast="0"!==M,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c=z.getElementsByTagName("body")[0];c&&(a=z.createElement("div"),a.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",b=z.createElement("div"),c.appendChild(a).appendChild(b),typeof b.style.zoom!==L&&(b.style.cssText="border:0;margin:0;width:1px;padding:1px;display:inline;zoom:1",(l.inlineBlockNeedsLayout=3===b.offsetWidth)&&(c.style.zoom=1)),c.removeChild(a),a=b=null)}),function(){var a=z.createElement("div");if(null==l.deleteExpando){l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}}a=null}(),n.acceptData=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(n.acceptData(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f
-}}function S(a,b,c){if(n.acceptData(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d]));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=n._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var T=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},W=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},X=/^(?:checkbox|radio)$/i;!function(){var a=z.createDocumentFragment(),b=z.createElement("div"),c=z.createElement("input");if(b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a>",l.leadingWhitespace=3===b.firstChild.nodeType,l.tbody=!b.getElementsByTagName("tbody").length,l.htmlSerialize=!!b.getElementsByTagName("link").length,l.html5Clone="<:nav></:nav>"!==z.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,a.appendChild(c),l.appendChecked=c.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,a.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){l.noCloneEvent=!1}),b.cloneNode(!0).click()),null==l.deleteExpando){l.deleteExpando=!0;try{delete b.test}catch(d){l.deleteExpando=!1}}a=b=c=null}(),function(){var b,c,d=z.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),l[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var Y=/^(?:input|select|textarea)$/i,Z=/^key/,$=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,ab=/^([^.]*)(?:\.(.+)|)$/;function bb(){return!0}function cb(){return!1}function db(){try{return z.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof n===L||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(F)||[""],h=b.length;while(h--)f=ab.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(F)||[""],j=b.length;while(j--)if(h=ab.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,m,o=[d||z],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||z,3!==d.nodeType&&8!==d.nodeType&&!_.test(p+n.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[n.expando]?b:new n.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),k=n.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!n.isWindow(d)){for(i=k.delegateType||p,_.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||z)&&o.push(l.defaultView||l.parentWindow||a)}m=0;while((h=o[m++])&&!b.isPropagationStopped())b.type=m>1?i:k.bindType||p,f=(n._data(h,"events")||{})[b.type]&&n._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&n.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&n.acceptData(d)&&g&&d[p]&&!n.isWindow(d)){l=d[g],l&&(d[g]=null),n.event.triggered=p;try{d[p]()}catch(r){}n.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((n.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?n(c,this).index(i)>=0:n.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=$.test(e)?this.mouseHooks:Z.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||z),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||z,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==db()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===db()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return n.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=z.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===L&&(a[d]=null),a.detachEvent(d,c))},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&(a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault())?bb:cb):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:cb,isPropagationStopped:cb,isImmediatePropagationStopped:cb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=bb,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=bb,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.submitBubbles||(n.event.special.submit={setup:function(){return n.nodeName(this,"form")?!1:void n.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=n.nodeName(b,"input")||n.nodeName(b,"button")?b.form:void 0;c&&!n._data(c,"submitBubbles")&&(n.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),n._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&n.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return n.nodeName(this,"form")?!1:void n.event.remove(this,"._submit")}}),l.changeBubbles||(n.event.special.change={setup:function(){return Y.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(n.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),n.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),n.event.simulate("change",this,a,!0)})),!1):void n.event.add(this,"beforeactivate._change",function(a){var b=a.target;Y.test(b.nodeName)&&!n._data(b,"changeBubbles")&&(n.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||n.event.simulate("change",this.parentNode,a,!0)}),n._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return n.event.remove(this,"._change"),!Y.test(this.nodeName)}}),l.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=n._data(d,b);e||d.addEventListener(a,c,!0),n._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=n._data(d,b)-1;e?n._data(d,b,e):(d.removeEventListener(a,c,!0),n._removeData(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=cb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return n().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=cb),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});function eb(a){var b=fb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var fb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gb=/ jQuery\d+="(?:null|\d+)"/g,hb=new RegExp("<(?:"+fb+")[\\s/>]","i"),ib=/^\s+/,jb=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,kb=/<([\w:]+)/,lb=/<tbody/i,mb=/<|&#?\w+;/,nb=/<(?:script|style|link)/i,ob=/checked\s*(?:[^=]|=\s*.checked.)/i,pb=/^$|\/(?:java|ecma)script/i,qb=/^true\/(.*)/,rb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,sb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:l.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},tb=eb(z),ub=tb.appendChild(z.createElement("div"));sb.optgroup=sb.option,sb.tbody=sb.tfoot=sb.colgroup=sb.caption=sb.thead,sb.th=sb.td;function vb(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==L?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==L?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,vb(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function wb(a){X.test(a.type)&&(a.defaultChecked=a.checked)}function xb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function yb(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function zb(a){var b=qb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ab(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}function Bb(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Cb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(yb(b).text=a.text,zb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&X.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}n.extend({clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!hb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ub.innerHTML=a.outerHTML,ub.removeChild(f=ub.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=vb(f),h=vb(a),g=0;null!=(e=h[g]);++g)d[g]&&Cb(e,d[g]);if(b)if(c)for(h=h||vb(a),d=d||vb(f),g=0;null!=(e=h[g]);g++)Bb(e,d[g]);else Bb(a,f);return d=vb(f,"script"),d.length>0&&Ab(d,!i&&vb(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k,m=a.length,o=eb(b),p=[],q=0;m>q;q++)if(f=a[q],f||0===f)if("object"===n.type(f))n.merge(p,f.nodeType?[f]:f);else if(mb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(kb.exec(f)||["",""])[1].toLowerCase(),k=sb[i]||sb._default,h.innerHTML=k[1]+f.replace(jb,"<$1></$2>")+k[2],e=k[0];while(e--)h=h.lastChild;if(!l.leadingWhitespace&&ib.test(f)&&p.push(b.createTextNode(ib.exec(f)[0])),!l.tbody){f="table"!==i||lb.test(f)?"<table>"!==k[1]||lb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)n.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}n.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),l.appendChecked||n.grep(vb(p,"input"),wb),q=0;while(f=p[q++])if((!d||-1===n.inArray(f,d))&&(g=n.contains(f.ownerDocument,f),h=vb(o.appendChild(f),"script"),g&&Ab(h),c)){e=0;while(f=h[e++])pb.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.deleteExpando,m=n.event.special;null!=(d=a[h]);h++)if((b||n.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k?delete d[i]:typeof d.removeAttribute!==L?d.removeAttribute(i):d[i]=null,c.push(f))}}}),n.fn.extend({text:function(a){return W(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||z).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(vb(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&Ab(vb(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(vb(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return W(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(gb,""):void 0;if(!("string"!=typeof a||nb.test(a)||!l.htmlSerialize&&hb.test(a)||!l.leadingWhitespace&&ib.test(a)||sb[(kb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(jb,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(vb(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(vb(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,k=this.length,m=this,o=k-1,p=a[0],q=n.isFunction(p);if(q||k>1&&"string"==typeof p&&!l.checkClone&&ob.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(k&&(i=n.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=n.map(vb(i,"script"),yb),f=g.length;k>j;j++)d=i,j!==o&&(d=n.clone(d,!0,!0),f&&n.merge(g,vb(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,n.map(g,zb),j=0;f>j;j++)d=g[j],pb.test(d.type||"")&&!n._data(d,"globalEval")&&n.contains(h,d)&&(d.src?n._evalUrl&&n._evalUrl(d.src):n.globalEval((d.text||d.textContent||d.innerHTML||"").replace(rb,"")));i=c=null}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],g=n(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Db,Eb={};function Fb(b,c){var d=n(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:n.css(d[0],"display");return d.detach(),e}function Gb(a){var b=z,c=Eb[a];return c||(c=Fb(a,b),"none"!==c&&c||(Db=(Db||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Db[0].contentWindow||Db[0].contentDocument).document,b.write(),b.close(),c=Fb(a,b),Db.detach()),Eb[a]=c),c}!function(){var a,b,c=z.createElement("div"),d="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";c.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=c.getElementsByTagName("a")[0],a.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(a.style.opacity),l.cssFloat=!!a.style.cssFloat,c.style.backgroundClip="content-box",c.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===c.style.backgroundClip,a=c=null,l.shrinkWrapBlocks=function(){var a,c,e,f;if(null==b){if(a=z.getElementsByTagName("body")[0],!a)return;f="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",c=z.createElement("div"),e=z.createElement("div"),a.appendChild(c).appendChild(e),b=!1,typeof e.style.zoom!==L&&(e.style.cssText=d+";width:1px;padding:1px;zoom:1",e.innerHTML="<div></div>",e.firstChild.style.width="5px",b=3!==e.offsetWidth),a.removeChild(c),a=c=e=null}return b}}();var Hb=/^margin/,Ib=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Jb,Kb,Lb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Jb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),Ib.test(g)&&Hb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):z.documentElement.currentStyle&&(Jb=function(a){return a.currentStyle},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ib.test(g)&&!Lb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Mb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h=z.createElement("div"),i="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",j="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";h.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",b=h.getElementsByTagName("a")[0],b.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(b.style.opacity),l.cssFloat=!!b.style.cssFloat,h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,b=h=null,n.extend(l,{reliableHiddenOffsets:function(){if(null!=c)return c;var a,b,d,e=z.createElement("div"),f=z.getElementsByTagName("body")[0];if(f)return e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=z.createElement("div"),a.style.cssText=i,f.appendChild(a).appendChild(e),e.innerHTML="<table><tr><td></td><td>t</td></tr></table>",b=e.getElementsByTagName("td"),b[0].style.cssText="padding:0;margin:0;border:0;display:none",d=0===b[0].offsetHeight,b[0].style.display="",b[1].style.display="none",c=d&&0===b[0].offsetHeight,f.removeChild(a),e=f=null,c},boxSizing:function(){return null==d&&k(),d},boxSizingReliable:function(){return null==e&&k(),e},pixelPosition:function(){return null==f&&k(),f},reliableMarginRight:function(){var b,c,d,e;if(null==g&&a.getComputedStyle){if(b=z.getElementsByTagName("body")[0],!b)return;c=z.createElement("div"),d=z.createElement("div"),c.style.cssText=i,b.appendChild(c).appendChild(d),e=d.appendChild(z.createElement("div")),e.style.cssText=d.style.cssText=j,e.style.marginRight=e.style.width="0",d.style.width="1px",g=!parseFloat((a.getComputedStyle(e,null)||{}).marginRight),b.removeChild(c)}return g}});function k(){var b,c,h=z.getElementsByTagName("body")[0];h&&(b=z.createElement("div"),c=z.createElement("div"),b.style.cssText=i,h.appendChild(b).appendChild(c),c.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:absolute;display:block;padding:1px;border:1px;width:4px;margin-top:1%;top:1%",n.swap(h,null!=h.style.zoom?{zoom:1}:{},function(){d=4===c.offsetWidth}),e=!0,f=!1,g=!0,a.getComputedStyle&&(f="1%"!==(a.getComputedStyle(c,null)||{}).top,e="4px"===(a.getComputedStyle(c,null)||{width:"4px"}).width),h.removeChild(b),c=h=null)}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Nb=/alpha\([^)]*\)/i,Ob=/opacity\s*=\s*([^)]*)/,Pb=/^(none|table(?!-c[ea]).+)/,Qb=new RegExp("^("+T+")(.*)$","i"),Rb=new RegExp("^([+-])=("+T+")","i"),Sb={position:"absolute",visibility:"hidden",display:"block"},Tb={letterSpacing:0,fontWeight:400},Ub=["Webkit","O","Moz","ms"];function Vb(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ub.length;while(e--)if(b=Ub[e]+c,b in a)return b;return d}function Wb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=n._data(d,"olddisplay",Gb(d.nodeName)))):f[g]||(e=V(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Xb(a,b,c){var d=Qb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Yb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Zb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Jb(a),g=l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Kb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ib.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Yb(a,b,c||(g?"border":"content"),d,f)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Kb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=Vb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Rb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]="",i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Vb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Kb(a,b,d)),"normal"===f&&b in Tb&&(f=Tb[b]),""===c||c?(e=parseFloat(f),c===!0||n.isNumeric(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?0===a.offsetWidth&&Pb.test(n.css(a,"display"))?n.swap(a,Sb,function(){return Zb(a,b,d)}):Zb(a,b,d):void 0},set:function(a,c,d){var e=d&&Jb(a);return Xb(a,c,d?Yb(a,b,d,l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Ob.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Nb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Nb.test(f)?f.replace(Nb,e):f+" "+e)}}),n.cssHooks.marginRight=Mb(l.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},Kb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Hb.test(a)||(n.cssHooks[a+b].set=Xb)}),n.fn.extend({css:function(a,b){return W(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Jb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)
-},a,b,arguments.length>1)},show:function(){return Wb(this,!0)},hide:function(){return Wb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function $b(a,b,c,d,e){return new $b.prototype.init(a,b,c,d,e)}n.Tween=$b,$b.prototype={constructor:$b,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=$b.propHooks[this.prop];return a&&a.get?a.get(this):$b.propHooks._default.get(this)},run:function(a){var b,c=$b.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):$b.propHooks._default.set(this),this}},$b.prototype.init.prototype=$b.prototype,$b.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},$b.propHooks.scrollTop=$b.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=$b.prototype.init,n.fx.step={};var _b,ac,bc=/^(?:toggle|show|hide)$/,cc=new RegExp("^(?:([+-])=|)("+T+")([a-z%]*)$","i"),dc=/queueHooks$/,ec=[jc],fc={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=cc.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&cc.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function gc(){return setTimeout(function(){_b=void 0}),_b=n.now()}function hc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=U[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function ic(a,b,c){for(var d,e=(fc[b]||[]).concat(fc["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function jc(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&V(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k=Gb(a.nodeName),"none"===j&&(j=k),"inline"===j&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==k?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],bc.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}if(!n.isEmptyObject(o)){r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=ic(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function kc(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function lc(a,b,c){var d,e,f=0,g=ec.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=_b||gc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:_b||gc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(kc(k,j.opts.specialEasing);g>f;f++)if(d=ec[f].call(j,a,k,j.opts))return d;return n.map(k,ic,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(lc,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],fc[c]=fc[c]||[],fc[c].unshift(b)},prefilter:function(a,b){b?ec.unshift(a):ec.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(V).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=lc(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&dc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(hc(b,!0),a,d,e)}}),n.each({slideDown:hc("show"),slideUp:hc("hide"),slideToggle:hc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(_b=n.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||n.fx.stop(),_b=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){ac||(ac=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(ac),ac=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e=z.createElement("div");e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=e.getElementsByTagName("a")[0],c=z.createElement("select"),d=c.appendChild(z.createElement("option")),b=e.getElementsByTagName("input")[0],a.style.cssText="top:1px",l.getSetAttribute="t"!==e.className,l.style=/top/.test(a.getAttribute("style")),l.hrefNormalized="/a"===a.getAttribute("href"),l.checkOn=!!b.value,l.optSelected=d.selected,l.enctype=!!z.createElement("form").enctype,c.disabled=!0,l.optDisabled=!d.disabled,b=z.createElement("input"),b.setAttribute("value",""),l.input=""===b.getAttribute("value"),b.value="t",b.setAttribute("type","radio"),l.radioValue="t"===b.value,a=b=c=d=e=null}();var mc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(mc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.text(a)}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(l.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)if(d=e[g],n.inArray(n.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var nc,oc,pc=n.expr.attrHandle,qc=/^(?:checked|selected)$/i,rc=l.getSetAttribute,sc=l.input;n.fn.extend({attr:function(a,b){return W(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===L?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?oc:nc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(F);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)?sc&&rc||!qc.test(c)?a[d]=!1:a[n.camelCase("default-"+c)]=a[d]=!1:n.attr(a,c,""),a.removeAttribute(rc?c:d)},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),oc={set:function(a,b,c){return b===!1?n.removeAttr(a,c):sc&&rc||!qc.test(c)?a.setAttribute(!rc&&n.propFix[c]||c,c):a[n.camelCase("default-"+c)]=a[c]=!0,c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=pc[b]||n.find.attr;pc[b]=sc&&rc||!qc.test(b)?function(a,b,d){var e,f;return d||(f=pc[b],pc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,pc[b]=f),e}:function(a,b,c){return c?void 0:a[n.camelCase("default-"+b)]?b.toLowerCase():null}}),sc&&rc||(n.attrHooks.value={set:function(a,b,c){return n.nodeName(a,"input")?void(a.defaultValue=b):nc&&nc.set(a,b,c)}}),rc||(nc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},pc.id=pc.name=pc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},n.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:nc.set},n.attrHooks.contenteditable={set:function(a,b,c){nc.set(a,""===b?!1:b,c)}},n.each(["width","height"],function(a,b){n.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),l.style||(n.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var tc=/^(?:input|select|textarea|button|object)$/i,uc=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return W(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return a=n.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):tc.test(a.nodeName)||uc.test(a.nodeName)&&a.href?0:-1}}}}),l.hrefNormalized||n.each(["href","src"],function(a,b){n.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this}),l.enctype||(n.propFix.enctype="encoding");var vc=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(F)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===L||"boolean"===c)&&(this.className&&n._data(this,"__className__",this.className),this.className=this.className||a===!1?"":n._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(vc," ").indexOf(b)>=0)return!0;return!1}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var wc=n.now(),xc=/\?/,yc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;n.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=n.trim(b+"");return e&&!n.trim(e.replace(yc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():n.error("Invalid JSON: "+b)},n.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var zc,Ac,Bc=/#.*$/,Cc=/([?&])_=[^&]*/,Dc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Ec=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Fc=/^(?:GET|HEAD)$/,Gc=/^\/\//,Hc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Ic={},Jc={},Kc="*/".concat("*");try{Ac=location.href}catch(Lc){Ac=z.createElement("a"),Ac.href="",Ac=Ac.href}zc=Hc.exec(Ac.toLowerCase())||[];function Mc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(F)||[];if(n.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nc(a,b,c,d){var e={},f=a===Jc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Oc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&n.extend(!0,a,c),a}function Pc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Qc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ac,type:"GET",isLocal:Ec.test(zc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Oc(Oc(a,n.ajaxSettings),b):Oc(n.ajaxSettings,a)},ajaxPrefilter:Mc(Ic),ajaxTransport:Mc(Jc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Dc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||Ac)+"").replace(Bc,"").replace(Gc,zc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(F)||[""],null==k.crossDomain&&(c=Hc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===zc[1]&&c[2]===zc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(zc[3]||("http:"===zc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),Nc(Ic,k,b,v),2===t)return v;h=k.global,h&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Fc.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(xc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Cc.test(e)?e.replace(Cc,"$1_="+wc++):e+(xc.test(e)?"&":"?")+"_="+wc++)),k.ifModified&&(n.lastModified[e]&&v.setRequestHeader("If-Modified-Since",n.lastModified[e]),n.etag[e]&&v.setRequestHeader("If-None-Match",n.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Kc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Nc(Jc,k,b,v)){v.readyState=1,h&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Pc(k,v,c)),u=Qc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(n.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){if(n.isFunction(a))return this.each(function(b){n(this).wrapAll(a.call(this,b))});if(this[0]){var b=n(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!l.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||n.css(a,"display"))},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var Rc=/%20/g,Sc=/\[\]$/,Tc=/\r?\n/g,Uc=/^(?:submit|button|image|reset|file)$/i,Vc=/^(?:input|select|textarea|keygen)/i;function Wc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Sc.test(a)?d(a,e):Wc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Wc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Wc(c,a[c],b,e);return d.join("&").replace(Rc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Vc.test(this.nodeName)&&!Uc.test(a)&&(this.checked||!X.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(Tc,"\r\n")}}):{name:b.name,value:c.replace(Tc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&$c()||_c()}:$c;var Xc=0,Yc={},Zc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Yc)Yc[a](void 0,!0)}),l.cors=!!Zc&&"withCredentials"in Zc,Zc=l.ajax=!!Zc,Zc&&n.ajaxTransport(function(a){if(!a.crossDomain||l.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Xc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Yc[g],b=void 0,f.onreadystatechange=n.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Yc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function $c(){try{return new a.XMLHttpRequest}catch(b){}}function _c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=z.head||n("head")[0]||z.documentElement;return{send:function(d,e){b=z.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var ad=[],bd=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=ad.pop()||n.expando+"_"+wc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(bd.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&bd.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(bd,"$1"+e):b.jsonp!==!1&&(b.url+=(xc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,ad.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||z;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var cd=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&cd)return cd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=a.slice(h,a.length),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&n.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var dd=a.document.documentElement;function ed(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?(typeof e.getBoundingClientRect!==L&&(d=e.getBoundingClientRect()),c=ed(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||dd;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||dd})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return W(this,function(a,d,e){var f=ed(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Mb(l.pixelPosition,function(a,c){return c?(c=Kb(a,b),Ib.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return W(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var fd=a.jQuery,gd=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=gd),b&&a.jQuery===n&&(a.jQuery=fd),n},typeof b===L&&(a.jQuery=a.$=n),n});

From 57fb4e0a340fbc7887fbc4922ce23127ce5e7640 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 12 May 2016 21:03:39 +0100
Subject: [PATCH 071/250] grab tablesorter lib with composer

---
 composer.json                       | 11 +++++++----
 ext/ext_manager/theme.php           |  7 +------
 lib/jquery.tablesorter-2.0.5.min.js |  2 --
 lib/shimmie.js                      |  3 ++-
 4 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 lib/jquery.tablesorter-2.0.5.min.js

diff --git a/composer.json b/composer.json
index 13de015a9..225a182bd 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,7 @@
 {
 	"type"    : "project",
 	"license" : "GPL-2.0",
+	"minimum-stability" : "dev",
 
 	"repositories" : [
 		{
@@ -24,13 +25,15 @@
 		"ifixit/php-akismet"  : "1.*",
 
 		"bower-asset/jquery"         : "1.12.3",
-		"bower-asset/jquery-timeago" : "1.5.2"
+		"bower-asset/jquery-timeago" : "1.5.2",
+		"bower-asset/tablesorter"    : "2.0.5"
 	},
 
 	"vendor-copy": {
-		"vendor/bower-asset/jquery/dist/jquery.min.js"        : "lib/vendor/js/jquery-1.12.3.min.js",
-		"vendor/bower-asset/jquery/dist/jquery.min.map"       : "lib/vendor/js/jquery-1.12.3.min.map",
-		"vendor/bower-asset/jquery-timeago/jquery.timeago.js" : "lib/vendor/js/jquery.timeago.js"
+		"vendor/bower-asset/jquery/dist/jquery.min.js"             : "lib/vendor/js/jquery-1.12.3.min.js",
+		"vendor/bower-asset/jquery/dist/jquery.min.map"            : "lib/vendor/js/jquery-1.12.3.min.map",
+		"vendor/bower-asset/jquery-timeago/jquery.timeago.js"      : "lib/vendor/js/jquery.timeago.js",
+		"vendor/bower-asset/tablesorter/jquery.tablesorter.min.js" : "lib/vendor/js/jquery.tablesorter.min.js"
 	},
 
 	"scripts": {
diff --git a/ext/ext_manager/theme.php b/ext/ext_manager/theme.php
index b138ac491..7d6bd4360 100644
--- a/ext/ext_manager/theme.php
+++ b/ext/ext_manager/theme.php
@@ -5,12 +5,7 @@ public function display_table(Page $page, /*array*/ $extensions, /*bool*/ $edita
 		$h_en = $editable ? "<th>Enabled</th>" : "";
 		$html = "
 			".make_form(make_link("ext_manager/set"))."
-				<script type='text/javascript'>
-				$(document).ready(function() {
-					$(\"#extensions\").tablesorter();
-				});
-				</script>
-				<table id='extensions' class='zebra'>
+				<table id='extensions' class='zebra sortable'>
 					<thead>
 						<tr>$h_en<th>Name</th><th>Description</th></tr>
 					</thead>
diff --git a/lib/jquery.tablesorter-2.0.5.min.js b/lib/jquery.tablesorter-2.0.5.min.js
deleted file mode 100644
index 942dc50d0..000000000
--- a/lib/jquery.tablesorter-2.0.5.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/** tablesorter v2.0.5 | http://tablesorter.com/ **/
-(function($){$.extend({tablesorter:new function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",cssChildRow:"expand-child",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,sortLocaleCompare:true,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'/\.|\,/g',onRenderHeader:null,selectorHeaders:'thead th',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}if(table.tBodies.length==0)return;var rows=table.tBodies[0].rows;if(rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i<l;i++){var p=false;if($.metadata&&($($headers[i]).metadata()&&$($headers[i]).metadata().sorter)){p=getParserById($($headers[i]).metadata().sorter);}else if((table.config.headers[i]&&table.config.headers[i].sorter)){p=getParserById(table.config.headers[i].sorter);}if(!p){p=detectParserForColumn(table,rows,-1,i);}if(table.config.debug){parsersDebug+="column:"+i+" parser:"+p.id+"\n";}list.push(p);}}if(table.config.debug){log(parsersDebug);}return list;};function detectParserForColumn(table,rows,rowIndex,cellIndex){var l=parsers.length,node=false,nodeValue=false,keepLooking=true;while(nodeValue==''&&keepLooking){rowIndex++;if(rows[rowIndex]){node=getNodeFromRowAndCellIndex(rows,rowIndex,cellIndex);nodeValue=trimAndGetNodeText(table.config,node);if(table.config.debug){log('Checking if value was empty on row:'+rowIndex);}}else{keepLooking=false;}}for(var i=1;i<l;i++){if(parsers[i].is(nodeValue,table,node)){return parsers[i];}}return parsers[0];}function getNodeFromRowAndCellIndex(rows,rowIndex,cellIndex){return rows[rowIndex].cells[cellIndex];}function trimAndGetNodeText(config,node){return $.trim(getElementText(config,node));}function getParserById(name){var l=parsers.length;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==name.toLowerCase()){return parsers[i];}}return false;}function buildCache(table){if(table.config.debug){var cacheTime=new Date();}var totalRows=(table.tBodies[0]&&table.tBodies[0].rows.length)||0,totalCells=(table.tBodies[0].rows[0]&&table.tBodies[0].rows[0].cells.length)||0,parsers=table.config.parsers,cache={row:[],normalized:[]};for(var i=0;i<totalRows;++i){var c=$(table.tBodies[0].rows[i]),cols=[];if(c.hasClass(table.config.cssChildRow)){cache.row[cache.row.length-1]=cache.row[cache.row.length-1].add(c);continue;}cache.row.push(c);for(var j=0;j<totalCells;++j){cols.push(parsers[j].format(getElementText(table.config,c[0].cells[j]),table,c[0].cells[j]));}cols.push(cache.normalized.length);cache.normalized.push(cols);cols=null;};if(table.config.debug){benchmark("Building cache for "+totalRows+" rows:",cacheTime);}return cache;};function getElementText(config,node){var text="";if(!node)return"";if(!config.supportsTextContent)config.supportsTextContent=node.textContent||false;if(config.textExtraction=="simple"){if(config.supportsTextContent){text=node.textContent;}else{if(node.childNodes[0]&&node.childNodes[0].hasChildNodes()){text=node.childNodes[0].innerHTML;}else{text=node.innerHTML;}}}else{if(typeof(config.textExtraction)=="function"){text=config.textExtraction(node);}else{text=$(node).text();}}return text;}function appendToTable(table,cache){if(table.config.debug){var appendTime=new Date()}var c=cache,r=c.row,n=c.normalized,totalRows=n.length,checkCell=(n[0].length-1),tableBody=$(table.tBodies[0]),rows=[];for(var i=0;i<totalRows;i++){var pos=n[i][checkCell];rows.push(r[pos]);if(!table.config.appender){var l=r[pos].length;for(var j=0;j<l;j++){tableBody[0].appendChild(r[pos][j]);}}}if(table.config.appender){table.config.appender(table,rows);}rows=null;if(table.config.debug){benchmark("Rebuilt table:",appendTime);}applyWidget(table);setTimeout(function(){$(table).trigger("sortEnd");},0);};function buildHeaders(table){if(table.config.debug){var time=new Date();}var meta=($.metadata)?true:false;var header_index=computeTableHeaderCellIndexes(table);$tableHeaders=$(table.config.selectorHeaders,table).each(function(index){this.column=header_index[this.parentNode.rowIndex+"-"+this.cellIndex];this.order=formatSortingOrder(table.config.sortInitialOrder);this.count=this.order;if(checkHeaderMetadata(this)||checkHeaderOptions(table,index))this.sortDisabled=true;if(checkHeaderOptionsSortingLocked(table,index))this.order=this.lockedOrder=checkHeaderOptionsSortingLocked(table,index);if(!this.sortDisabled){var $th=$(this).addClass(table.config.cssHeader);if(table.config.onRenderHeader)table.config.onRenderHeader.apply($th);}table.config.headerList[index]=this;});if(table.config.debug){benchmark("Built headers:",time);log($tableHeaders);}return $tableHeaders;};function computeTableHeaderCellIndexes(t){var matrix=[];var lookup={};var thead=t.getElementsByTagName('THEAD')[0];var trs=thead.getElementsByTagName('TR');for(var i=0;i<trs.length;i++){var cells=trs[i].cells;for(var j=0;j<cells.length;j++){var c=cells[j];var rowIndex=c.parentNode.rowIndex;var cellId=rowIndex+"-"+c.cellIndex;var rowSpan=c.rowSpan||1;var colSpan=c.colSpan||1; var firstAvailCol;if(typeof(matrix[rowIndex])=="undefined"){matrix[rowIndex]=[];}for(var k=0;k<matrix[rowIndex].length+1;k++){if(typeof(matrix[rowIndex][k])=="undefined"){firstAvailCol=k;break;}}lookup[cellId]=firstAvailCol;for(var k=rowIndex;k<rowIndex+rowSpan;k++){if(typeof(matrix[k])=="undefined"){matrix[k]=[];}var matrixrow=matrix[k];for(var l=firstAvailCol;l<firstAvailCol+colSpan;l++){matrixrow[l]="x";}}}}return lookup;}function checkCellColSpan(table,rows,row){var arr=[],r=table.tHead.rows,c=r[row].cells;for(var i=0;i<c.length;i++){var cell=c[i];if(cell.colSpan>1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function checkHeaderOptionsSortingLocked(table,i){if((table.config.headers[i])&&(table.config.headers[i].lockedOrder))return table.config.headers[i].lockedOrder;return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i<l;i++){getWidgetById(c[i]).format(table);}}function getWidgetById(name){var l=widgets.length;for(var i=0;i<l;i++){if(widgets[i].id.toLowerCase()==name.toLowerCase()){return widgets[i];}}};function formatSortingOrder(v){if(typeof(v)!="Number"){return(v.toLowerCase()=="desc")?1:0;}else{return(v==1)?1:0;}}function isValueInArray(v,a){var l=a.length;for(var i=0;i<l;i++){if(a[i][0]==v){return true;}}return false;}function setHeadersCss(table,$headers,list,css){$headers.removeClass(css[0]).removeClass(css[1]);var h=[];$headers.each(function(offset){if(!this.sortDisabled){h[this.column]=$(this);}});var l=list.length;for(var i=0;i<l;i++){h[list[i][0]].addClass(css[list[i][1]]);}}function fixColumnWidth(table,$headers){var c=table.config;if(c.widthFixed){var colgroup=$('<colgroup>');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('<col>').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i<l;i++){var s=sortList[i],o=c.headerList[s[0]];o.count=s[1];o.count++;}}function multisort(table,sortList,cache){if(table.config.debug){var sortTime=new Date();}var dynamicExp="var sortWrapper = function(a,b) {",l=sortList.length;for(var i=0;i<l;i++){var c=sortList[i][0];var order=sortList[i][1];var s=(table.config.parsers[c].type=="text")?((order==0)?makeSortFunction("text","asc",c):makeSortFunction("text","desc",c)):((order==0)?makeSortFunction("numeric","asc",c):makeSortFunction("numeric","desc",c));var e="e"+i;dynamicExp+="var "+e+" = "+s;dynamicExp+="if("+e+") { return "+e+"; } ";dynamicExp+="else { ";}var orgOrderCol=cache.normalized[0].length-1;dynamicExp+="return a["+orgOrderCol+"]-b["+orgOrderCol+"];";for(var i=0;i<l;i++){dynamicExp+="}; ";}dynamicExp+="return 0; ";dynamicExp+="}; ";if(table.config.debug){benchmark("Evaling expression:"+dynamicExp,new Date());}eval(dynamicExp);cache.normalized.sort(sortWrapper);if(table.config.debug){benchmark("Sorting on "+sortList.toString()+" and dir "+order+" time:",sortTime);}return cache;};function makeSortFunction(type,direction,index){var a="a["+index+"]",b="b["+index+"]";if(type=='text'&&direction=='asc'){return"("+a+" == "+b+" ? 0 : ("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : ("+a+" < "+b+") ? -1 : 1 )));";}else if(type=='text'&&direction=='desc'){return"("+a+" == "+b+" ? 0 : ("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : ("+b+" < "+a+") ? -1 : 1 )));";}else if(type=='numeric'&&direction=='asc'){return"("+a+" === null && "+b+" === null) ? 0 :("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : "+a+" - "+b+"));";}else if(type=='numeric'&&direction=='desc'){return"("+a+" === null && "+b+" === null) ? 0 :("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : "+b+" - "+a+"));";}};function makeSortText(i){return"((a["+i+"] < b["+i+"]) ? -1 : ((a["+i+"] > b["+i+"]) ? 1 : 0));";};function makeSortTextDesc(i){return"((b["+i+"] < a["+i+"]) ? -1 : ((b["+i+"] > a["+i+"]) ? 1 : 0));";};function makeSortNumeric(i){return"a["+i+"]-b["+i+"];";};function makeSortNumericDesc(i){return"b["+i+"]-a["+i+"];";};function sortText(a,b){if(table.config.sortLocaleCompare)return a.localeCompare(b);return((a<b)?-1:((a>b)?1:0));};function sortTextDesc(a,b){if(table.config.sortLocaleCompare)return b.localeCompare(a);return((b<a)?-1:((b>a)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$.data(this,"tablesorter",config);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){$this.trigger("sortStart");var $cell=$(this);var i=this.column;this.order=this.count++%2;if(this.lockedOrder)this.order=this.lockedOrder;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j<a.length;j++){if(a[j][0]!=i){config.sortList.push(a[j]);}}}config.sortList.push([i,this.order]);}else{if(isValueInArray(i,config.sortList)){for(var j=0;j<config.sortList.length;j++){var s=config.sortList[j],o=config.headerList[s[0]];if(s[0]==i){o.count=s[1];o.count++;s[1]=o.count%2;}}}else{config.sortList.push([i,this.order]);}};setTimeout(function(){setHeadersCss($this[0],$headers,config.sortList,sortCSS);appendToTable($this[0],multisort($this[0],config.sortList,cache));},1);return false;}}).mousedown(function(){if(config.cancelSelection){this.onselectstart=function(){return false};return false;}});$this.bind("update",function(){var me=this;setTimeout(function(){me.config.parsers=buildParserCache(me,$headers);cache=buildCache(me);},1);}).bind("updateCell",function(e,cell){var config=this.config;var pos=[(cell.parentNode.rowIndex-1),cell.cellIndex];cache.normalized[pos[0]][pos[1]]=config.parsers[pos[1]].format(getElementText(config,cell),cell);}).bind("sorton",function(e,list){$(this).trigger("sortStart");config.sortList=list;var sortList=config.sortList;updateHeaderSortCount(this,sortList);setHeadersCss(this,$headers,sortList,sortCSS);appendToTable(this,multisort(this,sortList,cache));}).bind("appendCache",function(){appendToTable(this,cache);}).bind("applyWidgetId",function(e,id){getWidgetById(id).format(this);}).bind("applyWidgets",function(){applyWidget(this);});if($.metadata&&($(this).metadata()&&$(this).metadata().sortlist)){config.sortList=$(this).metadata().sortlist;}if(config.sortList.length>0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==parser.id.toLowerCase()){a=false;}}if(a){parsers.push(parser);};};this.addWidget=function(widget){widgets.push(widget);};this.formatFloat=function(s){var i=parseFloat(s);return(isNaN(i))?0:i;};this.formatInt=function(s){var i=parseInt(s);return(isNaN(i))?0:i;};this.isDigit=function(s,config){return/^[-+]?\d*$/.test($.trim(s.replace(/[,.']/g,'')));};this.clearTableBody=function(table){if($.browser.msie){function empty(){while(this.firstChild)this.removeChild(this.firstChild);}empty.apply(table.tBodies[0]);}else{table.tBodies[0].innerHTML="";}};}});$.fn.extend({tablesorter:$.tablesorter.construct});var ts=$.tablesorter;ts.addParser({id:"text",is:function(s){return true;},format:function(s){return $.trim(s.toLocaleLowerCase());},type:"text"});ts.addParser({id:"digit",is:function(s,table){var c=table.config;return $.tablesorter.isDigit(s,c);},format:function(s){return $.tablesorter.formatFloat(s);},type:"numeric"});ts.addParser({id:"currency",is:function(s){return/^[£$€?.]/.test(s);},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/[£$€]/g),""));},type:"numeric"});ts.addParser({id:"ipAddress",is:function(s){return/^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s);},format:function(s){var a=s.split("."),r="",l=a.length;for(var i=0;i<l;i++){var item=a[i];if(item.length==2){r+="0"+item;}else{r+=item;}}return $.tablesorter.formatFloat(r);},type:"numeric"});ts.addParser({id:"url",is:function(s){return/^(https?|ftp|file):\/\/$/.test(s);},format:function(s){return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//),''));},type:"text"});ts.addParser({id:"isoDate",is:function(s){return/^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s);},format:function(s){return $.tablesorter.formatFloat((s!="")?new Date(s.replace(new RegExp(/-/g),"/")).getTime():"0");},type:"numeric"});ts.addParser({id:"percent",is:function(s){return/\%$/.test($.trim(s));},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g),""));},type:"numeric"});ts.addParser({id:"usLongDate",is:function(s){return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/));},format:function(s){return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"shortDate",is:function(s){return/\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s);},format:function(s,table){var c=table.config;s=s.replace(/\-/g,"/");if(c.dateFormat=="us"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$1/$2");}else if(c.dateFormat=="uk"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$2/$1");}else if(c.dateFormat=="dd/mm/yy"||c.dateFormat=="dd-mm-yy"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/,"$1/$2/$3");}return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"time",is:function(s){return/^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s);},format:function(s){return $.tablesorter.formatFloat(new Date("2000/01/01 "+s).getTime());},type:"numeric"});ts.addParser({id:"metadata",is:function(s){return false;},format:function(s,table,cell){var c=table.config,p=(!c.parserMetadataName)?'sortValue':c.parserMetadataName;return $(cell).metadata()[p];},type:"numeric"});ts.addWidget({id:"zebra",format:function(table){if(table.config.debug){var time=new Date();}var $tr,row=-1,odd;$("tr:visible",table.tBodies[0]).each(function(i){$tr=$(this);if(!$tr.hasClass(table.config.cssChildRow))row++;odd=(row%2==0);$tr.removeClass(table.config.widgetZebra.css[odd?0:1]).addClass(table.config.widgetZebra.css[odd?1:0])});if(table.config.debug){$.tablesorter.benchmark("Applying Zebra widget",time);}}});})(jQuery);
diff --git a/lib/shimmie.js b/lib/shimmie.js
index e573be3d2..979f9d78d 100644
--- a/lib/shimmie.js
+++ b/lib/shimmie.js
@@ -5,7 +5,8 @@ $(document).ready(function() {
 	jQuery.timeago.settings.cutoff = 365 * 24 * 60 * 60 * 1000; // Display original dates older than 1 year
 	$("time").timeago();
 
-	$("TABLE.sortable").tablesorter();
+	/** Setup tablesorter **/
+	$("table.sortable").tablesorter();
 
 	$(".shm-clink").each(function(idx, elm) {
 		var target_id = $(elm).data("clink-sel");

From d5a58916f70747ccc99825a1d2d98698ba6d4868 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 13 May 2016 16:42:07 +0100
Subject: [PATCH 072/250] get recaptcha lib with composer + fixes #498

---
 composer.json        |   1 +
 core/util.inc.php    |  17 ++-
 ext/setup/main.php   |   9 +-
 lib/recaptchalib.php | 277 -------------------------------------------
 4 files changed, 11 insertions(+), 293 deletions(-)
 delete mode 100644 lib/recaptchalib.php

diff --git a/composer.json b/composer.json
index 225a182bd..eaa22781b 100644
--- a/composer.json
+++ b/composer.json
@@ -23,6 +23,7 @@
 
 		"flexihash/flexihash" : "^2.0.0",
 		"ifixit/php-akismet"  : "1.*",
+		"google/recaptcha"    : "~1.1",
 
 		"bower-asset/jquery"         : "1.12.3",
 		"bower-asset/jquery-timeago" : "1.5.2",
diff --git a/core/util.inc.php b/core/util.inc.php
index c64509970..dcf7865bf 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -1,5 +1,4 @@
 <?php
-require_once "lib/recaptchalib.php";
 require_once "lib/securimage/securimage.php";
 require_once "lib/context.php";
 
@@ -633,7 +632,9 @@ function captcha_get_html() {
 	if($user->is_anonymous() && $config->get_bool("comment_captcha")) {
 		$r_publickey = $config->get_string("api_recaptcha_pubkey");
 		if(!empty($r_publickey)) {
-			$captcha = recaptcha_get_html($r_publickey);
+			$captcha = "
+				<div class=\"g-recaptcha\" data-sitekey=\"{$r_publickey}\"></div>
+				<script type=\"text/javascript\" src=\"https://www.google.com/recaptcha/api.js\"></script>";
 		}
 		else {
 			session_start();
@@ -657,15 +658,11 @@ function captcha_check() {
 	if($user->is_anonymous() && $config->get_bool("comment_captcha")) {
 		$r_privatekey = $config->get_string('api_recaptcha_privkey');
 		if(!empty($r_privatekey)) {
-			$resp = recaptcha_check_answer(
-				$r_privatekey,
-				$_SERVER["REMOTE_ADDR"],
-				$_POST["recaptcha_challenge_field"],
-				$_POST["recaptcha_response_field"]
-			);
+			$recaptcha = new \ReCaptcha\ReCaptcha($r_privatekey);
+			$resp = $recaptcha->verify($_POST['g-recaptcha-response'], $_SERVER['REMOTE_ADDR']);
 
-			if(!$resp->is_valid) {
-				log_info("core", "Captcha failed (ReCaptcha): " . $resp->error);
+			if(!$resp->isSuccess()) {
+				log_info("core", "Captcha failed (ReCaptcha): " . implode("", $resp->getErrorCodes()));
 				return false;
 			}
 		}
diff --git a/ext/setup/main.php b/ext/setup/main.php
index e069b6dd7..751b202f9 100644
--- a/ext/setup/main.php
+++ b/ext/setup/main.php
@@ -308,12 +308,9 @@ function getHTTPObject() {
 		$sb = new SetupBlock("Remote API Integration");
 		$sb->add_label("<a href='http://akismet.com/'>Akismet</a>");
 		$sb->add_text_option("comment_wordpress_key", "<br>API key: ");
-		$sb->add_label(
-			"<br>&nbsp;<br><a href='".
-			recaptcha_get_signup_url($_SERVER["HTTP_HOST"], "Shimmie").
-			"'>ReCAPTCHA</a>");
-		$sb->add_text_option("api_recaptcha_privkey", "<br>Private key: ");
-		$sb->add_text_option("api_recaptcha_pubkey", "<br>Public key: ");
+		$sb->add_label("<br>&nbsp;<br><a href='https://www.google.com/recaptcha/admin'>ReCAPTCHA</a>");
+		$sb->add_text_option("api_recaptcha_privkey", "<br>Secret key: ");
+		$sb->add_text_option("api_recaptcha_pubkey", "<br>Site key: ");
 		$event->panel->add_block($sb);
 	}
 
diff --git a/lib/recaptchalib.php b/lib/recaptchalib.php
deleted file mode 100644
index 32c4f4d75..000000000
--- a/lib/recaptchalib.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/*
- * This is a PHP library that handles calling reCAPTCHA.
- *    - Documentation and latest version
- *          http://recaptcha.net/plugins/php/
- *    - Get a reCAPTCHA API Key
- *          https://www.google.com/recaptcha/admin/create
- *    - Discussion group
- *          http://groups.google.com/group/recaptcha
- *
- * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
- * AUTHORS:
- *   Mike Crawford
- *   Ben Maurer
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * The reCAPTCHA server URL's
- */
-define("RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api");
-define("RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api");
-define("RECAPTCHA_VERIFY_SERVER", "www.google.com");
-
-/**
- * Encodes the given data into a query string format
- * @param $data - array of string elements to be encoded
- * @return string - encoded request
- */
-function _recaptcha_qsencode ($data) {
-        $req = "";
-        foreach ( $data as $key => $value )
-                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
-
-        // Cut the last '&'
-        $req=substr($req,0,strlen($req)-1);
-        return $req;
-}
-
-
-
-/**
- * Submits an HTTP POST to a reCAPTCHA server
- * @param string $host
- * @param string $path
- * @param array $data
- * @param int port
- * @return array response
- */
-function _recaptcha_http_post($host, $path, $data, $port = 80) {
-
-        $req = _recaptcha_qsencode ($data);
-
-        $http_request  = "POST $path HTTP/1.0\r\n";
-        $http_request .= "Host: $host\r\n";
-        $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-        $http_request .= "Content-Length: " . strlen($req) . "\r\n";
-        $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
-        $http_request .= "\r\n";
-        $http_request .= $req;
-
-        $response = '';
-        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
-                die ('Could not open socket');
-        }
-
-        fwrite($fs, $http_request);
-
-        while ( !feof($fs) )
-                $response .= fgets($fs, 1160); // One TCP-IP packet
-        fclose($fs);
-        $response = explode("\r\n\r\n", $response, 2);
-
-        return $response;
-}
-
-
-
-/**
- * Gets the challenge HTML (javascript and non-javascript version).
- * This is called from the browser, and the resulting reCAPTCHA HTML widget
- * is embedded within the HTML form it was called from.
- * @param string $pubkey A public key for reCAPTCHA
- * @param string $error The error given by reCAPTCHA (optional, default is null)
- * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
-
- * @return string - The HTML to be embedded in the user's form.
- */
-function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
-{
-	if ($pubkey == null || $pubkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
-	}
-	
-	if ($use_ssl) {
-                $server = RECAPTCHA_API_SECURE_SERVER;
-        } else {
-                $server = RECAPTCHA_API_SERVER;
-        }
-
-        $errorpart = "";
-        if ($error) {
-           $errorpart = "&amp;error=" . $error;
-        }
-        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
-
-	<noscript>
-  		<iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
-  		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-  		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
-	</noscript>';
-}
-
-
-
-
-/**
- * A ReCaptchaResponse is returned from recaptcha_check_answer()
- */
-class ReCaptchaResponse {
-        var $is_valid;
-        var $error;
-}
-
-
-/**
-  * Calls an HTTP POST function to verify if the user's guess was correct
-  * @param string $privkey
-  * @param string $remoteip
-  * @param string $challenge
-  * @param string $response
-  * @param array $extra_params an array of extra variables to post to the server
-  * @return ReCaptchaResponse
-  */
-function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
-{
-	if ($privkey == null || $privkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
-	}
-
-	if ($remoteip == null || $remoteip == '') {
-		die ("For security reasons, you must pass the remote ip to reCAPTCHA");
-	}
-
-	
-	
-        //discard spam submissions
-        if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
-                $recaptcha_response = new ReCaptchaResponse();
-                $recaptcha_response->is_valid = false;
-                $recaptcha_response->error = 'incorrect-captcha-sol';
-                return $recaptcha_response;
-        }
-
-        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
-                                          array (
-                                                 'privatekey' => $privkey,
-                                                 'remoteip' => $remoteip,
-                                                 'challenge' => $challenge,
-                                                 'response' => $response
-                                                 ) + $extra_params
-                                          );
-
-        $answers = explode ("\n", $response [1]);
-        $recaptcha_response = new ReCaptchaResponse();
-
-        if (trim ($answers [0]) == 'true') {
-                $recaptcha_response->is_valid = true;
-        }
-        else {
-                $recaptcha_response->is_valid = false;
-                $recaptcha_response->error = $answers [1];
-        }
-        return $recaptcha_response;
-
-}
-
-/**
- * gets a URL where the user can sign up for reCAPTCHA. If your application
- * has a configuration page where you enter a key, you should provide a link
- * using this function.
- * @param string $domain The domain where the page is hosted
- * @param string $appname The name of your application
- */
-function recaptcha_get_signup_url ($domain = null, $appname = null) {
-	return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
-}
-
-function _recaptcha_aes_pad($val) {
-	$block_size = 16;
-	$numpad = $block_size - (strlen ($val) % $block_size);
-	return str_pad($val, strlen ($val) + $numpad, chr($numpad));
-}
-
-/* Mailhide related code */
-
-function _recaptcha_aes_encrypt($val,$ky) {
-	if (! function_exists ("mcrypt_encrypt")) {
-		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
-	}
-	$mode=MCRYPT_MODE_CBC;   
-	$enc=MCRYPT_RIJNDAEL_128;
-	$val=_recaptcha_aes_pad($val);
-	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
-}
-
-
-function _recaptcha_mailhide_urlbase64 ($x) {
-	return strtr(base64_encode ($x), '+/', '-_');
-}
-
-/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
-function recaptcha_mailhide_url($pubkey, $privkey, $email) {
-	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
-		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
-		     "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
-	}
-	
-
-	$ky = pack('H*', $privkey);
-	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
-	
-	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
-}
-
-/**
- * gets the parts of the email to expose to the user.
- * eg, given johndoe@example,com return ["john", "example.com"].
- * the email is then displayed as john...@example.com
- */
-function _recaptcha_mailhide_email_parts ($email) {
-	$arr = preg_split("/@/", $email );
-
-	if (strlen ($arr[0]) <= 4) {
-		$arr[0] = substr ($arr[0], 0, 1);
-	} else if (strlen ($arr[0]) <= 6) {
-		$arr[0] = substr ($arr[0], 0, 3);
-	} else {
-		$arr[0] = substr ($arr[0], 0, 4);
-	}
-	return $arr;
-}
-
-/**
- * Gets html to display an email address given a public an private key.
- * to get a key, go to:
- *
- * http://www.google.com/recaptcha/mailhide/apikey
- */
-function recaptcha_mailhide_html($pubkey, $privkey, $email) {
-	$emailparts = _recaptcha_mailhide_email_parts ($email);
-	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
-	
-	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
-		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
-
-}
-
-
-?>

From ba6ab8fb16251de711c9f283132c58d8ff54a779 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 13 May 2016 16:52:37 +0100
Subject: [PATCH 073/250] move S3.lib to ext folder toggleable exts should
 really keep any libs they use in their own dir

---
 {lib => ext/amazon_s3}/S3.php | 1542 +++++++++++++++++++++++++++------
 ext/amazon_s3/main.php        |    2 +-
 2 files changed, 1284 insertions(+), 260 deletions(-)
 rename {lib => ext/amazon_s3}/S3.php (51%)

diff --git a/lib/S3.php b/ext/amazon_s3/S3.php
similarity index 51%
rename from lib/S3.php
rename to ext/amazon_s3/S3.php
index 66a8fcbf6..660844c4f 100644
--- a/lib/S3.php
+++ b/ext/amazon_s3/S3.php
@@ -1,8 +1,8 @@
 <?php
 /**
-* $Id: S3.php 47 2009-07-20 01:25:40Z don.schonknecht $
+* $Id$
 *
-* Copyright (c) 2008, Donovan Schönknecht.  All rights reserved.
+* Copyright (c) 2013, Donovan Schönknecht.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
@@ -32,19 +32,163 @@
 * Amazon S3 PHP class
 *
 * @link http://undesigned.org.za/2007/10/22/amazon-s3-php-class
-* @version 0.4.0
+* @version 0.5.1
 */
-class S3 {
+class S3
+{
 	// ACL flags
 	const ACL_PRIVATE = 'private';
 	const ACL_PUBLIC_READ = 'public-read';
 	const ACL_PUBLIC_READ_WRITE = 'public-read-write';
 	const ACL_AUTHENTICATED_READ = 'authenticated-read';
 
-	public static $useSSL = true;
+	const STORAGE_CLASS_STANDARD = 'STANDARD';
+	const STORAGE_CLASS_RRS = 'REDUCED_REDUNDANCY';
+	const STORAGE_CLASS_STANDARD_IA = 'STANDARD_IA';
 
-	private static $__accessKey; // AWS Access key
-	private static $__secretKey; // AWS Secret key
+	const SSE_NONE = '';
+	const SSE_AES256 = 'AES256';
+
+	/**
+	 * The AWS Access key
+	 *
+	 * @var string
+	 * @access private
+	 * @static
+	 */
+	private static $__accessKey = null;
+
+	/**
+	 * AWS Secret Key
+	 *
+	 * @var string
+	 * @access private
+	 * @static
+	 */
+	private static $__secretKey = null;
+
+	/**
+	 * SSL Client key
+	 *
+	 * @var string
+	 * @access private
+	 * @static
+	 */
+	private static $__sslKey = null;
+
+	/**
+	 * Default delimiter to be used, for example while getBucket().
+	 * @var string
+	 * @access public
+	 * @static 
+	 */
+	public static $defDelimiter = null;
+
+	/**
+	 * AWS URI
+	 *
+	 * @var string
+	 * @acess public
+	 * @static
+	 */
+	public static $endpoint = 's3.amazonaws.com';
+
+	/**
+	 * Proxy information
+	 *
+	 * @var null|array
+	 * @access public
+	 * @static
+	 */
+	public static $proxy = null;
+
+	/**
+	 * Connect using SSL?
+	 *
+	 * @var bool
+	 * @access public
+	 * @static
+	 */
+	public static $useSSL = false;
+
+	/**
+	 * Use SSL validation?
+	 *
+	 * @var bool
+	 * @access public
+	 * @static
+	 */
+	public static $useSSLValidation = true;
+
+	/**
+	 * Use SSL version
+	 *
+	 * @var const
+	 * @access public
+	 * @static
+	 */
+	public static $useSSLVersion = CURL_SSLVERSION_TLSv1;
+
+	/**
+	 * Use PHP exceptions?
+	 *
+	 * @var bool
+	 * @access public
+	 * @static
+	 */
+	public static $useExceptions = false;
+
+	/**
+	 * Time offset applied to time()
+	 * @access private
+	 * @static
+	 */
+	private static $__timeOffset = 0;
+
+	/**
+	 * SSL client key
+	 *
+	 * @var bool
+	 * @access public
+	 * @static
+	 */
+	public static $sslKey = null;
+	
+	/**
+	 * SSL client certfificate
+	 *
+	 * @var string
+	 * @acess public
+	 * @static
+	 */
+	public static $sslCert = null;
+	
+	/**
+	 * SSL CA cert (only required if you are having problems with your system CA cert)
+	 *
+	 * @var string
+	 * @access public
+	 * @static
+	 */
+	public static $sslCACert = null;
+	
+	/**
+	 * AWS Key Pair ID
+	 *
+	 * @var string
+	 * @access private
+	 * @static
+	 */
+	private static $__signingKeyPairId = null;
+	
+	/**
+	 * Key resource, freeSigningKey() must be called to clear it from memory
+	 *
+	 * @var bool
+	 * @access private
+	 * @static 
+	 */
+	private static $__signingKeyResource = false;
 
 
 	/**
@@ -53,12 +197,27 @@ class S3 {
 	* @param string $accessKey Access key
 	* @param string $secretKey Secret key
 	* @param boolean $useSSL Enable SSL
+	* @param string $endpoint Amazon URI
 	* @return void
 	*/
-	public function __construct($accessKey = null, $secretKey = null, $useSSL = true) {
+	public function __construct($accessKey = null, $secretKey = null, $useSSL = false, $endpoint = 's3.amazonaws.com')
+	{
 		if ($accessKey !== null && $secretKey !== null)
 			self::setAuth($accessKey, $secretKey);
 		self::$useSSL = $useSSL;
+		self::$endpoint = $endpoint;
+	}
+
+
+	/**
+	* Set the service endpoint
+	*
+	* @param string $host Hostname
+	* @return void
+	*/
+	public function setEndpoint($host)
+	{
+		self::$endpoint = $host;
 	}
 
 
@@ -69,34 +228,179 @@ public function __construct($accessKey = null, $secretKey = null, $useSSL = true
 	* @param string $secretKey Secret key
 	* @return void
 	*/
-	public static function setAuth($accessKey, $secretKey) {
+	public static function setAuth($accessKey, $secretKey)
+	{
 		self::$__accessKey = $accessKey;
 		self::$__secretKey = $secretKey;
 	}
 
 
+	/**
+	* Check if AWS keys have been set
+	*
+	* @return boolean
+	*/
+	public static function hasAuth() {
+		return (self::$__accessKey !== null && self::$__secretKey !== null);
+	}
+
+
+	/**
+	* Set SSL on or off
+	*
+	* @param boolean $enabled SSL enabled
+	* @param boolean $validate SSL certificate validation
+	* @return void
+	*/
+	public static function setSSL($enabled, $validate = true)
+	{
+		self::$useSSL = $enabled;
+		self::$useSSLValidation = $validate;
+	}
+
+
+	/**
+	* Set SSL client certificates (experimental)
+	*
+	* @param string $sslCert SSL client certificate
+	* @param string $sslKey SSL client key
+	* @param string $sslCACert SSL CA cert (only required if you are having problems with your system CA cert)
+	* @return void
+	*/
+	public static function setSSLAuth($sslCert = null, $sslKey = null, $sslCACert = null)
+	{
+		self::$sslCert = $sslCert;
+		self::$sslKey = $sslKey;
+		self::$sslCACert = $sslCACert;
+	}
+
+
+	/**
+	* Set proxy information
+	*
+	* @param string $host Proxy hostname and port (localhost:1234)
+	* @param string $user Proxy username
+	* @param string $pass Proxy password
+	* @param constant $type CURL proxy type
+	* @return void
+	*/
+	public static function setProxy($host, $user = null, $pass = null, $type = CURLPROXY_SOCKS5)
+	{
+		self::$proxy = array('host' => $host, 'type' => $type, 'user' => $user, 'pass' => $pass);
+	}
+
+
+	/**
+	* Set the error mode to exceptions
+	*
+	* @param boolean $enabled Enable exceptions
+	* @return void
+	*/
+	public static function setExceptions($enabled = true)
+	{
+		self::$useExceptions = $enabled;
+	}
+
+
+	/**
+	* Set AWS time correction offset (use carefully)
+	*
+	* This can be used when an inaccurate system time is generating
+	* invalid request signatures.  It should only be used as a last
+	* resort when the system time cannot be changed.
+	*
+	* @param string $offset Time offset (set to zero to use AWS server time)
+	* @return void
+	*/
+	public static function setTimeCorrectionOffset($offset = 0)
+	{
+		if ($offset == 0)
+		{
+			$rest = new S3Request('HEAD');
+			$rest = $rest->getResponse();
+			$awstime = $rest->headers['date'];
+			$systime = time();			
+			$offset = $systime > $awstime ? -($systime - $awstime) : ($awstime - $systime);
+		}
+		self::$__timeOffset = $offset;
+	}
+
+
+	/**
+	* Set signing key
+	*
+	* @param string $keyPairId AWS Key Pair ID
+	* @param string $signingKey Private Key
+	* @param boolean $isFile Load private key from file, set to false to load string
+	* @return boolean
+	*/
+	public static function setSigningKey($keyPairId, $signingKey, $isFile = true)
+	{
+		self::$__signingKeyPairId = $keyPairId;
+		if ((self::$__signingKeyResource = openssl_pkey_get_private($isFile ?
+		file_get_contents($signingKey) : $signingKey)) !== false) return true;
+		self::__triggerError('S3::setSigningKey(): Unable to open load private key: '.$signingKey, __FILE__, __LINE__);
+		return false;
+	}
+
+
+	/**
+	* Free signing key from memory, MUST be called if you are using setSigningKey()
+	*
+	* @return void
+	*/
+	public static function freeSigningKey()
+	{
+		if (self::$__signingKeyResource !== false)
+			openssl_free_key(self::$__signingKeyResource);
+	}
+
+
+	/**
+	* Internal error handler
+	*
+	* @internal Internal error handler
+	* @param string $message Error message
+	* @param string $file Filename
+	* @param integer $line Line number
+	* @param integer $code Error code
+	* @return void
+	*/
+	private static function __triggerError($message, $file, $line, $code = 0)
+	{
+		if (self::$useExceptions)
+			throw new S3Exception($message, $file, $line, $code);
+		else
+			trigger_error($message, E_USER_WARNING);
+	}
+
+
 	/**
 	* Get a list of buckets
 	*
 	* @param boolean $detailed Returns detailed bucket list when true
 	* @return array | false
 	*/
-	public static function listBuckets($detailed = false) {
-		$rest = new S3Request('GET', '', '');
+	public static function listBuckets($detailed = false)
+	{
+		$rest = new S3Request('GET', '', '', self::$endpoint);
 		$rest = $rest->getResponse();
 		if ($rest->error === false && $rest->code !== 200)
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::listBuckets(): [%s] %s", $rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::listBuckets(): [%s] %s", $rest->error['code'],
+			$rest->error['message']), __FILE__, __LINE__);
 			return false;
 		}
 		$results = array();
 		if (!isset($rest->body->Buckets)) return $results;
 
-		if ($detailed) {
+		if ($detailed)
+		{
 			if (isset($rest->body->Owner, $rest->body->Owner->ID, $rest->body->Owner->DisplayName))
 			$results['owner'] = array(
-				'id' => (string)$rest->body->Owner->ID, 'name' => (string)$rest->body->Owner->ID
+				'id' => (string)$rest->body->Owner->ID, 'name' => (string)$rest->body->Owner->DisplayName
 			);
 			$results['buckets'] = array();
 			foreach ($rest->body->Buckets->Bucket as $b)
@@ -110,7 +414,7 @@ public static function listBuckets($detailed = false) {
 	}
 
 
-	/*
+	/**
 	* Get contents for a bucket
 	*
 	* If maxKeys is null this method will loop through truncated result sets
@@ -123,17 +427,22 @@ public static function listBuckets($detailed = false) {
 	* @param boolean $returnCommonPrefixes Set to true to return CommonPrefixes
 	* @return array | false
 	*/
-	public static function getBucket($bucket, $prefix = null, $marker = null, $maxKeys = null, $delimiter = null, $returnCommonPrefixes = false) {
-		$rest = new S3Request('GET', $bucket, '');
+	public static function getBucket($bucket, $prefix = null, $marker = null, $maxKeys = null, $delimiter = null, $returnCommonPrefixes = false)
+	{
+		$rest = new S3Request('GET', $bucket, '', self::$endpoint);
+		if ($maxKeys == 0) $maxKeys = null;
 		if ($prefix !== null && $prefix !== '') $rest->setParameter('prefix', $prefix);
 		if ($marker !== null && $marker !== '') $rest->setParameter('marker', $marker);
 		if ($maxKeys !== null && $maxKeys !== '') $rest->setParameter('max-keys', $maxKeys);
 		if ($delimiter !== null && $delimiter !== '') $rest->setParameter('delimiter', $delimiter);
+		else if (!empty(self::$defDelimiter)) $rest->setParameter('delimiter', self::$defDelimiter);
 		$response = $rest->getResponse();
 		if ($response->error === false && $response->code !== 200)
 			$response->error = array('code' => $response->code, 'message' => 'Unexpected HTTP status');
-		if ($response->error !== false) {
-			trigger_error(sprintf("S3::getBucket(): [%s] %s", $response->error['code'], $response->error['message']), E_USER_WARNING);
+		if ($response->error !== false)
+		{
+			self::__triggerError(sprintf("S3::getBucket(): [%s] %s",
+			$response->error['code'], $response->error['message']), __FILE__, __LINE__);
 			return false;
 		}
 
@@ -141,7 +450,8 @@ public static function getBucket($bucket, $prefix = null, $marker = null, $maxKe
 
 		$nextMarker = null;
 		if (isset($response->body, $response->body->Contents))
-		foreach ($response->body->Contents as $c) {
+		foreach ($response->body->Contents as $c)
+		{
 			$results[(string)$c->Key] = array(
 				'name' => (string)$c->Key,
 				'time' => strtotime((string)$c->LastModified),
@@ -163,16 +473,18 @@ public static function getBucket($bucket, $prefix = null, $marker = null, $maxKe
 
 		// Loop through truncated results if maxKeys isn't specified
 		if ($maxKeys == null && $nextMarker !== null && (string)$response->body->IsTruncated == 'true')
-		do {
-			$rest = new S3Request('GET', $bucket, '');
+		do
+		{
+			$rest = new S3Request('GET', $bucket, '', self::$endpoint);
 			if ($prefix !== null && $prefix !== '') $rest->setParameter('prefix', $prefix);
 			$rest->setParameter('marker', $nextMarker);
 			if ($delimiter !== null && $delimiter !== '') $rest->setParameter('delimiter', $delimiter);
 
-			if (($response = $rest->getResponse(true)) == false || $response->code !== 200) break;
+			if (($response = $rest->getResponse()) == false || $response->code !== 200) break;
 
 			if (isset($response->body, $response->body->Contents))
-			foreach ($response->body->Contents as $c) {
+			foreach ($response->body->Contents as $c)
+			{
 				$results[(string)$c->Key] = array(
 					'name' => (string)$c->Key,
 					'time' => strtotime((string)$c->LastModified),
@@ -203,14 +515,16 @@ public static function getBucket($bucket, $prefix = null, $marker = null, $maxKe
 	* @param string $location Set as "EU" to create buckets hosted in Europe
 	* @return boolean
 	*/
-	public static function putBucket($bucket, $acl = self::ACL_PRIVATE, $location = false) {
-		$rest = new S3Request('PUT', $bucket, '');
+	public static function putBucket($bucket, $acl = self::ACL_PRIVATE, $location = false)
+	{
+		$rest = new S3Request('PUT', $bucket, '', self::$endpoint);
 		$rest->setAmzHeader('x-amz-acl', $acl);
 
-		if ($location !== false) {
+		if ($location !== false)
+		{
 			$dom = new DOMDocument;
 			$createBucketConfiguration = $dom->createElement('CreateBucketConfiguration');
-			$locationConstraint = $dom->createElement('LocationConstraint', strtoupper($location));
+			$locationConstraint = $dom->createElement('LocationConstraint', $location);
 			$createBucketConfiguration->appendChild($locationConstraint);
 			$dom->appendChild($createBucketConfiguration);
 			$rest->data = $dom->saveXML();
@@ -221,9 +535,10 @@ public static function putBucket($bucket, $acl = self::ACL_PRIVATE, $location =
 
 		if ($rest->error === false && $rest->code !== 200)
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::putBucket({$bucket}, {$acl}, {$location}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::putBucket({$bucket}, {$acl}, {$location}): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
 			return false;
 		}
 		return true;
@@ -236,14 +551,16 @@ public static function putBucket($bucket, $acl = self::ACL_PRIVATE, $location =
 	* @param string $bucket Bucket name
 	* @return boolean
 	*/
-	public static function deleteBucket($bucket) {
-		$rest = new S3Request('DELETE', $bucket);
+	public static function deleteBucket($bucket)
+	{
+		$rest = new S3Request('DELETE', $bucket, '', self::$endpoint);
 		$rest = $rest->getResponse();
 		if ($rest->error === false && $rest->code !== 204)
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::deleteBucket({$bucket}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::deleteBucket({$bucket}): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
 			return false;
 		}
 		return true;
@@ -257,14 +574,16 @@ public static function deleteBucket($bucket) {
 	* @param mixed $md5sum Use MD5 hash (supply a string if you want to use your own)
 	* @return array | false
 	*/
-	public static function inputFile($file, $md5sum = true) {
-		if (!file_exists($file) || !is_file($file) || !is_readable($file)) {
-			trigger_error('S3::inputFile(): Unable to open input file: '.$file, E_USER_WARNING);
+	public static function inputFile($file, $md5sum = true)
+	{
+		if (!file_exists($file) || !is_file($file) || !is_readable($file))
+		{
+			self::__triggerError('S3::inputFile(): Unable to open input file: '.$file, __FILE__, __LINE__);
 			return false;
 		}
-		return array('file' => $file, 'size' => filesize($file),
-		'md5sum' => $md5sum !== false ? (is_string($md5sum) ? $md5sum :
-		base64_encode(md5_file($file, true))) : '');
+		clearstatcache(false, $file);
+		return array('file' => $file, 'size' => filesize($file), 'md5sum' => $md5sum !== false ?
+		(is_string($md5sum) ? $md5sum : base64_encode(md5_file($file, true))) : '');
 	}
 
 
@@ -276,11 +595,25 @@ public static function inputFile($file, $md5sum = true) {
 	* @param string $md5sum MD5 hash to send (optional)
 	* @return array | false
 	*/
-	public static function inputResource(&$resource, $bufferSize, $md5sum = '') {
-		if (!is_resource($resource) || $bufferSize < 0) {
-			trigger_error('S3::inputResource(): Invalid resource or buffer size', E_USER_WARNING);
+	public static function inputResource(&$resource, $bufferSize = false, $md5sum = '')
+	{
+		if (!is_resource($resource) || (int)$bufferSize < 0)
+		{
+			self::__triggerError('S3::inputResource(): Invalid resource or buffer size', __FILE__, __LINE__);
 			return false;
 		}
+
+		// Try to figure out the bytesize
+		if ($bufferSize === false)
+		{
+			if (fseek($resource, 0, SEEK_END) < 0 || ($bufferSize = ftell($resource)) === false)
+			{
+				self::__triggerError('S3::inputResource(): Unable to obtain resource size', __FILE__, __LINE__);
+				return false;
+			}
+			fseek($resource, 0);
+		}
+
 		$input = array('size' => $bufferSize, 'md5sum' => $md5sum);
 		$input['fp'] =& $resource;
 		return $input;
@@ -296,13 +629,16 @@ public static function inputResource(&$resource, $bufferSize, $md5sum = '') {
 	* @param constant $acl ACL constant
 	* @param array $metaHeaders Array of x-amz-meta-* headers
 	* @param array $requestHeaders Array of request headers or content type as a string
+	* @param constant $storageClass Storage class constant
+	* @param constant $serverSideEncryption Server-side encryption
 	* @return boolean
 	*/
-	public static function putObject($input, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $requestHeaders = array()) {
+	public static function putObject($input, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $requestHeaders = array(), $storageClass = self::STORAGE_CLASS_STANDARD, $serverSideEncryption = self::SSE_NONE)
+	{
 		if ($input === false) return false;
-		$rest = new S3Request('PUT', $bucket, $uri);
+		$rest = new S3Request('PUT', $bucket, $uri, self::$endpoint);
 
-		if (is_string($input)) $input = array(
+		if (!is_array($input)) $input = array(
 			'data' => $input, 'size' => strlen($input),
 			'md5sum' => base64_encode(md5($input, true))
 		);
@@ -319,30 +655,41 @@ public static function putObject($input, $bucket, $uri, $acl = self::ACL_PRIVATE
 		if (isset($input['size']) && $input['size'] >= 0)
 			$rest->size = $input['size'];
 		else {
-			if (isset($input['file']))
+			if (isset($input['file'])) {
+				clearstatcache(false, $input['file']);
 				$rest->size = filesize($input['file']);
+			}
 			elseif (isset($input['data']))
 				$rest->size = strlen($input['data']);
 		}
 
 		// Custom request headers (Content-Type, Content-Disposition, Content-Encoding)
 		if (is_array($requestHeaders))
-			foreach ($requestHeaders as $h => $v) $rest->setHeader($h, $v);
+			foreach ($requestHeaders as $h => $v)
+				strpos($h, 'x-amz-') === 0 ? $rest->setAmzHeader($h, $v) : $rest->setHeader($h, $v);
 		elseif (is_string($requestHeaders)) // Support for legacy contentType parameter
 			$input['type'] = $requestHeaders;
 
 		// Content-Type
-		if (!isset($input['type'])) {
+		if (!isset($input['type']))
+		{
 			if (isset($requestHeaders['Content-Type']))
 				$input['type'] =& $requestHeaders['Content-Type'];
 			elseif (isset($input['file']))
-				$input['type'] = self::__getMimeType($input['file']);
+				$input['type'] = self::__getMIMEType($input['file']);
 			else
 				$input['type'] = 'application/octet-stream';
 		}
 
+		if ($storageClass !== self::STORAGE_CLASS_STANDARD) // Storage class
+			$rest->setAmzHeader('x-amz-storage-class', $storageClass);
+
+		if ($serverSideEncryption !== self::SSE_NONE) // Server-side encryption
+			$rest->setAmzHeader('x-amz-server-side-encryption', $serverSideEncryption);
+
 		// We need to post with Content-Length and Content-Type, MD5 is optional
-		if ($rest->size >= 0 && ($rest->fp !== false || $rest->data !== false)) {
+		if ($rest->size >= 0 && ($rest->fp !== false || $rest->data !== false))
+		{
 			$rest->setHeader('Content-Type', $input['type']);
 			if (isset($input['md5sum'])) $rest->setHeader('Content-MD5', $input['md5sum']);
 
@@ -354,8 +701,10 @@ public static function putObject($input, $bucket, $uri, $acl = self::ACL_PRIVATE
 
 		if ($rest->response->error === false && $rest->response->code !== 200)
 			$rest->response->error = array('code' => $rest->response->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->response->error !== false) {
-			trigger_error(sprintf("S3::putObject(): [%s] %s", $rest->response->error['code'], $rest->response->error['message']), E_USER_WARNING);
+		if ($rest->response->error !== false)
+		{
+			self::__triggerError(sprintf("S3::putObject(): [%s] %s",
+			$rest->response->error['code'], $rest->response->error['message']), __FILE__, __LINE__);
 			return false;
 		}
 		return true;
@@ -373,7 +722,8 @@ public static function putObject($input, $bucket, $uri, $acl = self::ACL_PRIVATE
 	* @param string $contentType Content type
 	* @return boolean
 	*/
-	public static function putObjectFile($file, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $contentType = null) {
+	public static function putObjectFile($file, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $contentType = null)
+	{
 		return self::putObject(self::inputFile($file), $bucket, $uri, $acl, $metaHeaders, $contentType);
 	}
 
@@ -389,7 +739,8 @@ public static function putObjectFile($file, $bucket, $uri, $acl = self::ACL_PRIV
 	* @param string $contentType Content type
 	* @return boolean
 	*/
-	public static function putObjectString($string, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $contentType = 'text/plain') {
+	public static function putObjectString($string, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $contentType = 'text/plain')
+	{
 		return self::putObject($string, $bucket, $uri, $acl, $metaHeaders, $contentType);
 	}
 
@@ -402,9 +753,11 @@ public static function putObjectString($string, $bucket, $uri, $acl = self::ACL_
 	* @param mixed $saveTo Filename or resource to write to
 	* @return mixed
 	*/
-	public static function getObject($bucket, $uri, $saveTo = false) {
-		$rest = new S3Request('GET', $bucket, $uri);
-		if ($saveTo !== false) {
+	public static function getObject($bucket, $uri, $saveTo = false)
+	{
+		$rest = new S3Request('GET', $bucket, $uri, self::$endpoint);
+		if ($saveTo !== false)
+		{
 			if (is_resource($saveTo))
 				$rest->fp =& $saveTo;
 			else
@@ -417,9 +770,10 @@ public static function getObject($bucket, $uri, $saveTo = false) {
 
 		if ($rest->response->error === false && $rest->response->code !== 200)
 			$rest->response->error = array('code' => $rest->response->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->response->error !== false) {
-			trigger_error(sprintf("S3::getObject({$bucket}, {$uri}): [%s] %s",
-			$rest->response->error['code'], $rest->response->error['message']), E_USER_WARNING);
+		if ($rest->response->error !== false)
+		{
+			self::__triggerError(sprintf("S3::getObject({$bucket}, {$uri}): [%s] %s",
+			$rest->response->error['code'], $rest->response->error['message']), __FILE__, __LINE__);
 			return false;
 		}
 		return $rest->response;
@@ -434,14 +788,16 @@ public static function getObject($bucket, $uri, $saveTo = false) {
 	* @param boolean $returnInfo Return response information
 	* @return mixed | false
 	*/
-	public static function getObjectInfo($bucket, $uri, $returnInfo = true) {
-		$rest = new S3Request('HEAD', $bucket, $uri);
+	public static function getObjectInfo($bucket, $uri, $returnInfo = true)
+	{
+		$rest = new S3Request('HEAD', $bucket, $uri, self::$endpoint);
 		$rest = $rest->getResponse();
 		if ($rest->error === false && ($rest->code !== 200 && $rest->code !== 404))
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::getObjectInfo({$bucket}, {$uri}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::getObjectInfo({$bucket}, {$uri}): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
 			return false;
 		}
 		return $rest->code == 200 ? $returnInfo ? $rest->headers : true : false;
@@ -451,30 +807,37 @@ public static function getObjectInfo($bucket, $uri, $returnInfo = true) {
 	/**
 	* Copy an object
 	*
-	* @param string $bucket Source bucket name
-	* @param string $uri Source object URI
+	* @param string $srcBucket Source bucket name
+	* @param string $srcUri Source object URI
 	* @param string $bucket Destination bucket name
 	* @param string $uri Destination object URI
 	* @param constant $acl ACL constant
 	* @param array $metaHeaders Optional array of x-amz-meta-* headers
 	* @param array $requestHeaders Optional array of request headers (content type, disposition, etc.)
+	* @param constant $storageClass Storage class constant
 	* @return mixed | false
 	*/
-	public static function copyObject($srcBucket, $srcUri, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $requestHeaders = array()) {
-		$rest = new S3Request('PUT', $bucket, $uri);
+	public static function copyObject($srcBucket, $srcUri, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $requestHeaders = array(), $storageClass = self::STORAGE_CLASS_STANDARD)
+	{
+		$rest = new S3Request('PUT', $bucket, $uri, self::$endpoint);
 		$rest->setHeader('Content-Length', 0);
-		foreach ($requestHeaders as $h => $v) $rest->setHeader($h, $v);
+		foreach ($requestHeaders as $h => $v)
+				strpos($h, 'x-amz-') === 0 ? $rest->setAmzHeader($h, $v) : $rest->setHeader($h, $v);
 		foreach ($metaHeaders as $h => $v) $rest->setAmzHeader('x-amz-meta-'.$h, $v);
+		if ($storageClass !== self::STORAGE_CLASS_STANDARD) // Storage class
+			$rest->setAmzHeader('x-amz-storage-class', $storageClass);
 		$rest->setAmzHeader('x-amz-acl', $acl);
-		$rest->setAmzHeader('x-amz-copy-source', sprintf('/%s/%s', $srcBucket, $srcUri));
+		$rest->setAmzHeader('x-amz-copy-source', sprintf('/%s/%s', $srcBucket, rawurlencode($srcUri)));
 		if (sizeof($requestHeaders) > 0 || sizeof($metaHeaders) > 0)
 			$rest->setAmzHeader('x-amz-metadata-directive', 'REPLACE');
+
 		$rest = $rest->getResponse();
 		if ($rest->error === false && $rest->code !== 200)
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::copyObject({$srcBucket}, {$srcUri}, {$bucket}, {$uri}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::copyObject({$srcBucket}, {$srcUri}, {$bucket}, {$uri}): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
 			return false;
 		}
 		return isset($rest->body->LastModified, $rest->body->ETag) ? array(
@@ -484,6 +847,47 @@ public static function copyObject($srcBucket, $srcUri, $bucket, $uri, $acl = sel
 	}
 
 
+	/**
+	* Set up a bucket redirection
+	*
+	* @param string $bucket Bucket name
+	* @param string $location Target host name
+	* @return boolean
+	*/
+	public static function setBucketRedirect($bucket = NULL, $location = NULL)
+	{
+		$rest = new S3Request('PUT', $bucket, '', self::$endpoint);
+
+		if( empty($bucket) || empty($location) ) {
+			self::__triggerError("S3::setBucketRedirect({$bucket}, {$location}): Empty parameter.", __FILE__, __LINE__);
+			return false;
+		}
+
+		$dom = new DOMDocument;
+		$websiteConfiguration = $dom->createElement('WebsiteConfiguration');
+		$redirectAllRequestsTo = $dom->createElement('RedirectAllRequestsTo');
+		$hostName = $dom->createElement('HostName', $location);
+		$redirectAllRequestsTo->appendChild($hostName);
+		$websiteConfiguration->appendChild($redirectAllRequestsTo);
+		$dom->appendChild($websiteConfiguration);
+		$rest->setParameter('website', null);
+		$rest->data = $dom->saveXML();
+		$rest->size = strlen($rest->data);
+		$rest->setHeader('Content-Type', 'application/xml');
+		$rest = $rest->getResponse();
+
+		if ($rest->error === false && $rest->code !== 200)
+			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::setBucketRedirect({$bucket}, {$location}): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
+			return false;
+		}
+		return true;
+	}
+
+
 	/**
 	* Set logging for a bucket
 	*
@@ -492,14 +896,17 @@ public static function copyObject($srcBucket, $srcUri, $bucket, $uri, $acl = sel
 	* @param string $targetPrefix Log prefix (e,g; domain.com-)
 	* @return boolean
 	*/
-	public static function setBucketLogging($bucket, $targetBucket, $targetPrefix = null) {
+	public static function setBucketLogging($bucket, $targetBucket, $targetPrefix = null)
+	{
 		// The S3 log delivery group has to be added to the target bucket's ACP
-		if ($targetBucket !== null && ($acp = self::getAccessControlPolicy($targetBucket, '')) !== false) {
+		if ($targetBucket !== null && ($acp = self::getAccessControlPolicy($targetBucket, '')) !== false)
+		{
 			// Only add permissions to the target bucket when they do not exist
 			$aclWriteSet = false;
 			$aclReadSet = false;
 			foreach ($acp['acl'] as $acl)
-			if ($acl['type'] == 'Group' && $acl['uri'] == 'http://acs.amazonaws.com/groups/s3/LogDelivery') {
+			if ($acl['type'] == 'Group' && $acl['uri'] == 'http://acs.amazonaws.com/groups/s3/LogDelivery')
+			{
 				if ($acl['permission'] == 'WRITE') $aclWriteSet = true;
 				elseif ($acl['permission'] == 'READ_ACP') $aclReadSet = true;
 			}
@@ -515,7 +922,8 @@ public static function setBucketLogging($bucket, $targetBucket, $targetPrefix =
 		$dom = new DOMDocument;
 		$bucketLoggingStatus = $dom->createElement('BucketLoggingStatus');
 		$bucketLoggingStatus->setAttribute('xmlns', 'http://s3.amazonaws.com/doc/2006-03-01/');
-		if ($targetBucket !== null) {
+		if ($targetBucket !== null)
+		{
 			if ($targetPrefix == null) $targetPrefix = $bucket . '-';
 			$loggingEnabled = $dom->createElement('LoggingEnabled');
 			$loggingEnabled->appendChild($dom->createElement('TargetBucket', $targetBucket));
@@ -525,7 +933,7 @@ public static function setBucketLogging($bucket, $targetBucket, $targetPrefix =
 		}
 		$dom->appendChild($bucketLoggingStatus);
 
-		$rest = new S3Request('PUT', $bucket, '');
+		$rest = new S3Request('PUT', $bucket, '', self::$endpoint);
 		$rest->setParameter('logging', null);
 		$rest->data = $dom->saveXML();
 		$rest->size = strlen($rest->data);
@@ -533,9 +941,10 @@ public static function setBucketLogging($bucket, $targetBucket, $targetPrefix =
 		$rest = $rest->getResponse();
 		if ($rest->error === false && $rest->code !== 200)
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::setBucketLogging({$bucket}, {$uri}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::setBucketLogging({$bucket}, {$targetBucket}): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
 			return false;
 		}
 		return true;
@@ -551,15 +960,17 @@ public static function setBucketLogging($bucket, $targetBucket, $targetPrefix =
 	* @param string $bucket Bucket name
 	* @return array | false
 	*/
-	public static function getBucketLogging($bucket) {
-		$rest = new S3Request('GET', $bucket, '');
+	public static function getBucketLogging($bucket)
+	{
+		$rest = new S3Request('GET', $bucket, '', self::$endpoint);
 		$rest->setParameter('logging', null);
 		$rest = $rest->getResponse();
 		if ($rest->error === false && $rest->code !== 200)
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::getBucketLogging({$bucket}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::getBucketLogging({$bucket}): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
 			return false;
 		}
 		if (!isset($rest->body->LoggingEnabled)) return false; // No logging
@@ -576,7 +987,8 @@ public static function getBucketLogging($bucket) {
 	* @param string $bucket Bucket name
 	* @return boolean
 	*/
-	public static function disableBucketLogging($bucket) {
+	public static function disableBucketLogging($bucket)
+	{
 		return self::setBucketLogging($bucket, null);
 	}
 
@@ -587,15 +999,17 @@ public static function disableBucketLogging($bucket) {
 	* @param string $bucket Bucket name
 	* @return string | false
 	*/
-	public static function getBucketLocation($bucket) {
-		$rest = new S3Request('GET', $bucket, '');
+	public static function getBucketLocation($bucket)
+	{
+		$rest = new S3Request('GET', $bucket, '', self::$endpoint);
 		$rest->setParameter('location', null);
 		$rest = $rest->getResponse();
 		if ($rest->error === false && $rest->code !== 200)
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::getBucketLocation({$bucket}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::getBucketLocation({$bucket}): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
 			return false;
 		}
 		return (isset($rest->body[0]) && (string)$rest->body[0] !== '') ? (string)$rest->body[0] : 'US';
@@ -610,7 +1024,8 @@ public static function getBucketLocation($bucket) {
 	* @param array $acp Access Control Policy Data (same as the data returned from getAccessControlPolicy)
 	* @return boolean
 	*/
-	public static function setAccessControlPolicy($bucket, $uri = '', $acp = array()) {
+	public static function setAccessControlPolicy($bucket, $uri = '', $acp = array())
+	{
 		$dom = new DOMDocument;
 		$dom->formatOutput = true;
 		$accessControlPolicy = $dom->createElement('AccessControlPolicy');
@@ -622,17 +1037,23 @@ public static function setAccessControlPolicy($bucket, $uri = '', $acp = array()
 		$owner->appendChild($dom->createElement('DisplayName', $acp['owner']['name']));
 		$accessControlPolicy->appendChild($owner);
 
-		foreach ($acp['acl'] as $g) {
+		foreach ($acp['acl'] as $g)
+		{
 			$grant = $dom->createElement('Grant');
 			$grantee = $dom->createElement('Grantee');
 			$grantee->setAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-			if (isset($g['id'])) { // CanonicalUser (DisplayName is omitted)
+			if (isset($g['id']))
+			{ // CanonicalUser (DisplayName is omitted)
 				$grantee->setAttribute('xsi:type', 'CanonicalUser');
 				$grantee->appendChild($dom->createElement('ID', $g['id']));
-			} elseif (isset($g['email'])) { // AmazonCustomerByEmail
+			}
+			elseif (isset($g['email']))
+			{ // AmazonCustomerByEmail
 				$grantee->setAttribute('xsi:type', 'AmazonCustomerByEmail');
 				$grantee->appendChild($dom->createElement('EmailAddress', $g['email']));
-			} elseif ($g['type'] == 'Group') { // Group
+			}
+			elseif ($g['type'] == 'Group')
+			{ // Group
 				$grantee->setAttribute('xsi:type', 'Group');
 				$grantee->appendChild($dom->createElement('URI', $g['uri']));
 			}
@@ -644,7 +1065,7 @@ public static function setAccessControlPolicy($bucket, $uri = '', $acp = array()
 		$accessControlPolicy->appendChild($accessControlList);
 		$dom->appendChild($accessControlPolicy);
 
-		$rest = new S3Request('PUT', $bucket, $uri);
+		$rest = new S3Request('PUT', $bucket, $uri, self::$endpoint);
 		$rest->setParameter('acl', null);
 		$rest->data = $dom->saveXML();
 		$rest->size = strlen($rest->data);
@@ -652,9 +1073,10 @@ public static function setAccessControlPolicy($bucket, $uri = '', $acp = array()
 		$rest = $rest->getResponse();
 		if ($rest->error === false && $rest->code !== 200)
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::setAccessControlPolicy({$bucket}, {$uri}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::setAccessControlPolicy({$bucket}, {$uri}): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
 			return false;
 		}
 		return true;
@@ -668,28 +1090,33 @@ public static function setAccessControlPolicy($bucket, $uri = '', $acp = array()
 	* @param string $uri Object URI
 	* @return mixed | false
 	*/
-	public static function getAccessControlPolicy($bucket, $uri = '') {
-		$rest = new S3Request('GET', $bucket, $uri);
+	public static function getAccessControlPolicy($bucket, $uri = '')
+	{
+		$rest = new S3Request('GET', $bucket, $uri, self::$endpoint);
 		$rest->setParameter('acl', null);
 		$rest = $rest->getResponse();
 		if ($rest->error === false && $rest->code !== 200)
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::getAccessControlPolicy({$bucket}, {$uri}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::getAccessControlPolicy({$bucket}, {$uri}): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
 			return false;
 		}
 
 		$acp = array();
-		if (isset($rest->body->Owner, $rest->body->Owner->ID, $rest->body->Owner->DisplayName)) {
+		if (isset($rest->body->Owner, $rest->body->Owner->ID, $rest->body->Owner->DisplayName))
 			$acp['owner'] = array(
 				'id' => (string)$rest->body->Owner->ID, 'name' => (string)$rest->body->Owner->DisplayName
 			);
-		}
-		if (isset($rest->body->AccessControlList)) {
+
+		if (isset($rest->body->AccessControlList))
+		{
 			$acp['acl'] = array();
-			foreach ($rest->body->AccessControlList->Grant as $grant) {
-				foreach ($grant->Grantee as $grantee) {
+			foreach ($rest->body->AccessControlList->Grant as $grant)
+			{
+				foreach ($grant->Grantee as $grantee)
+				{
 					if (isset($grantee->ID, $grantee->DisplayName)) // CanonicalUser
 						$acp['acl'][] = array(
 							'type' => 'CanonicalUser',
@@ -724,14 +1151,16 @@ public static function getAccessControlPolicy($bucket, $uri = '') {
 	* @param string $uri Object URI
 	* @return boolean
 	*/
-	public static function deleteObject($bucket, $uri) {
-		$rest = new S3Request('DELETE', $bucket, $uri);
+	public static function deleteObject($bucket, $uri)
+	{
+		$rest = new S3Request('DELETE', $bucket, $uri, self::$endpoint);
 		$rest = $rest->getResponse();
 		if ($rest->error === false && $rest->code !== 204)
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::deleteObject(): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::deleteObject(): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
 			return false;
 		}
 		return true;
@@ -748,14 +1177,58 @@ public static function deleteObject($bucket, $uri) {
 	* @param boolean $https Use HTTPS ($hostBucket should be false for SSL verification)
 	* @return string
 	*/
-	public static function getAuthenticatedURL($bucket, $uri, $lifetime, $hostBucket = false, $https = false) {
-		$expires = time() + $lifetime;
-		$uri = str_replace('%2F', '/', rawurlencode($uri)); // URI should be encoded (thanks Sean O'Dea)
+	public static function getAuthenticatedURL($bucket, $uri, $lifetime, $hostBucket = false, $https = false)
+	{
+		$expires = self::__getTime() + $lifetime;
+		$uri = str_replace(array('%2F', '%2B'), array('/', '+'), rawurlencode($uri));
 		return sprintf(($https ? 'https' : 'http').'://%s/%s?AWSAccessKeyId=%s&Expires=%u&Signature=%s',
-		$hostBucket ? $bucket : $bucket.'.s3.amazonaws.com', $uri, self::$__accessKey, $expires,
+		// $hostBucket ? $bucket : $bucket.'.s3.amazonaws.com', $uri, self::$__accessKey, $expires,
+		$hostBucket ? $bucket : self::$endpoint.'/'.$bucket, $uri, self::$__accessKey, $expires,
 		urlencode(self::__getHash("GET\n\n\n{$expires}\n/{$bucket}/{$uri}")));
 	}
 
+
+	/**
+	* Get a CloudFront signed policy URL
+	*
+	* @param array $policy Policy
+	* @return string
+	*/
+	public static function getSignedPolicyURL($policy)
+	{
+		$data = json_encode($policy);
+		$signature = '';
+		if (!openssl_sign($data, $signature, self::$__signingKeyResource)) return false;
+
+		$encoded = str_replace(array('+', '='), array('-', '_', '~'), base64_encode($data));
+		$signature = str_replace(array('+', '='), array('-', '_', '~'), base64_encode($signature));
+
+		$url = $policy['Statement'][0]['Resource'] . '?';
+		foreach (array('Policy' => $encoded, 'Signature' => $signature, 'Key-Pair-Id' => self::$__signingKeyPairId) as $k => $v)
+			$url .= $k.'='.str_replace('%2F', '/', rawurlencode($v)).'&';
+		return substr($url, 0, -1);
+	}
+
+
+	/**
+	* Get a CloudFront canned policy URL
+	*
+	* @param string $url URL to sign
+	* @param integer $lifetime URL lifetime
+	* @return string
+	*/
+	public static function getSignedCannedURL($url, $lifetime)
+	{
+		return self::getSignedPolicyURL(array(
+			'Statement' => array(
+				array('Resource' => $url, 'Condition' => array(
+					'DateLessThan' => array('AWS:EpochTime' => self::__getTime() + $lifetime)
+				))
+			)
+		));
+	}
+
+
 	/**
 	* Get upload POST parameters for form uploads
 	*
@@ -770,10 +1243,12 @@ public static function getAuthenticatedURL($bucket, $uri, $lifetime, $hostBucket
 	* @param boolean $flashVars Includes additional "Filename" variable posted by Flash
 	* @return object
 	*/
-	public static function getHttpUploadPostParams($bucket, $uriPrefix = '', $acl = self::ACL_PRIVATE, $lifetime = 3600, $maxFileSize = 5242880, $successRedirect = "201", $amzHeaders = array(), $headers = array(), $flashVars = false) {
+	public static function getHttpUploadPostParams($bucket, $uriPrefix = '', $acl = self::ACL_PRIVATE, $lifetime = 3600,
+	$maxFileSize = 5242880, $successRedirect = "201", $amzHeaders = array(), $headers = array(), $flashVars = false)
+	{
 		// Create policy object
 		$policy = new stdClass;
-		$policy->expiration = gmdate('Y-m-d\TH:i:s\Z', (time() + $lifetime));
+		$policy->expiration = gmdate('Y-m-d\TH:i:s\Z', (self::__getTime() + $lifetime));
 		$policy->conditions = array();
 		$obj = new stdClass; $obj->bucket = $bucket; array_push($policy->conditions, $obj);
 		$obj = new stdClass; $obj->acl = $acl; array_push($policy->conditions, $obj);
@@ -785,16 +1260,22 @@ public static function getHttpUploadPostParams($bucket, $uriPrefix = '', $acl =
 			$obj->success_action_redirect = $successRedirect;
 		array_push($policy->conditions, $obj);
 
+		if ($acl !== self::ACL_PUBLIC_READ)
+			array_push($policy->conditions, array('eq', '$acl', $acl));
+
 		array_push($policy->conditions, array('starts-with', '$key', $uriPrefix));
 		if ($flashVars) array_push($policy->conditions, array('starts-with', '$Filename', ''));
 		foreach (array_keys($headers) as $headerKey)
 			array_push($policy->conditions, array('starts-with', '$'.$headerKey, ''));
-		foreach ($amzHeaders as $headerKey => $headerVal) {
-			$obj = new stdClass; $obj->{$headerKey} = (string)$headerVal; array_push($policy->conditions, $obj);
+		foreach ($amzHeaders as $headerKey => $headerVal)
+		{
+			$obj = new stdClass;
+			$obj->{$headerKey} = (string)$headerVal;
+			array_push($policy->conditions, $obj);
 		}
 		array_push($policy->conditions, array('content-length-range', 0, $maxFileSize));
 		$policy = base64_encode(str_replace('\/', '/', json_encode($policy)));
-	
+
 		// Create parameters
 		$params = new stdClass;
 		$params->AWSAccessKeyId = self::$__accessKey;
@@ -811,6 +1292,7 @@ public static function getHttpUploadPostParams($bucket, $uriPrefix = '', $acl =
 		return $params;
 	}
 
+
 	/**
 	* Create a CloudFront distribution
 	*
@@ -818,21 +1300,46 @@ public static function getHttpUploadPostParams($bucket, $uriPrefix = '', $acl =
 	* @param boolean $enabled Enabled (true/false)
 	* @param array $cnames Array containing CNAME aliases
 	* @param string $comment Use the bucket name as the hostname
+	* @param string $defaultRootObject Default root object
+	* @param string $originAccessIdentity Origin access identity
+	* @param array $trustedSigners Array of trusted signers
 	* @return array | false
 	*/
-	public static function createDistribution($bucket, $enabled = true, $cnames = array(), $comment = '') {
+	public static function createDistribution($bucket, $enabled = true, $cnames = array(), $comment = null, $defaultRootObject = null, $originAccessIdentity = null, $trustedSigners = array())
+	{
+		if (!extension_loaded('openssl'))
+		{
+			self::__triggerError(sprintf("S3::createDistribution({$bucket}, ".(int)$enabled.", [], '$comment'): %s",
+			"CloudFront functionality requires SSL"), __FILE__, __LINE__);
+			return false;
+		}
+		$useSSL = self::$useSSL;
+
 		self::$useSSL = true; // CloudFront requires SSL
-		$rest = new S3Request('POST', '', '2008-06-30/distribution', 'cloudfront.amazonaws.com');
-		$rest->data = self::__getCloudFrontDistributionConfigXML($bucket.'.s3.amazonaws.com', $enabled, $comment, (string)microtime(true), $cnames);
+		$rest = new S3Request('POST', '', '2010-11-01/distribution', 'cloudfront.amazonaws.com');
+		$rest->data = self::__getCloudFrontDistributionConfigXML(
+			$bucket.'.s3.amazonaws.com',
+			$enabled,
+			(string)$comment,
+			(string)microtime(true),
+			$cnames,
+			$defaultRootObject,
+			$originAccessIdentity,
+			$trustedSigners
+		);
+
 		$rest->size = strlen($rest->data);
 		$rest->setHeader('Content-Type', 'application/xml');
 		$rest = self::__getCloudFrontResponse($rest);
 
+		self::$useSSL = $useSSL;
+
 		if ($rest->error === false && $rest->code !== 201)
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::createDistribution({$bucket}, ".(int)$enabled.", '$comment'): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::createDistribution({$bucket}, ".(int)$enabled.", [], '$comment'): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
 			return false;
 		} elseif ($rest->body instanceof SimpleXMLElement)
 			return self::__parseCloudFrontDistributionConfig($rest->body);
@@ -846,20 +1353,35 @@ public static function createDistribution($bucket, $enabled = true, $cnames = ar
 	* @param string $distributionId Distribution ID from listDistributions()
 	* @return array | false
 	*/
-	public static function getDistribution($distributionId) {
+	public static function getDistribution($distributionId)
+	{
+		if (!extension_loaded('openssl'))
+		{
+			self::__triggerError(sprintf("S3::getDistribution($distributionId): %s",
+			"CloudFront functionality requires SSL"), __FILE__, __LINE__);
+			return false;
+		}
+		$useSSL = self::$useSSL;
+
 		self::$useSSL = true; // CloudFront requires SSL
-		$rest = new S3Request('GET', '', '2008-06-30/distribution/'.$distributionId, 'cloudfront.amazonaws.com');
+		$rest = new S3Request('GET', '', '2010-11-01/distribution/'.$distributionId, 'cloudfront.amazonaws.com');
 		$rest = self::__getCloudFrontResponse($rest);
 
+		self::$useSSL = $useSSL;
+
 		if ($rest->error === false && $rest->code !== 200)
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::getDistribution($distributionId): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::getDistribution($distributionId): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
 			return false;
-		} elseif ($rest->body instanceof SimpleXMLElement) {
+		}
+		elseif ($rest->body instanceof SimpleXMLElement)
+		{
 			$dist = self::__parseCloudFrontDistributionConfig($rest->body);
 			$dist['hash'] = $rest->headers['hash'];
+			$dist['id'] = $distributionId;
 			return $dist;
 		}
 		return false;
@@ -872,19 +1394,42 @@ public static function getDistribution($distributionId) {
 	* @param array $dist Distribution array info identical to output of getDistribution()
 	* @return array | false
 	*/
-	public static function updateDistribution($dist) {
+	public static function updateDistribution($dist)
+	{
+		if (!extension_loaded('openssl'))
+		{
+			self::__triggerError(sprintf("S3::updateDistribution({$dist['id']}): %s",
+			"CloudFront functionality requires SSL"), __FILE__, __LINE__);
+			return false;
+		}
+
+		$useSSL = self::$useSSL;
+
 		self::$useSSL = true; // CloudFront requires SSL
-		$rest = new S3Request('PUT', '', '2008-06-30/distribution/'.$dist['id'].'/config', 'cloudfront.amazonaws.com');
-		$rest->data = self::__getCloudFrontDistributionConfigXML($dist['origin'], $dist['enabled'], $dist['comment'], $dist['callerReference'], $dist['cnames']);
+		$rest = new S3Request('PUT', '', '2010-11-01/distribution/'.$dist['id'].'/config', 'cloudfront.amazonaws.com');
+		$rest->data = self::__getCloudFrontDistributionConfigXML(
+			$dist['origin'],
+			$dist['enabled'],
+			$dist['comment'],
+			$dist['callerReference'],
+			$dist['cnames'],
+			$dist['defaultRootObject'],
+			$dist['originAccessIdentity'],
+			$dist['trustedSigners']
+		);
+
 		$rest->size = strlen($rest->data);
 		$rest->setHeader('If-Match', $dist['hash']);
 		$rest = self::__getCloudFrontResponse($rest);
 
+		self::$useSSL = $useSSL;
+
 		if ($rest->error === false && $rest->code !== 200)
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::updateDistribution({$dist['id']}, ".(int)$enabled.", '$comment'): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::updateDistribution({$dist['id']}): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
 			return false;
 		} else {
 			$dist = self::__parseCloudFrontDistributionConfig($rest->body);
@@ -901,17 +1446,30 @@ public static function updateDistribution($dist) {
 	* @param array $dist Distribution array info identical to output of getDistribution()
 	* @return boolean
 	*/
-	public static function deleteDistribution($dist) {
+	public static function deleteDistribution($dist)
+	{
+		if (!extension_loaded('openssl'))
+		{
+			self::__triggerError(sprintf("S3::deleteDistribution({$dist['id']}): %s",
+			"CloudFront functionality requires SSL"), __FILE__, __LINE__);
+			return false;
+		}
+
+		$useSSL = self::$useSSL;
+
 		self::$useSSL = true; // CloudFront requires SSL
 		$rest = new S3Request('DELETE', '', '2008-06-30/distribution/'.$dist['id'], 'cloudfront.amazonaws.com');
 		$rest->setHeader('If-Match', $dist['hash']);
 		$rest = self::__getCloudFrontResponse($rest);
 
+		self::$useSSL = $useSSL;
+
 		if ($rest->error === false && $rest->code !== 204)
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::deleteDistribution({$dist['id']}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::deleteDistribution({$dist['id']}): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
 			return false;
 		}
 		return true;
@@ -923,27 +1481,191 @@ public static function deleteDistribution($dist) {
 	*
 	* @return array
 	*/
-	public static function listDistributions() {
+	public static function listDistributions()
+	{
+		if (!extension_loaded('openssl'))
+		{
+			self::__triggerError(sprintf("S3::listDistributions(): [%s] %s",
+			"CloudFront functionality requires SSL"), __FILE__, __LINE__);
+			return false;
+		}
+
+		$useSSL = self::$useSSL;
 		self::$useSSL = true; // CloudFront requires SSL
-		$rest = new S3Request('GET', '', '2008-06-30/distribution', 'cloudfront.amazonaws.com');
+		$rest = new S3Request('GET', '', '2010-11-01/distribution', 'cloudfront.amazonaws.com');
 		$rest = self::__getCloudFrontResponse($rest);
+		self::$useSSL = $useSSL;
 
 		if ($rest->error === false && $rest->code !== 200)
 			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::listDistributions(): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+		if ($rest->error !== false)
+		{
+			self::__triggerError(sprintf("S3::listDistributions(): [%s] %s",
+			$rest->error['code'], $rest->error['message']), __FILE__, __LINE__);
 			return false;
-		} elseif ($rest->body instanceof SimpleXMLElement && isset($rest->body->DistributionSummary)) {
+		}
+		elseif ($rest->body instanceof SimpleXMLElement && isset($rest->body->DistributionSummary))
+		{
 			$list = array();
-			if (isset($rest->body->Marker, $rest->body->MaxItems, $rest->body->IsTruncated)) {
+			if (isset($rest->body->Marker, $rest->body->MaxItems, $rest->body->IsTruncated))
+			{
 				//$info['marker'] = (string)$rest->body->Marker;
 				//$info['maxItems'] = (int)$rest->body->MaxItems;
 				//$info['isTruncated'] = (string)$rest->body->IsTruncated == 'true' ? true : false;
 			}
-			foreach ($rest->body->DistributionSummary as $summary) {
+			foreach ($rest->body->DistributionSummary as $summary)
 				$list[(string)$summary->Id] = self::__parseCloudFrontDistributionConfig($summary);
-			}
+
+			return $list;
+		}
+		return array();
+	}
+
+	/**
+	* List CloudFront Origin Access Identities
+	*
+	* @return array
+	*/
+	public static function listOriginAccessIdentities()
+	{
+		if (!extension_loaded('openssl'))
+		{
+			self::__triggerError(sprintf("S3::listOriginAccessIdentities(): [%s] %s",
+			"CloudFront functionality requires SSL"), __FILE__, __LINE__);
+			return false;
+		}
+
+		self::$useSSL = true; // CloudFront requires SSL
+		$rest = new S3Request('GET', '', '2010-11-01/origin-access-identity/cloudfront', 'cloudfront.amazonaws.com');
+		$rest = self::__getCloudFrontResponse($rest);
+		$useSSL = self::$useSSL;
+
+		if ($rest->error === false && $rest->code !== 200)
+			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
+		if ($rest->error !== false)
+		{
+			trigger_error(sprintf("S3::listOriginAccessIdentities(): [%s] %s",
+			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+			return false;
+		}
+
+		if (isset($rest->body->CloudFrontOriginAccessIdentitySummary))
+		{
+			$identities = array();
+			foreach ($rest->body->CloudFrontOriginAccessIdentitySummary as $identity)
+				if (isset($identity->S3CanonicalUserId))
+					$identities[(string)$identity->Id] = array('id' => (string)$identity->Id, 's3CanonicalUserId' => (string)$identity->S3CanonicalUserId);
+			return $identities;
+		}
+		return false;
+	}
+
+
+	/**
+	* Invalidate objects in a CloudFront distribution
+	*
+	* Thanks to Martin Lindkvist for S3::invalidateDistribution()
+	*
+	* @param string $distributionId Distribution ID from listDistributions()
+	* @param array $paths Array of object paths to invalidate
+	* @return boolean
+	*/
+	public static function invalidateDistribution($distributionId, $paths)
+	{
+		if (!extension_loaded('openssl'))
+		{
+			self::__triggerError(sprintf("S3::invalidateDistribution(): [%s] %s",
+			"CloudFront functionality requires SSL"), __FILE__, __LINE__);
+			return false;
+		}
+
+		$useSSL = self::$useSSL;
+		self::$useSSL = true; // CloudFront requires SSL
+		$rest = new S3Request('POST', '', '2010-08-01/distribution/'.$distributionId.'/invalidation', 'cloudfront.amazonaws.com');
+		$rest->data = self::__getCloudFrontInvalidationBatchXML($paths, (string)microtime(true));
+		$rest->size = strlen($rest->data);
+		$rest = self::__getCloudFrontResponse($rest);
+		self::$useSSL = $useSSL;
+
+		if ($rest->error === false && $rest->code !== 201)
+			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
+		if ($rest->error !== false)
+		{
+			trigger_error(sprintf("S3::invalidate('{$distributionId}',{$paths}): [%s] %s",
+			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+			return false;
+		}
+		return true;
+	}
+
+
+	/**
+	* Get a InvalidationBatch DOMDocument
+	*
+	* @internal Used to create XML in invalidateDistribution()
+	* @param array $paths Paths to objects to invalidateDistribution
+	* @param int $callerReference
+	* @return string
+	*/
+	private static function __getCloudFrontInvalidationBatchXML($paths, $callerReference = '0')
+	{
+		$dom = new DOMDocument('1.0', 'UTF-8');
+		$dom->formatOutput = true;
+		$invalidationBatch = $dom->createElement('InvalidationBatch');
+		foreach ($paths as $path)
+			$invalidationBatch->appendChild($dom->createElement('Path', $path));
+
+		$invalidationBatch->appendChild($dom->createElement('CallerReference', $callerReference));
+		$dom->appendChild($invalidationBatch);
+		return $dom->saveXML();
+	}
+
+
+	/**
+	* List your invalidation batches for invalidateDistribution() in a CloudFront distribution
+	*
+	* http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/ListInvalidation.html
+	* returned array looks like this:
+	*	Array
+	*	(
+	*		[I31TWB0CN9V6XD] => InProgress
+	*		[IT3TFE31M0IHZ] => Completed
+	*		[I12HK7MPO1UQDA] => Completed
+	*		[I1IA7R6JKTC3L2] => Completed
+	*	)
+	*
+	* @param string $distributionId Distribution ID from listDistributions()
+	* @return array
+	*/
+	public static function getDistributionInvalidationList($distributionId)
+	{
+		if (!extension_loaded('openssl'))
+		{
+			self::__triggerError(sprintf("S3::getDistributionInvalidationList(): [%s] %s",
+			"CloudFront functionality requires SSL"), __FILE__, __LINE__);
+			return false;
+		}
+
+		$useSSL = self::$useSSL;
+		self::$useSSL = true; // CloudFront requires SSL
+		$rest = new S3Request('GET', '', '2010-11-01/distribution/'.$distributionId.'/invalidation', 'cloudfront.amazonaws.com');
+		$rest = self::__getCloudFrontResponse($rest);
+		self::$useSSL = $useSSL;
+
+		if ($rest->error === false && $rest->code !== 200)
+			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
+		if ($rest->error !== false)
+		{
+			trigger_error(sprintf("S3::getDistributionInvalidationList('{$distributionId}'): [%s]",
+			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
+			return false;
+		}
+		elseif ($rest->body instanceof SimpleXMLElement && isset($rest->body->InvalidationSummary))
+		{
+			$list = array();
+			foreach ($rest->body->InvalidationSummary as $summary)
+				$list[(string)$summary->Id] = (string)$summary->Status;
+
 			return $list;
 		}
 		return array();
@@ -953,26 +1675,46 @@ public static function listDistributions() {
 	/**
 	* Get a DistributionConfig DOMDocument
 	*
+	* http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/index.html?PutConfig.html
+	*
 	* @internal Used to create XML in createDistribution() and updateDistribution()
-	* @param string $bucket Origin bucket
+	* @param string $bucket S3 Origin bucket
 	* @param boolean $enabled Enabled (true/false)
 	* @param string $comment Comment to append
 	* @param string $callerReference Caller reference
 	* @param array $cnames Array of CNAME aliases
+	* @param string $defaultRootObject Default root object
+	* @param string $originAccessIdentity Origin access identity
+	* @param array $trustedSigners Array of trusted signers
 	* @return string
 	*/
-	private static function __getCloudFrontDistributionConfigXML($bucket, $enabled, $comment, $callerReference = '0', $cnames = array()) {
+	private static function __getCloudFrontDistributionConfigXML($bucket, $enabled, $comment, $callerReference = '0', $cnames = array(), $defaultRootObject = null, $originAccessIdentity = null, $trustedSigners = array())
+	{
 		$dom = new DOMDocument('1.0', 'UTF-8');
 		$dom->formatOutput = true;
 		$distributionConfig = $dom->createElement('DistributionConfig');
-		$distributionConfig->setAttribute('xmlns', 'http://cloudfront.amazonaws.com/doc/2008-06-30/');
-		$distributionConfig->appendChild($dom->createElement('Origin', $bucket));
+		$distributionConfig->setAttribute('xmlns', 'http://cloudfront.amazonaws.com/doc/2010-11-01/');
+
+		$origin = $dom->createElement('S3Origin');
+		$origin->appendChild($dom->createElement('DNSName', $bucket));
+		if ($originAccessIdentity !== null) $origin->appendChild($dom->createElement('OriginAccessIdentity', $originAccessIdentity));
+		$distributionConfig->appendChild($origin);
+
+		if ($defaultRootObject !== null) $distributionConfig->appendChild($dom->createElement('DefaultRootObject', $defaultRootObject));
+
 		$distributionConfig->appendChild($dom->createElement('CallerReference', $callerReference));
 		foreach ($cnames as $cname)
 			$distributionConfig->appendChild($dom->createElement('CNAME', $cname));
 		if ($comment !== '') $distributionConfig->appendChild($dom->createElement('Comment', $comment));
 		$distributionConfig->appendChild($dom->createElement('Enabled', $enabled ? 'true' : 'false'));
+
+		$trusted = $dom->createElement('TrustedSigners');
+		foreach ($trustedSigners as $id => $type)
+			$trusted->appendChild($id !== '' ? $dom->createElement($type, $id) : $dom->createElement($type));
+		$distributionConfig->appendChild($trusted);
+
 		$dom->appendChild($distributionConfig);
+		//var_dump($dom->saveXML());
 		return $dom->saveXML();
 	}
 
@@ -980,32 +1722,61 @@ private static function __getCloudFrontDistributionConfigXML($bucket, $enabled,
 	/**
 	* Parse a CloudFront distribution config
 	*
+	* See http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/index.html?GetDistribution.html
+	*
 	* @internal Used to parse the CloudFront DistributionConfig node to an array
 	* @param object &$node DOMNode
 	* @return array
 	*/
-	private static function __parseCloudFrontDistributionConfig(&$node) {
+	private static function __parseCloudFrontDistributionConfig(&$node)
+	{
+		if (isset($node->DistributionConfig))
+			return self::__parseCloudFrontDistributionConfig($node->DistributionConfig);
+
 		$dist = array();
-		if (isset($node->Id, $node->Status, $node->LastModifiedTime, $node->DomainName)) {
+		if (isset($node->Id, $node->Status, $node->LastModifiedTime, $node->DomainName))
+		{
 			$dist['id'] = (string)$node->Id;
 			$dist['status'] = (string)$node->Status;
 			$dist['time'] = strtotime((string)$node->LastModifiedTime);
 			$dist['domain'] = (string)$node->DomainName;
 		}
+
 		if (isset($node->CallerReference))
 			$dist['callerReference'] = (string)$node->CallerReference;
-		if (isset($node->Comment))
-			$dist['comment'] = (string)$node->Comment;
-		if (isset($node->Enabled, $node->Origin)) {
-			$dist['origin'] = (string)$node->Origin;
+
+		if (isset($node->Enabled))
 			$dist['enabled'] = (string)$node->Enabled == 'true' ? true : false;
-		} elseif (isset($node->DistributionConfig)) {
-			$dist = array_merge($dist, self::__parseCloudFrontDistributionConfig($node->DistributionConfig));
-		}
-		if (isset($node->CNAME)) {
-			$dist['cnames'] = array();
-			foreach ($node->CNAME as $cname) $dist['cnames'][(string)$cname] = (string)$cname;
+
+		if (isset($node->S3Origin))
+		{
+			if (isset($node->S3Origin->DNSName))
+				$dist['origin'] = (string)$node->S3Origin->DNSName;
+
+			$dist['originAccessIdentity'] = isset($node->S3Origin->OriginAccessIdentity) ?
+			(string)$node->S3Origin->OriginAccessIdentity : null;
 		}
+
+		$dist['defaultRootObject'] = isset($node->DefaultRootObject) ? (string)$node->DefaultRootObject : null;
+
+		$dist['cnames'] = array();
+		if (isset($node->CNAME))
+			foreach ($node->CNAME as $cname)
+				$dist['cnames'][(string)$cname] = (string)$cname;
+
+		$dist['trustedSigners'] = array();
+		if (isset($node->TrustedSigners))
+			foreach ($node->TrustedSigners as $signer)
+			{
+				if (isset($signer->Self))
+					$dist['trustedSigners'][''] = 'Self';
+				elseif (isset($signer->KeyPairId))
+					$dist['trustedSigners'][(string)$signer->KeyPairId] = 'KeyPairId';
+				elseif (isset($signer->AwsAccountNumber))
+					$dist['trustedSigners'][(string)$signer->AwsAccountNumber] = 'AwsAccountNumber';
+			}
+
+		$dist['comment'] = isset($node->Comment) ? (string)$node->Comment : null;
 		return $dist;
 	}
 
@@ -1017,14 +1788,17 @@ private static function __parseCloudFrontDistributionConfig(&$node) {
 	* @param object &$rest S3Request instance
 	* @return object
 	*/
-	private static function __getCloudFrontResponse(&$rest) {
+	private static function __getCloudFrontResponse(&$rest)
+	{
 		$rest->getResponse();
 		if ($rest->response->error === false && isset($rest->response->body) &&
-		is_string($rest->response->body) && substr($rest->response->body, 0, 5) == '<?xml') {
+		is_string($rest->response->body) && substr($rest->response->body, 0, 5) == '<?xml')
+		{
 			$rest->response->body = simplexml_load_string($rest->response->body);
 			// Grab CloudFront errors
 			if (isset($rest->response->body->Error, $rest->response->body->Error->Code,
-			$rest->response->body->Error->Message)) {
+			$rest->response->body->Error->Message))
+			{
 				$rest->response->error = array(
 					'code' => (string)$rest->response->body->Error->Code,
 					'message' => (string)$rest->response->body->Error->Message
@@ -1039,17 +1813,43 @@ private static function __getCloudFrontResponse(&$rest) {
 	/**
 	* Get MIME type for file
 	*
+	* To override the putObject() Content-Type, add it to $requestHeaders
+	*
+	* To use fileinfo, ensure the MAGIC environment variable is set
+	*
 	* @internal Used to get mime types
 	* @param string &$file File path
 	* @return string
 	*/
-	public static function __getMimeType(&$file) {
-		$type = false;
-		// Fileinfo documentation says fileinfo_open() will use the
-		// MAGIC env var for the magic file
+	private static function __getMIMEType(&$file)
+	{
+		static $exts = array(
+			'jpg' => 'image/jpeg', 'jpeg' => 'image/jpeg', 'gif' => 'image/gif',
+			'png' => 'image/png', 'ico' => 'image/x-icon', 'pdf' => 'application/pdf',
+			'tif' => 'image/tiff', 'tiff' => 'image/tiff', 'svg' => 'image/svg+xml',
+			'svgz' => 'image/svg+xml', 'swf' => 'application/x-shockwave-flash', 
+			'zip' => 'application/zip', 'gz' => 'application/x-gzip',
+			'tar' => 'application/x-tar', 'bz' => 'application/x-bzip',
+			'bz2' => 'application/x-bzip2',  'rar' => 'application/x-rar-compressed',
+			'exe' => 'application/x-msdownload', 'msi' => 'application/x-msdownload',
+			'cab' => 'application/vnd.ms-cab-compressed', 'txt' => 'text/plain',
+			'asc' => 'text/plain', 'htm' => 'text/html', 'html' => 'text/html',
+			'css' => 'text/css', 'js' => 'text/javascript',
+			'xml' => 'text/xml', 'xsl' => 'application/xsl+xml',
+			'ogg' => 'application/ogg', 'mp3' => 'audio/mpeg', 'wav' => 'audio/x-wav',
+			'avi' => 'video/x-msvideo', 'mpg' => 'video/mpeg', 'mpeg' => 'video/mpeg',
+			'mov' => 'video/quicktime', 'flv' => 'video/x-flv', 'php' => 'text/x-php'
+		);
+
+		$ext = strtolower(pathinfo($file, PATHINFO_EXTENSION));
+		if (isset($exts[$ext])) return $exts[$ext];
+
+		// Use fileinfo if available
 		if (extension_loaded('fileinfo') && isset($_ENV['MAGIC']) &&
-		($finfo = finfo_open(FILEINFO_MIME, $_ENV['MAGIC'])) !== false) {
-			if (($type = finfo_file($finfo, $file)) !== false) {
+		($finfo = finfo_open(FILEINFO_MIME, $_ENV['MAGIC'])) !== false)
+		{
+			if (($type = finfo_file($finfo, $file)) !== false)
+			{
 				// Remove the charset and grab the last content-type
 				$type = explode(' ', str_replace('; charset=', ';charset=', $type));
 				$type = array_pop($type);
@@ -1057,30 +1857,22 @@ public static function __getMimeType(&$file) {
 				$type = trim(array_shift($type));
 			}
 			finfo_close($finfo);
+			if ($type !== false && strlen($type) > 0) return $type;
+		}
 
-		// If anyone is still using mime_content_type()
-		} elseif (function_exists('mime_content_type'))
-			$type = trim(mime_content_type($file));
+		return 'application/octet-stream';
+	}
 
-		if ($type !== false && strlen($type) > 0) return $type;
 
-		// Otherwise do it the old fashioned way
-		static $exts = array(
-			'jpg' => 'image/jpeg', 'gif' => 'image/gif', 'png' => 'image/png',
-			'tif' => 'image/tiff', 'tiff' => 'image/tiff', 'ico' => 'image/x-icon',
-			'swf' => 'application/x-shockwave-flash', 'pdf' => 'application/pdf',
-			'zip' => 'application/zip', 'gz' => 'application/x-gzip',
-			'tar' => 'application/x-tar', 'bz' => 'application/x-bzip',
-			'bz2' => 'application/x-bzip2', 'txt' => 'text/plain',
-			'asc' => 'text/plain', 'htm' => 'text/html', 'html' => 'text/html',
-			'css' => 'text/css', 'js' => 'text/javascript',
-			'xml' => 'text/xml', 'xsl' => 'application/xsl+xml',
-			'ogg' => 'application/ogg', 'mp3' => 'audio/mpeg', 'wav' => 'audio/x-wav',
-			'avi' => 'video/x-msvideo', 'mpg' => 'video/mpeg', 'mpeg' => 'video/mpeg',
-			'mov' => 'video/quicktime', 'flv' => 'video/x-flv', 'php' => 'text/x-php'
-		);
-		$ext = strtolower(pathInfo($file, PATHINFO_EXTENSION));
-		return isset($exts[$ext]) ? $exts[$ext] : 'application/octet-stream';
+	/**
+	* Get the current time
+	*
+	* @internal Used to apply offsets to sytem time
+	* @return integer
+	*/
+	public static function __getTime()
+	{
+		return time() + self::$__timeOffset;
 	}
 
 
@@ -1091,7 +1883,8 @@ public static function __getMimeType(&$file) {
 	* @param string $string String to sign
 	* @return string
 	*/
-	public static function __getSignature($string) {
+	public static function __getSignature($string)
+	{
 		return 'AWS '.self::$__accessKey.':'.self::__getHash($string);
 	}
 
@@ -1105,7 +1898,8 @@ public static function __getSignature($string) {
 	* @param string $string String to sign
 	* @return string
 	*/
-	private static function __getHash($string) {
+	private static function __getHash($string)
+	{
 		return base64_encode(extension_loaded('hash') ?
 		hash_hmac('sha1', $string, self::$__secretKey, true) : pack('H*', sha1(
 		(str_pad(self::$__secretKey, 64, chr(0x00)) ^ (str_repeat(chr(0x5c), 64))) .
@@ -1115,12 +1909,111 @@ private static function __getHash($string) {
 
 }
 
-final class S3Request {
-	private $verb, $bucket, $uri, $resource = '', $parameters = array(),
-	$amzHeaders = array(), $headers = array(
+/**
+ * S3 Request class 
+ *
+ * @link http://undesigned.org.za/2007/10/22/amazon-s3-php-class
+ * @version 0.5.0-dev
+ */
+final class S3Request
+{
+	/**
+	 * AWS URI
+	 *
+	 * @var string
+	 * @access pricate
+	 */
+	private $endpoint;
+	
+	/**
+	 * Verb
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $verb;
+	
+	/**
+	 * S3 bucket name
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $bucket;
+	
+	/**
+	 * Object URI
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $uri;
+	
+	/**
+	 * Final object URI
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $resource = '';
+	
+	/**
+	 * Additional request parameters
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $parameters = array();
+	
+	/**
+	 * Amazon specific request headers
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $amzHeaders = array();
+
+	/**
+	 * HTTP request headers
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $headers = array(
 		'Host' => '', 'Date' => '', 'Content-MD5' => '', 'Content-Type' => ''
 	);
-	public $fp = false, $size = 0, $data = false, $response;
+
+	/**
+	 * Use HTTP PUT?
+	 *
+	 * @var bool
+	 * @access public
+	 */
+	public $fp = false;
+
+	/**
+	 * PUT file size
+	 *
+	 * @var int
+	 * @access public
+	 */
+	public $size = 0;
+
+	/**
+	 * PUT post fields
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $data = false;
+
+	/**
+	 * S3 request respone
+	 *
+	 * @var object
+	 * @access public
+	 */
+	public $response;
 
 
 	/**
@@ -1129,25 +2022,50 @@ final class S3Request {
 	* @param string $verb Verb
 	* @param string $bucket Bucket name
 	* @param string $uri Object URI
+	* @param string $endpoint AWS endpoint URI
 	* @return mixed
 	*/
-	function __construct($verb, $bucket = '', $uri = '', $defaultHost = 's3.amazonaws.com') {
+	function __construct($verb, $bucket = '', $uri = '', $endpoint = 's3.amazonaws.com')
+	{
+		
+		$this->endpoint = $endpoint;
 		$this->verb = $verb;
-		$this->bucket = strtolower($bucket);
+		$this->bucket = $bucket;
 		$this->uri = $uri !== '' ? '/'.str_replace('%2F', '/', rawurlencode($uri)) : '/';
 
-		if ($this->bucket !== '') {
-			$this->headers['Host'] = $this->bucket.'.'.$defaultHost;
-			$this->resource = '/'.$this->bucket.$this->uri;
-		} else {
-			$this->headers['Host'] = $defaultHost;
-			//$this->resource = strlen($this->uri) > 1 ? '/'.$this->bucket.$this->uri : $this->uri;
+		//if ($this->bucket !== '')
+		//	$this->resource = '/'.$this->bucket.$this->uri;
+		//else
+		//	$this->resource = $this->uri;
+
+		if ($this->bucket !== '')
+		{
+			if ($this->__dnsBucketName($this->bucket))
+			{
+				$this->headers['Host'] = $this->bucket.'.'.$this->endpoint;
+				$this->resource = '/'.$this->bucket.$this->uri;
+			}
+			else
+			{
+				$this->headers['Host'] = $this->endpoint;
+				$this->uri = $this->uri;
+				if ($this->bucket !== '') $this->uri = '/'.$this->bucket.$this->uri;
+				$this->bucket = '';
+				$this->resource = $this->uri;
+			}
+		}
+		else
+		{
+			$this->headers['Host'] = $this->endpoint;
 			$this->resource = $this->uri;
 		}
-		$this->headers['Date'] = gmdate('D, d M Y H:i:s T');
 
+
+		$this->headers['Date'] = gmdate('D, d M Y H:i:s T');
 		$this->response = new STDClass;
 		$this->response->error = false;
+		$this->response->body = null;
+		$this->response->headers = array();
 	}
 
 
@@ -1158,7 +2076,8 @@ function __construct($verb, $bucket = '', $uri = '', $defaultHost = 's3.amazonaw
 	* @param string $value Value
 	* @return void
 	*/
-	public function setParameter($key, $value) {
+	public function setParameter($key, $value)
+	{
 		$this->parameters[$key] = $value;
 	}
 
@@ -1170,7 +2089,8 @@ public function setParameter($key, $value) {
 	* @param string $value Value
 	* @return void
 	*/
-	public function setHeader($key, $value) {
+	public function setHeader($key, $value)
+	{
 		$this->headers[$key] = $value;
 	}
 
@@ -1182,7 +2102,8 @@ public function setHeader($key, $value) {
 	* @param string $value Value
 	* @return void
 	*/
-	public function setAmzHeader($key, $value) {
+	public function setAmzHeader($key, $value)
+	{
 		$this->amzHeaders[$key] = $value;
 	}
 
@@ -1192,13 +2113,14 @@ public function setAmzHeader($key, $value) {
 	*
 	* @return object | false
 	*/
-	public function getResponse() {
+	public function getResponse()
+	{
 		$query = '';
-		if (sizeof($this->parameters) > 0) {
+		if (sizeof($this->parameters) > 0)
+		{
 			$query = substr($this->uri, -1) !== '?' ? '?' : '&';
 			foreach ($this->parameters as $var => $value)
 				if ($value == null || $value == '') $query .= $var.'&';
-				// Parameters should be encoded (thanks Sean O'Dea)
 				else $query .= $var.'='.rawurlencode($value).'&';
 			$query = substr($query, 0, -1);
 			$this->uri .= $query;
@@ -1206,24 +2128,42 @@ public function getResponse() {
 			if (array_key_exists('acl', $this->parameters) ||
 			array_key_exists('location', $this->parameters) ||
 			array_key_exists('torrent', $this->parameters) ||
+			array_key_exists('website', $this->parameters) ||
 			array_key_exists('logging', $this->parameters))
 				$this->resource .= $query;
 		}
-		$url = ((S3::$useSSL && extension_loaded('openssl')) ?
-		'https://':'http://').$this->headers['Host'].$this->uri;
-		//var_dump($this->bucket, $this->uri, $this->resource, $url);
+		$url = (S3::$useSSL ? 'https://' : 'http://') . ($this->headers['Host'] !== '' ? $this->headers['Host'] : $this->endpoint) . $this->uri;
+
+		//var_dump('bucket: ' . $this->bucket, 'uri: ' . $this->uri, 'resource: ' . $this->resource, 'url: ' . $url);
 
 		// Basic setup
 		$curl = curl_init();
 		curl_setopt($curl, CURLOPT_USERAGENT, 'S3/php');
 
-		if (S3::$useSSL) {
-			curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 1);
-			curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 1);
+		if (S3::$useSSL)
+		{
+			// Set protocol version
+			curl_setopt($curl, CURLOPT_SSLVERSION, S3::$useSSLVersion);
+
+			// SSL Validation can now be optional for those with broken OpenSSL installations
+			curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, S3::$useSSLValidation ? 2 : 0);
+			curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, S3::$useSSLValidation ? 1 : 0);
+
+			if (S3::$sslKey !== null) curl_setopt($curl, CURLOPT_SSLKEY, S3::$sslKey);
+			if (S3::$sslCert !== null) curl_setopt($curl, CURLOPT_SSLCERT, S3::$sslCert);
+			if (S3::$sslCACert !== null) curl_setopt($curl, CURLOPT_CAINFO, S3::$sslCACert);
 		}
 
 		curl_setopt($curl, CURLOPT_URL, $url);
 
+		if (S3::$proxy != null && isset(S3::$proxy['host']))
+		{
+			curl_setopt($curl, CURLOPT_PROXY, S3::$proxy['host']);
+			curl_setopt($curl, CURLOPT_PROXYTYPE, S3::$proxy['type']);
+			if (isset(S3::$proxy['user'], S3::$proxy['pass']) && S3::$proxy['user'] != null && S3::$proxy['pass'] != null)
+				curl_setopt($curl, CURLOPT_PROXYUSERPWD, sprintf('%s:%s', S3::$proxy['user'], S3::$proxy['pass']));
+		}
+
 		// Headers
 		$headers = array(); $amz = array();
 		foreach ($this->amzHeaders as $header => $value)
@@ -1236,17 +2176,29 @@ public function getResponse() {
 			if (strlen($value) > 0) $amz[] = strtolower($header).':'.$value;
 
 		// AMZ headers must be sorted
-		if (sizeof($amz) > 0) {
-			sort($amz);
+		if (sizeof($amz) > 0)
+		{
+			//sort($amz);
+			usort($amz, array(&$this, '__sortMetaHeadersCmp'));
 			$amz = "\n".implode("\n", $amz);
 		} else $amz = '';
 
-		// Authorization string (CloudFront stringToSign should only contain a date)
-		$headers[] = 'Authorization: ' . S3::__getSignature(
-			$this->headers['Host'] == 'cloudfront.amazonaws.com' ? $this->headers['Date'] :
-			$this->verb."\n".$this->headers['Content-MD5']."\n".
-			$this->headers['Content-Type']."\n".$this->headers['Date'].$amz."\n".$this->resource
-		);
+		if (S3::hasAuth())
+		{
+			// Authorization string (CloudFront stringToSign should only contain a date)
+			if ($this->headers['Host'] == 'cloudfront.amazonaws.com')
+				$headers[] = 'Authorization: ' . S3::__getSignature($this->headers['Date']);
+			else
+			{
+				$headers[] = 'Authorization: ' . S3::__getSignature(
+					$this->verb."\n".
+					$this->headers['Content-MD5']."\n".
+					$this->headers['Content-Type']."\n".
+					$this->headers['Date'].$amz."\n".
+					$this->resource
+				);
+			}
+		}
 
 		curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
 		curl_setopt($curl, CURLOPT_HEADER, false);
@@ -1256,20 +2208,23 @@ public function getResponse() {
 		curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
 
 		// Request types
-		switch ($this->verb) {
+		switch ($this->verb)
+		{
 			case 'GET': break;
 			case 'PUT': case 'POST': // POST only used for CloudFront
-				if ($this->fp !== false) {
+				if ($this->fp !== false)
+				{
 					curl_setopt($curl, CURLOPT_PUT, true);
 					curl_setopt($curl, CURLOPT_INFILE, $this->fp);
 					if ($this->size >= 0)
 						curl_setopt($curl, CURLOPT_INFILESIZE, $this->size);
-				} elseif ($this->data !== false) {
+				}
+				elseif ($this->data !== false)
+				{
 					curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $this->verb);
 					curl_setopt($curl, CURLOPT_POSTFIELDS, $this->data);
-					if ($this->size >= 0)
-						curl_setopt($curl, CURLOPT_BUFFERSIZE, $this->size);
-				} else
+				}
+				else
 					curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $this->verb);
 			break;
 			case 'HEAD':
@@ -1296,12 +2251,14 @@ public function getResponse() {
 
 		// Parse body into XML
 		if ($this->response->error === false && isset($this->response->headers['type']) &&
-		$this->response->headers['type'] == 'application/xml' && isset($this->response->body)) {
+		$this->response->headers['type'] == 'application/xml' && isset($this->response->body))
+		{
 			$this->response->body = simplexml_load_string($this->response->body);
 
 			// Grab S3 errors
-			if (!in_array($this->response->code, array(200, 204)) &&
-			isset($this->response->body->Code, $this->response->body->Message)) {
+			if (!in_array($this->response->code, array(200, 204, 206)) &&
+			isset($this->response->body->Code, $this->response->body->Message))
+			{
 				$this->response->error = array(
 					'code' => (string)$this->response->body->Code,
 					'message' => (string)$this->response->body->Message
@@ -1318,6 +2275,24 @@ public function getResponse() {
 		return $this->response;
 	}
 
+	/**
+	* Sort compare for meta headers
+	*
+	* @internal Used to sort x-amz meta headers
+	* @param string $a String A
+	* @param string $b String B
+	* @return integer
+	*/
+	private function __sortMetaHeadersCmp($a, $b)
+	{
+		$lenA = strpos($a, ':');
+		$lenB = strpos($b, ':');
+		$minLen = min($lenA, $lenB);
+		$ncmp = strncmp($a, $b, $minLen);
+		if ($lenA == $lenB) return $ncmp;
+		if (0 == $ncmp) return $lenA < $lenB ? -1 : 1;
+		return $ncmp;
+	}
 
 	/**
 	* CURL write callback
@@ -1326,8 +2301,9 @@ public function getResponse() {
 	* @param string &$data Data
 	* @return integer
 	*/
-	private function __responseWriteCallback(&$curl, &$data) {
-		if ($this->response->code == 200 && $this->fp !== false)
+	private function __responseWriteCallback(&$curl, &$data)
+	{
+		if (in_array($this->response->code, array(200, 206)) && $this->fp !== false)
 			return fwrite($this->fp, $data);
 		else
 			$this->response->body .= $data;
@@ -1335,21 +2311,45 @@ private function __responseWriteCallback(&$curl, &$data) {
 	}
 
 
+	/**
+	* Check DNS conformity
+	*
+	* @param string $bucket Bucket name
+	* @return boolean
+	*/
+	private function __dnsBucketName($bucket)
+	{
+		if (strlen($bucket) > 63 || preg_match("/[^a-z0-9\.-]/", $bucket) > 0) return false;
+		if (S3::$useSSL && strstr($bucket, '.') !== false) return false;
+		if (strstr($bucket, '-.') !== false) return false;
+		if (strstr($bucket, '..') !== false) return false;
+		if (!preg_match("/^[0-9a-z]/", $bucket)) return false;
+		if (!preg_match("/[0-9a-z]$/", $bucket)) return false;
+		return true;
+	}
+
+
 	/**
 	* CURL header callback
 	*
-	* @param resource &$curl CURL resource
-	* @param string &$data Data
+	* @param resource $curl CURL resource
+	* @param string $data Data
 	* @return integer
 	*/
-	private function __responseHeaderCallback(&$curl, &$data) {
+	private function __responseHeaderCallback($curl, $data)
+	{
 		if (($strlen = strlen($data)) <= 2) return $strlen;
 		if (substr($data, 0, 4) == 'HTTP')
 			$this->response->code = (int)substr($data, 9, 3);
-		else {
-			list($header, $value) = explode(': ', trim($data), 2);
+		else
+		{
+			$data = trim($data);
+			if (strpos($data, ': ') === false) return $strlen;
+			list($header, $value) = explode(': ', $data, 2);
 			if ($header == 'Last-Modified')
 				$this->response->headers['time'] = strtotime($value);
+			elseif ($header == 'Date')
+				$this->response->headers['date'] = strtotime($value);
 			elseif ($header == 'Content-Length')
 				$this->response->headers['size'] = (int)$value;
 			elseif ($header == 'Content-Type')
@@ -1357,9 +2357,33 @@ private function __responseHeaderCallback(&$curl, &$data) {
 			elseif ($header == 'ETag')
 				$this->response->headers['hash'] = $value{0} == '"' ? substr($value, 1, -1) : $value;
 			elseif (preg_match('/^x-amz-meta-.*$/', $header))
-				$this->response->headers[$header] = is_numeric($value) ? (int)$value : $value;
+				$this->response->headers[$header] = $value;
 		}
 		return $strlen;
 	}
 
 }
+
+/**
+ * S3 exception class
+ *
+ * @link http://undesigned.org.za/2007/10/22/amazon-s3-php-class
+ * @version 0.5.0-dev
+ */
+
+class S3Exception extends Exception {
+	/**
+	 * Class constructor
+	 *
+	 * @param string $message Exception message
+	 * @param string $file File in which exception was created
+	 * @param string $line Line number on which exception was created
+	 * @param int $code Exception code
+	 */
+	function __construct($message, $file, $line, $code = 0)
+	{
+		parent::__construct($message, $code);
+		$this->file = $file;
+		$this->line = $line;
+	}
+}
diff --git a/ext/amazon_s3/main.php b/ext/amazon_s3/main.php
index dc0974650..ff797faa2 100644
--- a/ext/amazon_s3/main.php
+++ b/ext/amazon_s3/main.php
@@ -7,7 +7,7 @@
  * Documentation:
  */
 
-require_once "lib/S3.php";
+require_once "ext/amazon_s3/S3.php";
 
 class UploadS3 extends Extension {
 	public function onInitExt(InitExtEvent $event) {

From 428d1285e0d3d231555220bc6e385e0bcec3f0d4 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 13 May 2016 17:13:31 +0100
Subject: [PATCH 074/250] instead of including the entire jquery ui lib for a
 single function, just load the single function

---
 lib/jquery-ui-1.10.4.custom.min.js |  6 ------
 lib/shimmie.js                     | 30 +++++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 9 deletions(-)
 delete mode 100644 lib/jquery-ui-1.10.4.custom.min.js

diff --git a/lib/jquery-ui-1.10.4.custom.min.js b/lib/jquery-ui-1.10.4.custom.min.js
deleted file mode 100644
index 2dfb91465..000000000
--- a/lib/jquery-ui-1.10.4.custom.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*! jQuery UI - v1.10.4 - 2014-02-16
-* http://jqueryui.com
-* Includes: jquery.ui.effect.js, jquery.ui.effect-highlight.js
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-
-(function(t,e){var i="ui-effects-";t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=h(),n=s._rgba=[];return i=i.toLowerCase(),f(l,function(t,a){var o,r=a.re.exec(i),l=r&&a.parse(r),h=a.space||"rgba";return l?(o=s[h](l),s[c[h].cache]=o[c[h].cache],n=s._rgba=o._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,a.transparent),s):a[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var a,o="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,l=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],h=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=h.support={},p=t("<p>")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),h.fn=t.extend(h.prototype,{parse:function(n,o,r,l){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(o),o=e);var u=this,d=t.type(n),p=this._rgba=[];return o!==e&&(n=[n,o,r,l],d="array"),"string"===d?this.parse(s(n)||a._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof h?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var a=s.cache;f(s.props,function(t,e){if(!u[a]&&s.to){if("alpha"===t||null==n[t])return;u[a]=s.to(u._rgba)}u[a][e.idx]=i(n[t],e,!0)}),u[a]&&0>t.inArray(null,u[a].slice(0,3))&&(u[a][3]=1,s.from&&(u._rgba=s.from(u[a])))}),this):e},is:function(t){var i=h(t),s=!0,n=this;return f(c,function(t,a){var o,r=i[a.cache];return r&&(o=n[a.cache]||a.to&&a.to(n._rgba)||[],f(a.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===o[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=h(t),n=s._space(),a=c[n],o=0===this.alpha()?h("transparent"):this,r=o[a.cache]||a.to(o._rgba),l=r.slice();return s=s[a.cache],f(a.props,function(t,n){var a=n.idx,o=r[a],h=s[a],c=u[n.type]||{};null!==h&&(null===o?l[a]=h:(c.mod&&(h-o>c.mod/2?o+=c.mod:o-h>c.mod/2&&(o-=c.mod)),l[a]=i((h-o)*e+o,n)))}),this[n](l)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=h(e)._rgba;return h(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),h.fn.parse.prototype=h.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,a=t[2]/255,o=t[3],r=Math.max(s,n,a),l=Math.min(s,n,a),h=r-l,c=r+l,u=.5*c;return e=l===r?0:s===r?60*(n-a)/h+360:n===r?60*(a-s)/h+120:60*(s-n)/h+240,i=0===h?0:.5>=u?h/c:h/(2-c),[Math.round(e)%360,i,u,null==o?1:o]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],a=t[3],o=.5>=s?s*(1+i):s+i-s*i,r=2*s-o;return[Math.round(255*n(r,o,e+1/3)),Math.round(255*n(r,o,e)),Math.round(255*n(r,o,e-1/3)),a]},f(c,function(s,n){var a=n.props,o=n.cache,l=n.to,c=n.from;h.fn[s]=function(s){if(l&&!this[o]&&(this[o]=l(this._rgba)),s===e)return this[o].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[o].slice();return f(a,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=h(c(d)),n[o]=d,n):h(d)},f(a,function(e,i){h.fn[e]||(h.fn[e]=function(n){var a,o=t.type(n),l="alpha"===e?this._hsla?"hsla":"rgba":s,h=this[l](),c=h[i.idx];return"undefined"===o?c:("function"===o&&(n=n.call(this,c),o=t.type(n)),null==n&&i.empty?this:("string"===o&&(a=r.exec(n),a&&(n=c+parseFloat(a[2])*("+"===a[1]?1:-1))),h[i.idx]=n,this[l](h)))})})}),h.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var a,o,r="";if("transparent"!==n&&("string"!==t.type(n)||(a=s(n)))){if(n=h(a||n),!d.rgba&&1!==n._rgba[3]){for(o="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&o&&o.style;)try{r=t.css(o,"backgroundColor"),o=o.parentNode}catch(l){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(l){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=h(e.elem,i),e.end=h(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},h.hook(o),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},a=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(jQuery),function(){function i(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,a={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(a[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(a[i]=n[i]);return a}function s(e,i){var s,n,o={};for(s in i)n=i[s],e[s]!==n&&(a[s]||(t.fx.step[s]||!isNaN(parseFloat(n)))&&(o[s]=n));return o}var n=["add","remove","toggle"],a={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(jQuery.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(e,a,o,r){var l=t.speed(a,o,r);return this.queue(function(){var a,o=t(this),r=o.attr("class")||"",h=l.children?o.find("*").addBack():o;h=h.map(function(){var e=t(this);return{el:e,start:i(this)}}),a=function(){t.each(n,function(t,i){e[i]&&o[i+"Class"](e[i])})},a(),h=h.map(function(){return this.end=i(this.el[0]),this.diff=s(this.start,this.end),this}),o.attr("class",r),h=h.map(function(){var e=this,i=t.Deferred(),s=t.extend({},l,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,h.get()).done(function(){a(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),l.complete.call(o[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,a){return s?t.effects.animateClass.call(this,{add:i},s,n,a):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,a){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,a):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(i){return function(s,n,a,o,r){return"boolean"==typeof n||n===e?a?t.effects.animateClass.call(this,n?{add:s}:{remove:s},a,o,r):i.apply(this,arguments):t.effects.animateClass.call(this,{toggle:s},n,a,o)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,a){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,a)}})}(),function(){function s(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function n(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}t.extend(t.effects,{version:"1.10.4",save:function(t,e){for(var s=0;e.length>s;s++)null!==e[s]&&t.data(i+e[s],t[0].style[e[s]])},restore:function(t,s){var n,a;for(a=0;s.length>a;a++)null!==s[a]&&(n=t.data(i+s[a]),n===e&&(n=""),t.css(s[a],n))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},a=document.activeElement;try{a.id}catch(o){a=document.body}return e.wrap(s),(e[0]===a||t.contains(e[0],a))&&t(a).focus(),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).focus()),e},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var a=e.cssUnit(i);a[0]>0&&(n[i]=a[0]*s+a[1])}),n}}),t.fn.extend({effect:function(){function e(e){function s(){t.isFunction(a)&&a.call(n[0]),t.isFunction(e)&&e()}var n=t(this),a=i.complete,r=i.mode;(n.is(":hidden")?"hide"===r:"show"===r)?(n[r](),s()):o.call(n[0],i,s)}var i=s.apply(this,arguments),n=i.mode,a=i.queue,o=t.effects.effect[i.effect];return t.fx.off||!o?n?this[n](i.duration,i.complete):this.each(function(){i.complete&&i.complete.call(this)}):a===!1?this.each(e):this.queue(a||"fx",e)},show:function(t){return function(e){if(n(e))return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="show",this.effect.call(this,i)}}(t.fn.show),hide:function(t){return function(e){if(n(e))return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="hide",this.effect.call(this,i)}}(t.fn.hide),toggle:function(t){return function(e){if(n(e)||"boolean"==typeof e)return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="toggle",this.effect.call(this,i)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s}})}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}()})(jQuery);(function(t){t.effects.effect.highlight=function(e,i){var s=t(this),n=["backgroundImage","backgroundColor","opacity"],a=t.effects.setMode(s,e.mode||"show"),o={backgroundColor:s.css("backgroundColor")};"hide"===a&&(o.opacity=0),t.effects.save(s,n),s.show().css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(o,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===a&&s.hide(),t.effects.restore(s,n),i()}})}})(jQuery);
diff --git a/lib/shimmie.js b/lib/shimmie.js
index 979f9d78d..909509169 100644
--- a/lib/shimmie.js
+++ b/lib/shimmie.js
@@ -1,8 +1,32 @@
 /*jshint bitwise:false, curly:true, eqeqeq:true, evil:true, forin:false, noarg:true, noempty:true, nonew:true, undef:false, strict:false, browser:true */
 
 $(document).ready(function() {
+	/** Load jQuery extensions **/
+	//Code via: http://stackoverflow.com/a/13106698
+	$.fn.highlight = function (fadeOut) {
+		fadeOut = typeof fadeOut !== 'undefined' ? fadeOut : 5000;
+		$(this).each(function () {
+			var el = $(this);
+			$("<div/>")
+				.width(el.outerWidth())
+				.height(el.outerHeight())
+				.css({
+					"position": "absolute",
+					"left": el.offset().left,
+					"top": el.offset().top,
+					"background-color": "#ffff99",
+					"opacity": ".7",
+					"z-index": "9999999",
+					"border-top-left-radius": parseInt(el.css("borderTopLeftRadius"), 10),
+					"border-top-right-radius": parseInt(el.css("borderTopRightRadius"), 10),
+					"border-bottom-left-radius": parseInt(el.css("borderBottomLeftRadius"), 10),
+					"border-bottom-right-radius": parseInt(el.css("borderBottomRightRadius"), 10)
+				}).appendTo('body').fadeOut(fadeOut).queue(function () { $(this).remove(); });
+		});
+	};
+
 	/** Setup jQuery.timeago **/
-	jQuery.timeago.settings.cutoff = 365 * 24 * 60 * 60 * 1000; // Display original dates older than 1 year
+	$.timeago.settings.cutoff = 365 * 24 * 60 * 60 * 1000; // Display original dates older than 1 year
 	$("time").timeago();
 
 	/** Setup tablesorter **/
@@ -17,7 +41,7 @@ $(document).ready(function() {
 			// highlight it when clicked
 			$(elm).click(function(e) {
 				// This needs jQuery UI
-				$(target_id).effect('highlight', {}, 5000);
+				$(target_id).highlight();
 			});
 			// vanilla target name should already be in the URL tag, but this
 			// will include the anon ID as displayed on screen
@@ -124,5 +148,5 @@ function replyTo(imageId, commentId, userId) {
 
 	box.focus();
 	box.val(box.val() + text);
-	$("#c"+commentId).effect("highlight", {}, 5000);
+	$("#c"+commentId).highlight();
 }

From 2070034d0da9a521c0517b635ab3353a5be51c2f Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 14 May 2016 17:52:14 +0100
Subject: [PATCH 075/250] move securimage to composer + update lib

---
 composer.json                         |   1 +
 core/util.inc.php                     |  11 +-
 lib/securimage/LICENSE.txt            | 458 -------------
 lib/securimage/README.txt             |  57 --
 lib/securimage/elephant.ttf           | Bin 51652 -> 0 bytes
 lib/securimage/example_form.php       |  82 ---
 lib/securimage/gdfonts/automatic.gdf  | Bin 61196 -> 0 bytes
 lib/securimage/gdfonts/bubblebath.gdf | Bin 67516 -> 0 bytes
 lib/securimage/gdfonts/caveman.gdf    | Bin 160540 -> 0 bytes
 lib/securimage/gdfonts/crass.gdf      | Bin 39691 -> 0 bytes
 lib/securimage/securimage.php         | 934 --------------------------
 lib/securimage/securimage_example.php |   6 -
 lib/securimage/securimage_play.php    |  16 -
 lib/securimage/securimage_show.php    |   9 -
 14 files changed, 4 insertions(+), 1570 deletions(-)
 delete mode 100644 lib/securimage/LICENSE.txt
 delete mode 100644 lib/securimage/README.txt
 delete mode 100644 lib/securimage/elephant.ttf
 delete mode 100644 lib/securimage/example_form.php
 delete mode 100644 lib/securimage/gdfonts/automatic.gdf
 delete mode 100644 lib/securimage/gdfonts/bubblebath.gdf
 delete mode 100644 lib/securimage/gdfonts/caveman.gdf
 delete mode 100644 lib/securimage/gdfonts/crass.gdf
 delete mode 100644 lib/securimage/securimage.php
 delete mode 100644 lib/securimage/securimage_example.php
 delete mode 100644 lib/securimage/securimage_play.php
 delete mode 100644 lib/securimage/securimage_show.php

diff --git a/composer.json b/composer.json
index eaa22781b..aaa82c8de 100644
--- a/composer.json
+++ b/composer.json
@@ -24,6 +24,7 @@
 		"flexihash/flexihash" : "^2.0.0",
 		"ifixit/php-akismet"  : "1.*",
 		"google/recaptcha"    : "~1.1",
+		"dapphp/securimage"   : "3.6.*",
 
 		"bower-asset/jquery"         : "1.12.3",
 		"bower-asset/jquery-timeago" : "1.5.2",
diff --git a/core/util.inc.php b/core/util.inc.php
index dcf7865bf..c19e7fab3 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -1,5 +1,4 @@
 <?php
-require_once "lib/securimage/securimage.php";
 require_once "lib/context.php";
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
@@ -635,13 +634,9 @@ function captcha_get_html() {
 			$captcha = "
 				<div class=\"g-recaptcha\" data-sitekey=\"{$r_publickey}\"></div>
 				<script type=\"text/javascript\" src=\"https://www.google.com/recaptcha/api.js\"></script>";
-		}
-		else {
+		} else {
 			session_start();
-			//$securimg = new Securimage();
-			$base = get_base_href();
-			$captcha = "<br/><img src='$base/lib/securimage/securimage_show.php?sid=". md5(uniqid(time())) ."'>".
-				"<br/>CAPTCHA: <input type='text' name='code' value='' />";
+			$captcha = Securimage::getCaptchaHtml(['securimage_path' => './vendor/dapphp/securimage/']);
 		}
 	}
 	return $captcha;
@@ -669,7 +664,7 @@ function captcha_check() {
 		else {
 			session_start();
 			$securimg = new Securimage();
-			if($securimg->check($_POST['code']) == false) {
+			if($securimg->check($_POST['captcha_code']) == FALSE) {
 				log_info("core", "Captcha failed (Securimage)");
 				return false;
 			}
diff --git a/lib/securimage/LICENSE.txt b/lib/securimage/LICENSE.txt
deleted file mode 100644
index 9a749e685..000000000
--- a/lib/securimage/LICENSE.txt
+++ /dev/null
@@ -1,458 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
diff --git a/lib/securimage/README.txt b/lib/securimage/README.txt
deleted file mode 100644
index 9711d57d9..000000000
--- a/lib/securimage/README.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-NAME:
-
-    Securimage - A PHP class for creating and managing form CAPTCHA images
-
-VERSION: 1.0.2
-
-AUTHOR:
-
-    Drew Phillips <drew@drew-phillips.com>
-
-DOWNLOAD:
-
-    The latest version can always be
-    found at http://www.phpcaptcha.org
-
-DOCUMENTATION:
-
-    Online documentation of the class, methods, and variables can
-    be found at http://www.phpcaptcha.org/Securimage_Docs/
-
-REQUIREMENTS:
-    PHP 4.3.0
-    GD  2.0
-    FreeType (optional, required for TTF support)
-
-SYNOPSIS:
-
-    require_once 'securimage.php';
-
-    $image = new Securimage();
-
-    $image->show();
-
-    // Code Validation
-
-    $image = new Securimage();
-    if ($image->check($_POST['code']) == true) {
-      echo "Correct!";
-    } else {
-      echo "Sorry, wrong code.";
-    }
-
-DESCRIPTION:
-
-    What is Securimage?
-
-    Securimage is a PHP class that is used to generate and validate CAPTCHA images.
-    The classes uses an existing PHP session or creates its own if none is found to store the
-    CAPTCHA code.  Variables within the class are used to control the style and display of the image.
-    The class supports TTF fonts and effects for strengthening the security of the image.
-    If TTF support is not available, GD fonts can be used as well, but certain options such as
-    transparent text and angled letters cannot be used.
-
-
-COPYRIGHT:
-    Copyright (c) 2007 Drew Phillips. All rights reserved.
-    This software is released under the GNU Lesser General Public License.
diff --git a/lib/securimage/elephant.ttf b/lib/securimage/elephant.ttf
deleted file mode 100644
index 024b076e5f0efdaa91bfc54ea520e928aee9c52d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 51652
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
D_wy^5

diff --git a/lib/securimage/example_form.php b/lib/securimage/example_form.php
deleted file mode 100644
index 93a8b800b..000000000
--- a/lib/securimage/example_form.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * Project:     Securimage: A PHP class for creating and managing form CAPTCHA images<br />
- * File:        form.php<br /><br />
- *
- * This is a very simple form sending a username and password.<br />
- * It demonstrates how you can integrate the image script into your code.<br />
- * By creating a new instance of the class and passing the user entered code as the only parameter, you can then immediately call $obj->checkCode() which will return true if the code is correct, or false otherwise.<br />
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or any later version.<br /><br />
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.<br /><br />
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA<br /><br />
- * 
- * Any modifications to the library should be indicated clearly in the source code 
- * to inform users that the changes are not a part of the original software.<br /><br />
- *
- * If you found this script useful, please take a quick moment to rate it.<br />
- * http://www.hotscripts.com/rate/49400.html  Thanks.
- *
- * @link http://www.phpcaptcha.org Securimage PHP CAPTCHA
- * @link http://www.phpcaptcha.org/latest.zip Download Latest Version
- * @link http://www.phpcaptcha.org/Securimage_Docs/ Online Documentation
- * @copyright 2007 Drew Phillips
- * @author drew010 <drew@drew-phillips.com>
- * @version 1.0.3.1 (March 23, 2008)
- * @package Securimage
- *
- */
-
-  session_start();
-
-?>
-<html>
-<head>
-  <title>Securimage Test Form</title>
-</head>
-
-<body>
-
-<?php
-if (empty($_POST)) { ?>
-<form method="POST">
-Username:<br />
-<input type="text" name="username" /><br />
-Password:<br />
-<input type="text" name="password" /><br />
-
-<!-- pass a session id to the query string of the script to prevent ie caching -->
-<img src="securimage_show.php?sid=<?php echo md5(uniqid(time())); ?>"><br />
-<input type="text" name="code" /><br />
-
-<input type="submit" value="Submit Form" />
-</form>
-
-<?php
-} else { //form is posted
-  include("securimage.php");
-  $img = new Securimage();
-  $valid = $img->check($_POST['code']);
-
-  if($valid == true) {
-    echo "<center>Thanks, you entered the correct code.</center>";
-  } else {
-    echo "<center>Sorry, the code you entered was invalid.  <a href=\"javascript:history.go(-1)\">Go back</a> to try again.</center>";
-  }
-}
-
-?>
-
-</body>
-</html>
diff --git a/lib/securimage/gdfonts/automatic.gdf b/lib/securimage/gdfonts/automatic.gdf
deleted file mode 100644
index 3eee7068f3d178d9fcae61543edd388f2090b8a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 61196
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

diff --git a/lib/securimage/gdfonts/bubblebath.gdf b/lib/securimage/gdfonts/bubblebath.gdf
deleted file mode 100644
index 5dc6feab2f10aeb70130606b05a762f6a6dfb7d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 67516
zcmeHM3z8%^uCp()XL$E`_rK5b2Le(m+0|9k>#>~~ks}HqK#Izm-5CG>AAkJufA;>T
zUR&(>^Ur?&wAf!hw!1v9vV*gE21~1`>##SIkC1}RY$d7`hK}7klhorw5F?tp`aSE;
zv-*U+Kd+4Wtx3*ZS>60vy$qhfxPe1{%eDh$YjYBi7O+FIT^l_t&XV_L2-~9^{T#_Y
z)|oB(L|V;qKCr0i>y@5a*dC-Rycn<KPS32>%#S0}t}O=wk2C!VJIvXNed0W8f3v!1
zma8{d<0iO9Nv{}pEyn$>Ytf%A{CJ{WD=vO)g%N3DjL4c@w`;r%qY6oCd?u9vFQthw
zA}<(fl8hcKLy?LdJu{vlu4io|9H`Xp&S@9uwI*s|U0s1<U0Jj2IY->|O@8s8uzn1C
zy3!gXxzPz);)x~3h@OIFNXjE(NG!w_RO_@g1v{8vzpf!(XRI^#9zJ`-%_@7(;<xsa
zJJK_2R^7L|`dd$Kv5S=%7R949F-GJCLrszxuObqcRuB!vS>cLj*3WMlyROg!W0`RD
zbr*icdcA(H;zHc`Xdb-R_2(>4?vAbIU7CrDNokv0UFgh+a=~1-O1Cp3*VZ_vuY82<
z@KrYIqCQrN-;H*sWsfFdzV6o@#_k63Bn@d@3dq_vyY6S_nO&W%z}iQNQFz_X&NI8!
zxv6U&o><BFEx`G-!sx`sto@Jm_0*_>Q*wn15sf}!>qu%R@h8r+_NBVgiH5WD%=XOH
z@V(dywcC1==7%m$>sM^gW_R^H#5X;o-kF}+t~-kT%;wW?Cc}AOUt!&Gf4#!}gZk$T
z^zaVr$Fk=vE%FQYhEC%zti5g~E*+G%$<>9<j3^h(Wvi5P4*_y*^)}+YI!TtCRZ+y$
zMqSj$D)a{-+^S#in-4nC^;K4Tc2{xEEsd54wHB~9GwVg{>Fg~?)?0~gJd@c)UY7K@
zzy(x=-0^!@oU5y)EfWNc57xHwpxRe#Ig8Rl^n$W)IkN+r3)VHrW;x$WUem-FH7Saj
zwM4h4(4)WrL2s+O#tV*}NtT!?ikRB0Q}v^!NG0u?VK!N(*xk{^X+56?nbt*y?QGkE
zqHnO$ZfRTUhvZXiw0ISh?Kx2zJy?b!6+3!nJV9K~+DJH1sl9P7*R$-SnkAl{XZAFt
zJk4;{e_`GHu5V`f2JByFy*6kcsF>6jvn-?+xHe?r>Z_6JoLfnaFTOJ1sx&c1<OR!+
zlt;uWQE5UI>G4bIBbiyFbBe3As|rCKNANPa*kyT@?b_&}YkDDn==4vWbIc%)nJ3O;
z`_b3q3)>;5(~tyYhdE2qTcO;XmHwfgH|N|g?J~onc$6l_h`eAKlJbaHB`Qs*qWy~v
z7$%qRxmc+|^E6}!C+BYO&Ux;tzYA7HtA&(4?$zRI6xHCquPNS9?AzLF>1zqvh{l^%
zDT_a0vxhc>Ri4$In_?X%DXl2tMXYDdSm-BwCh$z)nZPrFX9CXzo(Vh?cqZ^n;F-WP
zfoB5G1fB^z6L==@OyHToGl6FU&jg+c{7oj{|AC}l|8FV&^1**4(e+gpuD)*0xuuas
z%s?%ri7_HCScarLB36k?6RJp$U(y^8ZJ-y$l|0n7q&{b9yFGZVD@;}tyB2#|zr}i!
z68hF3LgJDX*)U7Ksf8^YC1LFti*yE|ziC}RRi7pT%zQ<^yMs%uHXR>dxnNfNn)Hrh
zzlgK%a<vTfm&w@0>TG5t$z-RAF``_s3`tSUsM}Z}acMm<Momgr6_QHpI#DOeB+Rd}
z;k>U&?<n?*xaVw@^joRq%8kXK>S}WW8?a8CYEfiJ$|GWxs5GI9aQsLj#)xXcG9={@
z&y2*%vZc<NX)BFgnqjxE$#xCY!dmo)3*4$->p=|nj(ksgX0>mZi8Qw~vWOWL#iKMa
zM&t#{kd#N>a<*NGD~+AF0FrfPy?uKme+iSlp^JQr{TtQIW7=3w=OxC76BLYhsWk3a
z+)d+^;?-1maeb9FD}GCeDSkJCQ>|;y>~f8=*otvitt8Mr+g7ImR{CZ}lHL*@VvJ6#
z7qN$wN5nE(XhId8Si@#kYOr=n*ulxU+gqDvHAcH}C|F~s=el2>=-s-}Mv2*y&Tn>}
z*_%0=z1Br}TU}6Xz<FPj-cjsZ>_@o1MSrktu2wgC_LWmZH@bes_N=PH>fG$Hb<{bM
zC5;A82`N4?j+OP9{vXs`=8G;+S66V|vXc0yJSlNs`Ch~XG=imKjAyp%QlL?Z6=FO)
z&+Kb;;bE%_;>D<hlkk>}g4VmvS7LYn@DVq!f_~FkTD*j}Jx6Br>{0jbF<xPh?Yq#Q
zBk3;joY|spNQlq$>^!qC)?KGiZNOPqcBm*~vRzkZePQ34<e`=rcU{F8mzaP?v-8aU
zg>~~=)`R@ISZ>eG?}rp`Ohi}GiXtX!R+rykv6dX{l8o91ry6}4CNEN9D^#+3FtDsw
z8oN_na4ps0kOZxW##%Ryu74wGUBp;n>?dbTb~$g32WgUjZbe)=ff%DEF+T4lX;L0F
zHfuj&t%ldx>k0;UTfL!pnJ#RHud-bmJ?wqZ=sOYIRMQxmT**W+@U;z5AWg)@Ix@22
z(rRLink>8MWpqX&m1u>Z)!m7{Usp~Ev6)+l*U=sZQ#9)S6zsUgp4M;Cen<&@>klE=
zB%Xf~V?<uC3`u!JtP+(bRMGN7BF2bn!7?P}5wS{CnovdW*7Z7SockSHGhW-t-FXe`
zGu{-V>wSHNEvuf;>fFtxb#K=IbypO-nf3biAbDR$Hpx5j%+7UZ?I-M0H?9~X<QgAh
zUO&M#dWAI`{^~T|zpP)ehyT$Fy&uW?48Hhw&(i*_p6Q>fTh8aQubt@bho086^UU5j
z&(o-;XXlyywC>^Lob#!BVvN|LV5hHh!H{dK4<g>HlVr(R6-7*~SzUjHLcbZpRppHx
zx~S{Tl;l@wV;zt$KL<v(@?<s;yjRy}XP&Iv&W;w-O=Y4aSN7i3w$H80;&E4hxvl&_
zg|UQUmIcDE*b;jh--{T4*JW)K6gHsT&urJFIO{KBkiL3de<PAQnZs&~lJP$U%a9al
zMm_cw5|`E!W7OnYSI?Izm^lUSM5D{8D;AmAYM<$Al;RcZ-RwNGzjfW^+vwx!O%v?s
z7o7KBR~Iw0)u$UTf62mjc+1A^*k$0CvaRm^;R8ptX$%dnWTNc(%tq^5f92-_nuOf8
z1^J08FBT?KLjKB%7|uvvlRZ(A_qq^aUAqE`)vPo0wclc;E<&u9(b5RRM%XZebrxCK
zuA8v`$zBk7k$%`!MJINv3$ZBJ6i8I_J&QC;NL+UIcdqNF>V6}@U9aeOcPE#|e)X()
z3;pHDsmP+PuQ(8}zTN<?EN)+<fIJyCW{ix27BVpvsPx2^bKVo$z9g1o)V|i$dc|(v
zBv7o~v`bN2NSrt6<qVOYsRwqe>lv{1wYQLJZAm8G`j%oynFIIE>zfz5Q(e-GPFiDG
z!&CDi#t7V^@OIahbH8I0e<y;wt=31pl%q3UUuC1`a^IYDOCyVzfm%uvV?<uC3`u!J
ztP+(bRMF`M;{s>{y(q5aZ%|kIL(4Ucyq0UzR4{6(Xl14w?b})V32WAF&zf1zFhFp(
z)%%DS96OV&R({2HZS=7B!7|^8)UEpUzVp#OHGYNlquZ17x;Qs0y?S;iitIKb$IblV
zoJ6V$q+Mx8lEncdhfqZ)_U~3V=icYFlf`VY=5TP{eSL+kNoJkAmZ*^0)0~U31@(w%
zG_ze-C5%f<K%?1tX00w}s+PYhhP&Jot<jmTud?0u)!FQVrIimi-t!%y{#UG9*dx9c
z63b|z2~~7r;{s>{dr@4;ySmj~X}i6I9d-9&x4KtW&gNk@mg2=F93!KguWS(zW9ycP
zu{PwS)0z?hT!L5q%!*Me)i{oqwLmIe7<$~+nOz3ADQ(+goONB<%{viJRI8WMlGkn=
z$wFriY>mBpby-U>xus)fz*%WxjK~X?At{fDRie^_D#FAgi5MfQ1<R0>M?5nU3$d+C
zgX9{e*@|&jr4r~lOU>*c_{xpNfEWnIVq1CO{}me+s}vG<D;qHuh&9L)V{~Hw!n%Gc
zw&aoTcWljgbq6O~?fmgliizm@D%(9?owE>)EMjfcQkobe@`7bZ$|IaGig?0GV<#?v
zWSv>5AsP*%u1sQW1Ma#~tteu$T^r}TJ77pmAF~#{ga`MRS+}*v^BJ`|A!jREZh;u1
zmZ}10B&qi+?&jmVc$o}$U0-F*inS0^{C)(lTGy_%Q;oBnA{tjS236Ni9_A5wDZJ@F
zNpJ1+%&Zr*=OlD&WRtuT&+P0xv$ONe&dxJCJJ0OwJhQX&%+Ag;J3G&;Ip;6&?#ucv
ze)4PV)C)02EGk%rq%11du>(s?Tv|_zQIl}?AKbyY6rMh^v-8ZJoCT8>&^4jid1j>s
zjOCPrwuiC)O+y8v-8d9UlkzCA4s541{TPua#^}Ua4X;DWqrd<`Z>u*HFF1@way+G<
z70+FhRj2AlO_564H^Y-tW9Uddi7_HCScar5D%P=)6_?f%W7H&^eI%pv%+Ag;dvX@6
z#OxT2vSs}invDy;9!Yw+k`VVWj?OdtN?os`2g-e8dSr`z7?NFVKpJO?A{v*0JHaht
zF^;e_TTNua(N|zxXEy3;eG1==PHv5%8#O1!h`eAKlCr2+$3|9MT2G8olW_Klj?PF7
zWnDn|wKQQzJ*(Kb^o)UGtxS?GauQ-jk!pXqE1Wwm4fa1_vg5g5#95b#Yu)8Emb6H-
zVM=|!?k@YJvu0L8iq!QGPx;vv&R~2c#)!ON*&3-7qYq15soW*(E(g}(I`4sv&I~_F
zqwkaGJ6IN96^%u6(H|3tF*>m|R8kg|!m$i**x7kzV^;gTY;P)5^RRXqHq(tIeXXR3
z#%1lYTW8NHjdoK~VIxW43Q^D3D;ssCJ~N<m#HFizV`F=(-Po>~)_wLY<jHi>+F^5L
z1MV5^+G4$Zd(;?`?BYTP5Q>TxF)>Co7t9^5b*~u3FGsuevX>UZaNVyvOrrZtx*Mr%
z>^F8D?d&|WtCN*mE0uU{1Gh3e&um;!A3o}C7X-bn-V|D>RoDnudS<J(Cv7$1QhIE+
z7492c+nL?wyIK4r>)y<GJNnC8n^Au}xInBmU0lJs;@e(P?5uu<*=`hx56@9=4y-hq
zkh2vnUnwz06bshflQl#46ab;4XT~$c6#`kmWKYgj?_3j(zDl7AXV!}KtXC~`D~jDG
zY}bSt*RmyGQDPmeXJj9Ys1~eU$kMr@PPYJ%)CH|8+Ea{ih&f-K^?D3x>It6-JQH{(
z@J!&Dz%zko0?!1V2|N>cCh$z)nZPrFX9CXzo(Vh?cqZ^n;F&;Ap#Ejq{^i;K-8$ap
z@Gsf?XK7FAXMt<e<mKP47pbIW=<Iz)nM-XonAti61eqMQyk2RGh10%vk2?|j7Vl?v
z*2z*;UMz$vTFyp{5!HgZf7aOP+9TIioY|o(D~X^NNH#6r&wK5KUA-E4aWrtzpot3+
zz|7VyoTXmVpBpyGJ9=hk=VJYGJnT0cf%Cq;!j|)LM_!?xvc%R`XC1~cm|SdVzGA!X
zW*x>YzLGyzH)=)i@13ZmJ-T%oH|MpJYF(7~DfpWYocHw=)@*#5*SEZ%<y#Y|N#cHZ
zNA9xUkMHR|v-=&1w1jkuN?uKBZft1S(V4A=mE?EQ;+4j(nv(N@@pWd8btx|~fi~<w
z=c?6Cbp@;2+nn>v0V3Ddn6IyVgzfNE*6gy5t`z^u2o;W=X#7Ziac`wPOQD@v9j9c@
zU6nQR>wKnhVyg?MeNFL>Vqeyn94mN&ky~D*7dEqT>6uwIR7-0mQEqmg+26UY{NC!=
z%YZOzTYva|&HmcUdK1s?JOTbfa7U6SH`pQRh9n@{cOn&vt$fLq+A!PLfboNJOFp8=
zkd#N3Y;Z=M>ImLU2eq%Sux@2feuK5fei7$p|1*@5yz(>aXNz|g$qxEj<IJQtHny*_
zT^l|4`imd4w4S!6QA3*t#`R0~&iS^Ud&8A=G@98GtH5Iu*$d~|Vw7;)*EHEt?5l*i
zx^r1aY#BvjDGj#Ux;cJ}?Yf()wrPFlN_uH_k>0U$-GAhH^PX>J`M|GCAb%+S?et3-
zeg?X}%9<U1hWk(O@GYXgr{=>tip^}-yow8fxve;_Ln~WJT$1K~jas~%w+>R|zLdib
zw^j0I8r9G2HUlK{ydopXh%_-qWV?>uv(Rsba68J;$C0do_hs%$Dc(`+NA}0-;(rSL
z4Dn`LsJpMPur-e5n{@Yj$`V^&oz09QJGt0^_18$XC^95PF{6{SvEtHtVvL$p#lNp^
z-Ytibd)~1!PyE6J>=Uvt>L&5@`7w27!}ZpgF8|wT?)ek8ewR1L`NVnF&UK5ux!~D(
zW`EE7y&3=C1Ga(tecd!WU&oj1;Cxf?$KfA6uMY$#$l+kO{U(y!ld+%K%a6cikVZY|
zYwaE~*w}9P6}D?%YHmfoxgG7$@Y!=_Ywl+${-4kdJ3G(pH|k!_uFe`~n~G>$he$|M
z^>ih0NW#icH;t24MB_z_)a`>rG1Em@nnemvABR4~Gg8iCfR`yoUWq-HFsMeNUa?YJ
z5sepdZjvq{mJ)a@VP&YB#z`xpaf{s&sf>&Mcsb9pi)TmYDu-@0agt(8nlJI}JhT0U
zh@XUGSF`iXK6PcvxL^5wDLYScW?!1~&(!_(zdjwxKR&j5jlat3ue03Zrf})L`XsQ=
zsbF_z`;$02!wRmoI=t1nx})x<4Y<Wl^3zC3BFKvtR%mvf**@>Tr>@S|Po4X^?*yJd
zUz&h@TK4_K{4&HZ(AD_vbfv4Jh{^U>S?*DVbO`|1)&;fQ-PZlOW0#8<#yA7^B|dLw
z=b7#EE^XjMa~res%>IRS^H<07E_+P)SznmI_6xKd7ZL7XSJH|iCTm|u-ilO6_K@qJ
zQhZLA-&9DbV8lv-Wk|}S#w4#Zh%suiq<Mh0X<8Ilvg&%W<Q=r1ux9P{?HWN~fZ%Sc
z_Yp5Rb|zV3rYK@+yLQw&^dYHFcsqf-l(@wV^^P$0eNDF=#lC9gHouR$BZJULC1dNW
zvzbw3Cl?zqznV>3tXtTlWS=gJWCFiOW*2i=((D2kP^EJBjq|caI1|xmW{>BkeC?5V
zM6>hETHQSB=J{;jnt%<vCyL4TSB#t3*Q~Uo*jFFw7Da-0vJxvV7DAhgvT^arAGH3{
zL(MB)2<q7CZEUR+ds$L^feUDB*3Uki*G?o}r9wnl?2UM4>qxt0?SHiH^Siv6`Uu;V
z;JeLGuN`--E8P@DOt!y-{2KS$DFO0r>w?<uZtH&Cxp6*=7{*c8c<k3)po^5rD_zpI
zTG>AD2Cvp5dE@-s*4^*)e7FbwdIJ8*+3VjaUW#!4y1vS~tG@1DPuXF+uBf%5*v)L$
zL;7V!X<L8zywS_0J^<9meqHBN&g?b=B>%<dUC;Nz4qwkP6^A;Key{PI*`jaAnVp?y
z_Qu&n#uT}KlW^SEY<@?vucKjt3HPsjJ@}?sNp#ge+?AfSH|Oo<(AMgiyV-eWzft$n
zf;ww_?dr-}UH-3<#(lujc!P~GfTOQO5zTDZK1pHmtalUeiSLtZ43k$eF-GJC%aD{s
z#X2^!;?jCzjGBbAe?13h!AeXe1eC7hU^PZm3zi`%j~bJ_&LGC9NjcHXTB6sX(4)Wr
zL2s+O#tRNDN{*-Wv*NjHvg%a*s3}rOd%|%7K5-qoCpU&0PzPd+$P1PssWf)fv5`%3
zZHpKqnhTa8skK@qDosdSI)NCYChHi{ssFLI%x^RVtb-Bj7pv|XXDvlEu1>Ue#O!d<
z$JOo}E+c)v%f^|t{?*_?<_Xx~`^)i3`qP-+w#P*V%$oy>wK5~C9i4Pze;5Xe`bj!l
zQ72O1;+ZXaaTbh40u<*TtvmPp32Vpjk?iL+ETNuPY^{=?8<eekZQqlgS*;y1mD1#i
z<_Y-d_Q^G-Hvk)AjKD27nlvekO5vD<NFh{_d<!iwY-Zy$*Auy_3Zaf8c+mshD=U^)
z*{<!i@TR!z=oFQzE7aQ9sy(xAVUJ322*;9LXhId8*f>D)YAuTOe3^8@RQ|-L3D{8M
zYf-K-nRxTW7&VD2_ghVxR6}v)C03fy>^!q^n)`23x-cJa5<OQdaNpOYcNF^;`?>Y?
zgd+E4({A)9Z1&KGu;O`}!Zk6)Bho9LJF?qZ^V~u|;Y$<niTlvyeiHJFINboSuUNRs
z>QeVSG*+$$#-U<Q!Y^5`f2b+vy%t41U%$(Gy?$45*{&dVsEPf$&a5BMo>h{&WbkK9
a!ZR})@M-1LH#Ulyxt>$vbUwB6BKBV;AyU==

diff --git a/lib/securimage/gdfonts/caveman.gdf b/lib/securimage/gdfonts/caveman.gdf
deleted file mode 100644
index 4f72cdbb2e65547549315d4152a5f6f79ed889f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 160540
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

diff --git a/lib/securimage/gdfonts/crass.gdf b/lib/securimage/gdfonts/crass.gdf
deleted file mode 100644
index 73420a98d08009cb0ebb079be8e55f7304c9c208..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 39691
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

diff --git a/lib/securimage/securimage.php b/lib/securimage/securimage.php
deleted file mode 100644
index 7fbef0430..000000000
--- a/lib/securimage/securimage.php
+++ /dev/null
@@ -1,934 +0,0 @@
-<?php
-
-/**
- * Project:     Securimage: A PHP class for creating and managing form CAPTCHA images<br />
- * File:        securimage.php<br />
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or any later version.<br /><br />
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.<br /><br />
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA<br /><br />
- *
- * Any modifications to the library should be indicated clearly in the source code
- * to inform users that the changes are not a part of the original software.<br /><br />
- *
- * If you found this script useful, please take a quick moment to rate it.<br />
- * http://www.hotscripts.com/rate/49400.html  Thanks.
- *
- * @link http://www.phpcaptcha.org Securimage PHP CAPTCHA
- * @link http://www.phpcaptcha.org/latest.zip Download Latest Version
- * @link http://www.phpcaptcha.org/Securimage_Docs/ Online Documentation
- * @copyright 2007 Drew Phillips
- * @author drew010 <drew@drew-phillips.com>
- * @version 1.0.3.1 (March 24, 2008)
- * @package Securimage
- *
- */
-
-/**
-  ChangeLog
-
-  1.0.3.1
-  - Error reading from wordlist in some cases caused words to be cut off 1 letter short
-
-  1.0.3
-  - Removed shadow_text from code which could cause an undefined property error due to removal from previous version
-
-  1.0.2
-  - Audible CAPTCHA Code wav files
-  - Create codes from a word list instead of random strings
-
-  1.0
-  - Added the ability to use a selected character set, rather than a-z0-9 only.
-  - Added the multi-color text option to use different colors for each letter.
-  - Switched to automatic session handling instead of using files for code storage
-  - Added GD Font support if ttf support is not available.  Can use internal GD fonts or load new ones.
-  - Added the ability to set line thickness
-  - Added option for drawing arced lines over letters
-  - Added ability to choose image type for output
-
-*/
-
-/**
- * Output images in JPEG format
- */
-define('SI_IMAGE_JPEG', 1);
-/**
- * Output images in PNG format
- */
-define('SI_IMAGE_PNG',  2);
-/**
- * Output images in GIF format
- * Must have GD >= 2.0.28!
- */
-define('SI_IMAGE_GIF',  3);
-
-/**
- * Securimage CAPTCHA Class.
- *
- * @package    Securimage
- * @subpackage classes
- *
- */
-class Securimage {
-
-  /**
-   * The desired width of the CAPTCHA image.
-   *
-   * @var int
-   */
-  var $image_width = 175;
-
-  /**
-   * The desired width of the CAPTCHA image.
-   *
-   * @var int
-   */
-  var $image_height = 45;
-
-  /**
-   * The image format for output.<br />
-   * Valid options: SI_IMAGE_PNG, SI_IMAGE_JPG, SI_IMAGE_GIF
-   *
-   * @var int
-   */
-  var $image_type = SI_IMAGE_PNG;
-
-  /**
-   * The length of the code to generate.
-   *
-   * @var int
-   */
-  var $code_length = 4;
-
-  /**
-   * The character set for individual characters in the image.<br />
-   * Letters are converted to uppercase.<br />
-   * The font must support the letters or there may be problematic substitutions.
-   *
-   * @var string
-   */
-  var $charset = 'ABCDEFGHKLMNPRSTUVWYZ23456789';
-  //var $charset = '0123456789';
-
-  /**
-   * Create codes using this word list
-   *
-   * @var string  The path to the word list to use for creating CAPTCHA codes
-   */
-  var $wordlist_file = '../words/words.txt';
-
-  /**
-   * True to use a word list file instead of a random code
-   *
-   * @var bool
-   */
-  var $use_wordlist  = true;
-
-  /**
-   * Whether to use a GD font instead of a TTF font.<br />
-   * TTF offers more support and options, but use this if your PHP doesn't support TTF.<br />
-   *
-   * @var boolean
-   */
-  var $use_gd_font = false;
-
-  /**
-   * The GD font to use.<br />
-   * Internal gd fonts can be loaded by their number.<br />
-   * Alternatively, a file path can be given and the font will be loaded from file.
-   *
-   * @var mixed
-   */
-  var $gd_font_file = 'gdfonts/bubblebath.gdf';
-
-  /**
-   * The approximate size of the font in pixels.<br />
-   * This does not control the size of the font because that is determined by the GD font itself.<br />
-   * This is used to aid the calculations of positioning used by this class.<br />
-   *
-   * @var int
-   */
-  var $gd_font_size = 20;
-
-  // Note: These font options below do not apply if you set $use_gd_font to true with the exception of $text_color
-
-  /**
-   * The path to the TTF font file to load.
-   *
-   * @var string
-   */
-  var $ttf_file = "./elephant.ttf";
-
-  /**
-   * The font size.<br />
-   * Depending on your version of GD, this should be specified as the pixel size (GD1) or point size (GD2)<br />
-   *
-   * @var int
-   */
-  var $font_size = 24;
-
-  /**
-   * The minimum angle in degrees, with 0 degrees being left-to-right reading text.<br />
-   * Higher values represent a counter-clockwise rotation.<br />
-   * For example, a value of 90 would result in bottom-to-top reading text.
-   *
-   * @var int
-   */
-  var $text_angle_minimum = -20;
-
-  /**
-   * The minimum angle in degrees, with 0 degrees being left-to-right reading text.<br />
-   * Higher values represent a counter-clockwise rotation.<br />
-   * For example, a value of 90 would result in bottom-to-top reading text.
-   *
-   * @var int
-   */
-  var $text_angle_maximum = 20;
-
-  /**
-   * The X-Position on the image where letter drawing will begin.<br />
-   * This value is in pixels from the left side of the image.
-   *
-   * @var int
-   */
-  var $text_x_start = 8;
-
-  /**
-   * Letters can be spaced apart at random distances.<br />
-   * This is the minimum distance between two letters.<br />
-   * This should be <i>at least</i> as wide as a font character.<br />
-   * Small values can cause letters to be drawn over eachother.<br />
-   *
-   * @var int
-   */
-  var $text_minimum_distance = 30;
-
-  /**
-   * Letters can be spaced apart at random distances.<br />
-   * This is the maximum distance between two letters.<br />
-   * This should be <i>at least</i> as wide as a font character.<br />
-   * Small values can cause letters to be drawn over eachother.<br />
-   *
-   * @var int
-   */
-  var $text_maximum_distance = 33;
-
-  /**
-   * The background color for the image.<br />
-   * This should be specified in HTML hex format.<br />
-   * Make sure to include the preceding # sign!
-   *
-   * @var string
-   */
-  var $image_bg_color = "#e3daed";
-
-  /**
-   * The text color to use for drawing characters.<br />
-   * This value is ignored if $use_multi_text is set to true.<br />
-   * Make sure this contrasts well with the background color.<br />
-   * Specify the color in HTML hex format with preceding # sign
-   *
-   * @see Securimage::$use_multi_text
-   * @var string
-   */
-  var $text_color = "#ff0000";
-
-  /**
-   * Set to true to use multiple colors for each character.
-   *
-   * @see Securimage::$multi_text_color
-   * @var boolean
-   */
-  var $use_multi_text = true;
-
-  /**
-   * String of HTML hex colors to use.<br />
-   * Separate each possible color with commas.<br />
-   * Be sure to precede each value with the # sign.
-   *
-   * @var string
-   */
-  var $multi_text_color = "#0a68dd,#f65c47,#8d32fd";
-
-  /**
-   * Set to true to make the characters appear transparent.
-   *
-   * @see Securimage::$text_transparency_percentage
-   * @var boolean
-   */
-  var $use_transparent_text = true;
-
-  /**
-   * The percentage of transparency, 0 to 100.<br />
-   * A value of 0 is completely opaque, 100 is completely transparent (invisble)
-   *
-   * @see Securimage::$use_transparent_text
-   * @var int
-   */
-  var $text_transparency_percentage = 15;
-
-
-  // Line options
-  /**
-   * Draw vertical and horizontal lines on the image.
-   *
-   * @see Securimage::$line_color
-   * @see Securimage::$line_distance
-   * @see Securimage::$line_thickness
-   * @see Securimage::$draw_lines_over_text
-   * @var boolean
-   */
-  var $draw_lines = true;
-
-  /**
-   * The color of the lines drawn on the image.<br />
-   * Use HTML hex format with preceding # sign.
-   *
-   * @see Securimage::$draw_lines
-   * @var string
-   */
-  var $line_color = "#80BFFF";
-
-  /**
-   * How far apart to space the lines from eachother in pixels.
-   *
-   * @see Securimage::$draw_lines
-   * @var int
-   */
-  var $line_distance = 5;
-
-  /**
-   * How thick to draw the lines in pixels.<br />
-   * 1-3 is ideal depending on distance
-   *
-   * @see Securimage::$draw_lines
-   * @see Securimage::$line_distance
-   * @var int
-   */
-  var $line_thickness = 1;
-
-  /**
-   * Set to true to draw angled lines on the image in addition to the horizontal and vertical lines.
-   *
-   * @see Securimage::$draw_lines
-   * @var boolean
-   */
-  var $draw_angled_lines = false;
-
-  /**
-   * Draw the lines over the text.<br />
-   * If fales lines will be drawn before putting the text on the image.<br />
-   * This can make the image hard for humans to read depending on the line thickness and distance.
-   *
-   * @var boolean
-   */
-  var $draw_lines_over_text = false;
-
-  /**
-   * For added security, it is a good idea to draw arced lines over the letters to make it harder for bots to segment the letters.<br />
-   * Two arced lines will be drawn over the text on each side of the image.<br />
-   * This is currently expirimental and may be off in certain configurations.
-   *
-   * @var boolean
-   */
-  var $arc_linethrough = true;
-
-  /**
-   * The colors or color of the arced lines.<br />
-   * Use HTML hex notation with preceding # sign, and separate each value with a comma.<br />
-   * This should be similar to your font color for single color images.
-   *
-   * @var string
-   */
-  var $arc_line_colors = "#8080ff";
-
-  /**
-   * Full path to the WAV files to use to make the audio files, include trailing /.<br />
-   * Name Files  [A-Z0-9].wav
-   *
-   * @since 1.0.1
-   * @var string
-   */
-  var $audio_path = './audio/';
-
-
-  //END USER CONFIGURATION
-  //There should be no need to edit below unless you really know what you are doing.
-
-  /**
-   * The gd image resource.
-   *
-   * @access private
-   * @var resource
-   */
-  var $im;
-
-  /**
-   * The background image resource
-   *
-   * @access private
-   * @var resource
-   */
-  var $bgimg;
-
-  /**
-   * The code generated by the script
-   *
-   * @access private
-   * @var string
-   */
-  var $code;
-
-  /**
-   * The code that was entered by the user
-   *
-   * @access private
-   * @var string
-   */
-  var $code_entered;
-
-  /**
-   * Whether or not the correct code was entered
-   *
-   * @access private
-   * @var boolean
-   */
-  var $correct_code;
-
-  /**
-   * Class constructor.<br />
-   * Because the class uses sessions, this will attempt to start a session if there is no previous one.<br />
-   * If you do not start a session before calling the class, the constructor must be called before any
-   * output is sent to the browser.
-   *
-   * <code>
-   *   $securimage = new Securimage();
-   * </code>
-   *
-   */
-  function __construct()
-  {
-    if ( session_id() == '' ) { // no session has been started yet, which is needed for validation
-      session_start();
-    }
-  }
-
-  /**
-   * Generate a code and output the image to the browser.
-   *
-   * <code>
-   *   <?php
-   *   include 'securimage.php';
-   *   $securimage = new Securimage();
-   *   $securimage->show('bg.jpg');
-   *   ?>
-   * </code>
-   *
-   * @param string $background_image  The path to an image to use as the background for the CAPTCHA
-   */
-  function show($background_image = "")
-  {
-    if($background_image != "" && is_readable($background_image)) {
-      $this->bgimg = $background_image;
-    }
-
-    $this->doImage();
-  }
-
-  /**
-   * Validate the code entered by the user.
-   *
-   * <code>
-   *   $code = $_POST['code'];
-   *   if ($securimage->check($code) == false) {
-   *     die("Sorry, the code entered did not match.");
-   *   } else {
-   *     $valid = true;
-   *   }
-   * </code>
-   * @param string $code  The code the user entered
-   * @return boolean  true if the code was correct, false if not
-   */
-  function check($code)
-  {
-    $this->code_entered = $code;
-    $this->validate();
-    return $this->correct_code;
-  }
-
-  /**
-   * Generate and output the image
-   *
-   * @access private
-   *
-   */
-  function doImage()
-  {
-    if($this->use_transparent_text == true || $this->bgimg != "") {
-      $this->im = imagecreatetruecolor($this->image_width, $this->image_height);
-      $bgcolor = imagecolorallocate($this->im, hexdec(substr($this->image_bg_color, 1, 2)), hexdec(substr($this->image_bg_color, 3, 2)), hexdec(substr($this->image_bg_color, 5, 2)));
-      imagefilledrectangle($this->im, 0, 0, imagesx($this->im), imagesy($this->im), $bgcolor);
-    } else { //no transparency
-      $this->im = imagecreate($this->image_width, $this->image_height);
-      $bgcolor = imagecolorallocate($this->im, hexdec(substr($this->image_bg_color, 1, 2)), hexdec(substr($this->image_bg_color, 3, 2)), hexdec(substr($this->image_bg_color, 5, 2)));
-    }
-
-    if($this->bgimg != "") { $this->setBackground(); }
-
-    $this->createCode();
-
-    if (!$this->draw_lines_over_text && $this->draw_lines) $this->drawLines();
-
-    $this->drawWord();
-
-    if ($this->arc_linethrough == true) $this->arcLines();
-
-    if ($this->draw_lines_over_text && $this->draw_lines) $this->drawLines();
-
-    $this->output();
-
-  }
-
-  /**
-   * Set the background of the CAPTCHA image
-   *
-   * @access private
-   *
-   */
-  function setBackground()
-  {
-    $dat = @getimagesize($this->bgimg);
-    if($dat == false) { return; }
-
-    switch($dat[2]) {
-      case 1:  $newim = @imagecreatefromgif($this->bgimg); break;
-      case 2:  $newim = @imagecreatefromjpeg($this->bgimg); break;
-      case 3:  $newim = @imagecreatefrompng($this->bgimg); break;
-      case 15: $newim = @imagecreatefromwbmp($this->bgimg); break;
-      case 16: $newim = @imagecreatefromxbm($this->bgimg); break;
-      default: return;
-    }
-
-    if(!$newim) return;
-
-    imagecopy($this->im, $newim, 0, 0, 0, 0, $this->image_width, $this->image_height);
-  }
-
-  /**
-   * Draw arced lines over the text
-   *
-   * @access private
-   *
-   */
-  function arcLines()
-  {
-    $colors = explode(',', $this->arc_line_colors);
-    imagesetthickness($this->im, 3);
-
-    $color = $colors[rand(0, sizeof($colors) - 1)];
-    $linecolor = imagecolorallocate($this->im, hexdec(substr($color, 1, 2)), hexdec(substr($color, 3, 2)), hexdec(substr($color, 5, 2)));
-
-    $xpos   = $this->text_x_start + ($this->font_size * 2) + rand(-5, 5);
-    $width  = $this->image_width / 2.66 + rand(3, 10);
-    $height = $this->font_size * 2.14 - rand(3, 10);
-
-    if ( rand(0,100) % 2 == 0 ) {
-      $start = rand(0,66);
-      $ypos  = $this->image_height / 2 - rand(5, 15);
-      $xpos += rand(5, 15);
-    } else {
-      $start = rand(180, 246);
-      $ypos  = $this->image_height / 2 + rand(5, 15);
-    }
-
-    $end = $start + rand(75, 110);
-
-    imagearc($this->im, $xpos, $ypos, $width, $height, $start, $end, $linecolor);
-
-    $color = $colors[rand(0, sizeof($colors) - 1)];
-    $linecolor = imagecolorallocate($this->im, hexdec(substr($color, 1, 2)), hexdec(substr($color, 3, 2)), hexdec(substr($color, 5, 2)));
-
-    if ( rand(1,75) % 2 == 0 ) {
-      $start = rand(45, 111);
-      $ypos  = $this->image_height / 2 - rand(5, 15);
-      $xpos += rand(5, 15);
-    } else {
-      $start = rand(200, 250);
-      $ypos  = $this->image_height / 2 + rand(5, 15);
-    }
-
-    $end = $start + rand(75, 100);
-
-    imagearc($this->im, $this->image_width * .75, $ypos, $width, $height, $start, $end, $linecolor);
-  }
-
-  /**
-   * Draw lines on the image
-   *
-   * @access private
-   *
-   */
-  function drawLines()
-  {
-    $linecolor = imagecolorallocate($this->im, hexdec(substr($this->line_color, 1, 2)), hexdec(substr($this->line_color, 3, 2)), hexdec(substr($this->line_color, 5, 2)));
-    imagesetthickness($this->im, $this->line_thickness);
-
-    //vertical lines
-    for($x = 1; $x < $this->image_width; $x += $this->line_distance) {
-      imageline($this->im, $x, 0, $x, $this->image_height, $linecolor);
-    }
-
-    //horizontal lines
-    for($y = 11; $y < $this->image_height; $y += $this->line_distance) {
-      imageline($this->im, 0, $y, $this->image_width, $y, $linecolor);
-    }
-
-    if ($this->draw_angled_lines == true) {
-      for ($x = -($this->image_height); $x < $this->image_width; $x += $this->line_distance) {
-        imageline($this->im, $x, 0, $x + $this->image_height, $this->image_height, $linecolor);
-      }
-
-      for ($x = $this->image_width + $this->image_height; $x > 0; $x -= $this->line_distance) {
-        imageline($this->im, $x, 0, $x - $this->image_height, $this->image_height, $linecolor);
-      }
-    }
-  }
-
-  /**
-   * Draw the CAPTCHA code over the image
-   *
-   * @access private
-   *
-   */
-  function drawWord()
-  {
-    if ($this->use_gd_font == true) {
-      if (!is_int($this->gd_font_file)) { //is a file name
-        $font = @imageloadfont($this->gd_font_file);
-        if ($font == false) {
-          trigger_error("Failed to load GD Font file {$this->gd_font_file} ", E_USER_WARNING);
-          return;
-        }
-      } else { //gd font identifier
-        $font = $this->gd_font_file;
-      }
-
-      $color = imagecolorallocate($this->im, hexdec(substr($this->text_color, 1, 2)), hexdec(substr($this->text_color, 3, 2)), hexdec(substr($this->text_color, 5, 2)));
-      imagestring($this->im, $font, $this->text_x_start, ($this->image_height / 2) - ($this->gd_font_size / 2), $this->code, $color);
-
-    } else { //ttf font
-      if($this->use_transparent_text == true) {
-        $alpha = intval($this->text_transparency_percentage / 100 * 127);
-        $font_color = imagecolorallocatealpha($this->im, hexdec(substr($this->text_color, 1, 2)), hexdec(substr($this->text_color, 3, 2)), hexdec(substr($this->text_color, 5, 2)), $alpha);
-      } else { //no transparency
-        $font_color = imagecolorallocate($this->im, hexdec(substr($this->text_color, 1, 2)), hexdec(substr($this->text_color, 3, 2)), hexdec(substr($this->text_color, 5, 2)));
-      }
-
-      $x = $this->text_x_start;
-      $strlen = strlen($this->code);
-      $y_min = ($this->image_height / 2) + ($this->font_size / 2) - 2;
-      $y_max = ($this->image_height / 2) + ($this->font_size / 2) + 2;
-      $colors = explode(',', $this->multi_text_color);
-
-      for($i = 0; $i < $strlen; ++$i) {
-        $angle = rand($this->text_angle_minimum, $this->text_angle_maximum);
-        $y = rand($y_min, $y_max);
-        if ($this->use_multi_text == true) {
-          $idx = rand(0, sizeof($colors) - 1);
-          $r = substr($colors[$idx], 1, 2);
-          $g = substr($colors[$idx], 3, 2);
-          $b = substr($colors[$idx], 5, 2);
-          if($this->use_transparent_text == true) {
-            $font_color = imagecolorallocatealpha($this->im, "0x$r", "0x$g", "0x$b", $alpha);
-          } else {
-            $font_color = imagecolorallocate($this->im, "0x$r", "0x$g", "0x$b");
-          }
-        }
-        @imagettftext($this->im, $this->font_size, $angle, $x, $y, $font_color, $this->ttf_file, $this->code{$i});
-
-        $x += rand($this->text_minimum_distance, $this->text_maximum_distance);
-      } //for loop
-    } //else ttf font
-  } //function
-
-  /**
-   * Create a code and save to the session
-   *
-   * @since 1.0.1
-   *
-   */
-  function createCode()
-  {
-    $this->code = false;
-
-    if ($this->use_wordlist && is_readable($this->wordlist_file)) {
-      $this->code = $this->readCodeFromFile();
-    }
-
-    if ($this->code == false) {
-      $this->code = $this->generateCode($this->code_length);
-    }
-
-    $this->saveData();
-  }
-
-  /**
-   * Generate a code
-   *
-   * @access private
-   * @param int $len  The code length
-   * @return string
-   */
-  function generateCode($len)
-  {
-    $code = '';
-
-    for($i = 1, $cslen = strlen($this->charset); $i <= $len; ++$i) {
-      $code .= strtoupper( $this->charset{rand(0, $cslen - 1)} );
-    }
-    return $code;
-  }
-
-  /**
-   * Reads a word list file to get a code
-   *
-   * @access private
-   * @since 1.0.2
-   * @return mixed  false on failure, a word on success
-   */
-  function readCodeFromFile()
-  {
-    $fp = @fopen($this->wordlist_file, 'rb');
-    if (!$fp) return false;
-
-    $fsize = filesize($this->wordlist_file);
-    if ($fsize < 32) return false; // too small of a list to be effective
-
-    if ($fsize < 128) {
-      $max = $fsize; // still pretty small but changes the range of seeking
-    } else {
-      $max = 128;
-    }
-
-    fseek($fp, rand(0, $fsize - $max), SEEK_SET);
-    $data = fread($fp, 128); // read a random 128 bytes from file
-    fclose($fp);
-    $data = preg_replace("/\r?\n/", "\n", $data);
-
-    $start = strpos($data, "\n", rand(0, 100)) + 1; // random start position
-    $end   = strpos($data, "\n", $start);           // find end of word
-
-    return strtolower(substr($data, $start, $end - $start)); // return substring in 128 bytes
-  }
-
-  /**
-   * Output image to the browser
-   *
-   * @access private
-   *
-   */
-  function output()
-  {
-    header("Expires: Sun, 1 Jan 2000 12:00:00 GMT");
-    header("Last-Modified: " . gmdate("D, d M Y H:i:s") . "GMT");
-    header("Cache-Control: no-store, no-cache, must-revalidate");
-    header("Cache-Control: post-check=0, pre-check=0", false);
-    header("Pragma: no-cache");
-
-    switch($this->image_type)
-    {
-      case SI_IMAGE_JPEG:
-        header("Content-Type: image/jpeg");
-        imagejpeg($this->im, null, 90);
-        break;
-
-      case SI_IMAGE_GIF:
-        header("Content-Type: image/gif");
-        imagegif($this->im);
-        break;
-
-      default:
-        header("Content-Type: image/png");
-        imagepng($this->im);
-        break;
-    }
-
-    imagedestroy($this->im);
-  }
-
-  /**
-   * Get WAV file data of the spoken code.<br />
-   * This is appropriate for output to the browser as audio/x-wav
-   *
-   * @since 1.0.1
-   * @return string  WAV data
-   *
-   */
-  function getAudibleCode()
-  {
-    $letters = array();
-    $code    = $this->getCode();
-
-    if ($code == '') {
-      $this->createCode();
-      $code = $this->getCode();
-    }
-
-    for($i = 0; $i < strlen($code); ++$i) {
-      $letters[] = $code{$i};
-    }
-
-    return $this->generateWAV($letters);
-  }
-
-  /**
-   * Save the code in the session
-   *
-   * @access private
-   *
-   */
-  function saveData()
-  {
-    $_SESSION['securimage_code_value'] = strtolower($this->code);
-  }
-
-  /**
-   * Validate the code to the user code
-   *
-   * @access private
-   *
-   */
-  function validate()
-  {
-    if ( isset($_SESSION['securimage_code_value']) && !empty($_SESSION['securimage_code_value']) ) {
-      if ( $_SESSION['securimage_code_value'] == strtolower(trim($this->code_entered)) ) {
-        $this->correct_code = true;
-        $_SESSION['securimage_code_value'] = '';
-      } else {
-        $this->correct_code = false;
-      }
-    } else {
-      $this->correct_code = false;
-    }
-  }
-
-  /**
-   * Get the captcha code
-   *
-   * @since 1.0.1
-   * @return string
-   */
-  function getCode()
-  {
-    if (isset($_SESSION['securimage_code_value']) && !empty($_SESSION['securimage_code_value'])) {
-      return $_SESSION['securimage_code_value'];
-    } else {
-      return '';
-    }
-  }
-
-  /**
-   * Check if the user entered code was correct
-   *
-   * @access private
-   * @return boolean
-   */
-  function checkCode()
-  {
-    return $this->correct_code;
-  }
-
-  /**
-   * Generate a wav file by concatenating individual files
-   * @since 1.0.1
-   * @access private
-   * @param array $letters  Array of letters to build a file from
-   * @return string  WAV file data
-   */
-  function generateWAV($letters)
-  {
-    $first = true; // use first file to write the header...
-    $data_len    = 0;
-    $files       = array();
-    $out_data    = '';
-
-    foreach ($letters as $letter) {
-      $filename = $this->audio_path . strtoupper($letter) . '.wav';
-
-      $fp = fopen($filename, 'rb');
-
-      $file = array();
-
-      $data = fread($fp, filesize($filename)); // read file in
-
-      $header = substr($data, 0, 36);
-      $body   = substr($data, 44);
-
-
-      $data = unpack('NChunkID/VChunkSize/NFormat/NSubChunk1ID/VSubChunk1Size/vAudioFormat/vNumChannels/VSampleRate/VByteRate/vBlockAlign/vBitsPerSample', $header);
-
-      $file['sub_chunk1_id']   = $data['SubChunk1ID'];
-      $file['bits_per_sample'] = $data['BitsPerSample'];
-      $file['channels']        = $data['NumChannels'];
-      $file['format']          = $data['AudioFormat'];
-      $file['sample_rate']     = $data['SampleRate'];
-      $file['size']            = $data['ChunkSize'] + 8;
-      $file['data']            = $body;
-
-      if ( ($p = strpos($file['data'], 'LIST')) !== false) {
-        // If the LIST data is not at the end of the file, this will probably break your sound file
-        $info         = substr($file['data'], $p + 4, 8);
-        $data         = unpack('Vlength/Vjunk', $info);
-        $file['data'] = substr($file['data'], 0, $p);
-        $file['size'] = $file['size'] - (strlen($file['data']) - $p);
-      }
-
-      $files[] = $file;
-      $data    = null;
-      $header  = null;
-      $body    = null;
-
-      $data_len += strlen($file['data']);
-
-      fclose($fp);
-    }
-
-    $out_data = '';
-	$file_size = sizeof($files);
-	
-    for($i = 0; $i < $file_size; ++$i) {
-      if ($i == 0) { // output header
-        $out_data .= pack('C4VC8', ord('R'), ord('I'), ord('F'), ord('F'), $data_len + 36, ord('W'), ord('A'), ord('V'), ord('E'), ord('f'), ord('m'), ord('t'), ord(' '));
-
-        $out_data .= pack('VvvVVvv',
-                          16,
-                          $files[$i]['format'],
-                          $files[$i]['channels'],
-                          $files[$i]['sample_rate'],
-                          $files[$i]['sample_rate'] * (($files[$i]['bits_per_sample'] * $files[$i]['channels']) / 8),
-                          ($files[$i]['bits_per_sample'] * $files[$i]['channels']) / 8,
-                          $files[$i]['bits_per_sample'] );
-
-        $out_data .= pack('C4', ord('d'), ord('a'), ord('t'), ord('a'));
-
-        $out_data .= pack('V', $data_len);
-      }
-
-      $out_data .= $files[$i]['data'];
-    }
-
-    return $out_data;
-  }
-} /* class Securimage */
-
-?>
diff --git a/lib/securimage/securimage_example.php b/lib/securimage/securimage_example.php
deleted file mode 100644
index 09eaf9633..000000000
--- a/lib/securimage/securimage_example.php
+++ /dev/null
@@ -1,6 +0,0 @@
-Out of the box example of Securimage CAPTCHA Class.<br /><br />
-
-<img src="securimage_show.php?sid=<?php echo md5(uniqid(time())); ?>" id="image" align="absmiddle" />
-<a href="securimage_play.php" style="font-size: 13px">(Audio)</a><br /><br />
-
-<a href="#" onclick="document.getElementById('image').src = 'securimage_show.php?sid=' + Math.random(); return false">Reload Image</a>
diff --git a/lib/securimage/securimage_play.php b/lib/securimage/securimage_play.php
deleted file mode 100644
index c507da659..000000000
--- a/lib/securimage/securimage_play.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-include 'securimage.php';
-
-$img = new Securimage();
-
-header('Content-type: audio/x-wav');
-header('Content-Disposition: attachment; name="securimage.wav"');
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Expires: Sun, 1 Jan 2000 12:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . 'GMT');
-
-echo $img->getAudibleCode();
-exit;
-
-?>
\ No newline at end of file
diff --git a/lib/securimage/securimage_show.php b/lib/securimage/securimage_show.php
deleted file mode 100644
index 40b62d9dc..000000000
--- a/lib/securimage/securimage_show.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-include 'securimage.php';
-
-$img = new securimage();
-
-$img->show(); // alternate use:  $img->show('/path/to/background.jpg');
-
-?>

From dd105e174e4f081eb3dea1931274308203742be0 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 14 May 2016 22:56:08 +0100
Subject: [PATCH 076/250] images aren't always jpg, so don't force jpg all the
 handle_* exts use this as well, which can cause issues

---
 .htaccess                | 13 +++++++++++--
 core/imageboard.pack.php |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.htaccess b/.htaccess
index fd9515908..7fdf0a5af 100644
--- a/.htaccess
+++ b/.htaccess
@@ -31,8 +31,6 @@
 	php_flag magic_quotes_runtime 0
 </IfModule>
 
-DefaultType image/jpeg
-
 <IfModule mod_expires.c>
 	ExpiresActive On
 	<FilesMatch "([0-9a-f]{32}|\.(gif|jpe?g|png|css|js))$">
@@ -49,3 +47,14 @@ DefaultType image/jpeg
 	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
 	AddOutputFilterByType DEFLATE application/x-javascript application/javascript
 </ifmodule>
+
+DefaultType image/jpeg
+AddType audio/mp4      f4a f4b m4a
+AddType audio/ogg      oga ogg opus
+AddType image/bmp      bmp
+AddType image/svg+xml  svg svgz
+AddType image/webp     webp
+AddType video/mp4      f4v f4p m4v mp4
+AddType video/ogg      ogv
+AddType video/webm     webm
+AddType video/x-flv    flv
\ No newline at end of file
diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 9a426a031..71badf09b 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -388,7 +388,7 @@ public function get_tag_list() {
 	 * @return string
 	 */
 	public function get_image_link() {
-		return $this->get_link('image_ilink', '_images/$hash/$id%20-%20$tags.$ext', 'image/$id.jpg');
+		return $this->get_link('image_ilink', '_images/$hash/$id%20-%20$tags.$ext', 'image/$id.$ext');
 	}
 
 	/**

From b0daab87662adf130ebca9a3f9efe24c0dd44cfd Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 14 May 2016 23:14:29 +0100
Subject: [PATCH 077/250] move from Jaris > MediaElement for <video> fallback +
 use composer also made it so the video element is no longer bigger than
 parent div

---
 composer.json                                 |    4 +-
 ext/handle_video/main.php                     |    1 -
 ext/handle_video/theme.php                    |   79 +-
 lib/Jaris/Jaris FLV Player.hxproj             |   55 -
 lib/Jaris/bin/JarisFLVPlayer.swf              |  Bin 26245 -> 0 bytes
 lib/Jaris/bin/expressInstall.swf              |  Bin 773 -> 0 bytes
 lib/Jaris/bin/index.html                      |  126 --
 lib/Jaris/bin/jarisflvplayer.js               |   98 -
 lib/Jaris/bin/js/swfobject.js                 |    4 -
 lib/Jaris/bin/logo-color.png                  |  Bin 14039 -> 0 bytes
 lib/Jaris/bin/logo.png                        |  Bin 34150 -> 0 bytes
 lib/Jaris/bin/poster.png                      |  Bin 89121 -> 0 bytes
 lib/Jaris/changes.txt                         |  118 --
 lib/Jaris/documentation.txt                   |  157 --
 lib/Jaris/license.txt                         |  789 --------
 lib/Jaris/readme.txt                          |   52 -
 lib/Jaris/src/jaris/Main.hx                   |  204 --
 lib/Jaris/src/jaris/Version.hx                |   35 -
 lib/Jaris/src/jaris/animation/Animation.hx    |   77 -
 .../src/jaris/animation/AnimationsBase.hx     |  306 ---
 lib/Jaris/src/jaris/display/Loader.hx         |  181 --
 lib/Jaris/src/jaris/display/Logo.hx           |  185 --
 lib/Jaris/src/jaris/display/Menu.hx           |  246 ---
 lib/Jaris/src/jaris/display/Poster.hx         |  170 --
 lib/Jaris/src/jaris/events/PlayerEvents.hx    |   84 -
 lib/Jaris/src/jaris/player/AspectRatio.hx     |   49 -
 lib/Jaris/src/jaris/player/InputType.hx       |   32 -
 lib/Jaris/src/jaris/player/JsApi.hx           |  232 ---
 lib/Jaris/src/jaris/player/Loop.hx            |   50 -
 lib/Jaris/src/jaris/player/Player.hx          | 1788 -----------------
 lib/Jaris/src/jaris/player/StreamType.hx      |   34 -
 lib/Jaris/src/jaris/player/UserSettings.hx    |  112 --
 .../jaris/player/controls/AspectRatioIcon.hx  |  119 --
 .../src/jaris/player/controls/Controls.hx     |  912 ---------
 .../jaris/player/controls/FullscreenIcon.hx   |  114 --
 .../src/jaris/player/controls/PauseIcon.hx    |  112 --
 .../src/jaris/player/controls/PlayIcon.hx     |  107 -
 .../src/jaris/player/controls/VolumeIcon.hx   |  110 -
 .../player/newcontrols/AspectRatioIcon.hx     |  130 --
 .../player/newcontrols/FullscreenIcon.hx      |  130 --
 .../src/jaris/player/newcontrols/Loader.hx    |  195 --
 .../jaris/player/newcontrols/NewControls.hx   |  945 ---------
 .../src/jaris/player/newcontrols/PauseIcon.hx |  127 --
 .../src/jaris/player/newcontrols/PlayIcon.hx  |  122 --
 .../jaris/player/newcontrols/VolumeIcon.hx    |  125 --
 lib/Jaris/src/jaris/utils/Utils.hx            |  161 --
 46 files changed, 44 insertions(+), 8633 deletions(-)
 delete mode 100644 lib/Jaris/Jaris FLV Player.hxproj
 delete mode 100644 lib/Jaris/bin/JarisFLVPlayer.swf
 delete mode 100644 lib/Jaris/bin/expressInstall.swf
 delete mode 100644 lib/Jaris/bin/index.html
 delete mode 100644 lib/Jaris/bin/jarisflvplayer.js
 delete mode 100644 lib/Jaris/bin/js/swfobject.js
 delete mode 100644 lib/Jaris/bin/logo-color.png
 delete mode 100644 lib/Jaris/bin/logo.png
 delete mode 100644 lib/Jaris/bin/poster.png
 delete mode 100644 lib/Jaris/changes.txt
 delete mode 100644 lib/Jaris/documentation.txt
 delete mode 100644 lib/Jaris/license.txt
 delete mode 100644 lib/Jaris/readme.txt
 delete mode 100644 lib/Jaris/src/jaris/Main.hx
 delete mode 100644 lib/Jaris/src/jaris/Version.hx
 delete mode 100644 lib/Jaris/src/jaris/animation/Animation.hx
 delete mode 100644 lib/Jaris/src/jaris/animation/AnimationsBase.hx
 delete mode 100644 lib/Jaris/src/jaris/display/Loader.hx
 delete mode 100644 lib/Jaris/src/jaris/display/Logo.hx
 delete mode 100644 lib/Jaris/src/jaris/display/Menu.hx
 delete mode 100644 lib/Jaris/src/jaris/display/Poster.hx
 delete mode 100644 lib/Jaris/src/jaris/events/PlayerEvents.hx
 delete mode 100644 lib/Jaris/src/jaris/player/AspectRatio.hx
 delete mode 100644 lib/Jaris/src/jaris/player/InputType.hx
 delete mode 100644 lib/Jaris/src/jaris/player/JsApi.hx
 delete mode 100644 lib/Jaris/src/jaris/player/Loop.hx
 delete mode 100644 lib/Jaris/src/jaris/player/Player.hx
 delete mode 100644 lib/Jaris/src/jaris/player/StreamType.hx
 delete mode 100644 lib/Jaris/src/jaris/player/UserSettings.hx
 delete mode 100644 lib/Jaris/src/jaris/player/controls/AspectRatioIcon.hx
 delete mode 100644 lib/Jaris/src/jaris/player/controls/Controls.hx
 delete mode 100644 lib/Jaris/src/jaris/player/controls/FullscreenIcon.hx
 delete mode 100644 lib/Jaris/src/jaris/player/controls/PauseIcon.hx
 delete mode 100644 lib/Jaris/src/jaris/player/controls/PlayIcon.hx
 delete mode 100644 lib/Jaris/src/jaris/player/controls/VolumeIcon.hx
 delete mode 100644 lib/Jaris/src/jaris/player/newcontrols/AspectRatioIcon.hx
 delete mode 100644 lib/Jaris/src/jaris/player/newcontrols/FullscreenIcon.hx
 delete mode 100644 lib/Jaris/src/jaris/player/newcontrols/Loader.hx
 delete mode 100644 lib/Jaris/src/jaris/player/newcontrols/NewControls.hx
 delete mode 100644 lib/Jaris/src/jaris/player/newcontrols/PauseIcon.hx
 delete mode 100644 lib/Jaris/src/jaris/player/newcontrols/PlayIcon.hx
 delete mode 100644 lib/Jaris/src/jaris/player/newcontrols/VolumeIcon.hx
 delete mode 100644 lib/Jaris/src/jaris/utils/Utils.hx

diff --git a/composer.json b/composer.json
index aaa82c8de..d147f961f 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,8 @@
 
 		"bower-asset/jquery"         : "1.12.3",
 		"bower-asset/jquery-timeago" : "1.5.2",
-		"bower-asset/tablesorter"    : "2.0.5"
+		"bower-asset/tablesorter"    : "2.0.5",
+		"bower-asset/mediaelement"   : "2.21.1"
 	},
 
 	"vendor-copy": {
@@ -36,6 +37,7 @@
 		"vendor/bower-asset/jquery/dist/jquery.min.map"            : "lib/vendor/js/jquery-1.12.3.min.map",
 		"vendor/bower-asset/jquery-timeago/jquery.timeago.js"      : "lib/vendor/js/jquery.timeago.js",
 		"vendor/bower-asset/tablesorter/jquery.tablesorter.min.js" : "lib/vendor/js/jquery.tablesorter.min.js"
+		"vendor/bower-asset/mediaelement/build/flashmediaelement.swf" : "lib/vendor/swf/flashmediaelement.swf"
 	},
 
 	"scripts": {
diff --git a/ext/handle_video/main.php b/ext/handle_video/main.php
index 4acb612de..21585748a 100644
--- a/ext/handle_video/main.php
+++ b/ext/handle_video/main.php
@@ -14,7 +14,6 @@
  *  In the future, it may be necessary to change the user agent checks to reflect the current state of H.264 support.<br><br>
  *  Made possible by:<br>
  *  <a href='http://getid3.sourceforge.net/'>getID3()</a> - Gets media information with PHP (no bulky FFMPEG API required).<br>
- *  <a href='http://jarisflvplayer.org/'>Jaris FLV Player</a> - GPLv3 flash multimedia player.
  */
 
 class VideoFileHandler extends DataHandlerExtension {
diff --git a/ext/handle_video/theme.php b/ext/handle_video/theme.php
index 3cb886748..774ea55a7 100644
--- a/ext/handle_video/theme.php
+++ b/ext/handle_video/theme.php
@@ -4,45 +4,48 @@ class VideoFileHandlerTheme extends Themelet {
 	public function display_image(Page $page, Image $image) {
 		$data_href = get_base_href();
 		$ilink = $image->get_image_link();
+		$thumb_url = make_http($image->get_thumb_link()); //used as fallback image
 		$ext = strtolower($image->get_ext());
-		
-		if ($ext == "mp4") {
-			$html = "Video not playing? <a href='" . $image->parse_link_template(make_link('image/$id/$id%20-%20$tags.$ext')) . "'>Click here</a> to download the file.<br/>
-			<script language='JavaScript' type='text/javascript'>
-if( navigator.userAgent.match(/Firefox/i) ||
-	navigator.userAgent.match(/Opera/i) ||
-	(navigator.userAgent.match(/MSIE/i) && parseFloat(navigator.appVersion.split('MSIE')[1]) < 9)){
-		document.write(\"<object data='{$data_href}/lib/Jaris/bin/JarisFLVPlayer.swf' id='VideoPlayer' type='application/x-shockwave-flash' height='" . strval($image->height + 1). "px' width='" . strval($image->width) . "px'><param value='#000000' name='bgcolor'><param name='allowFullScreen' value='true'><param value='high' name='quality'><param value='opaque' name='wmode'><param value='source=$ilink&amp;type=video&amp;streamtype=file&amp;controltype=0' name='flashvars'></object>\");
-}
-else {	
-		document.write(\"<video controls autoplay loop'>\");
-		document.write(\"<source src='" . make_link("/image/" . $image->id) . "' type='video/mp4' />\");
-		document.write(\"<object data='{$data_href}/lib/Jaris/bin/JarisFLVPlayer.swf' id='VideoPlayer' type='application/x-shockwave-flash' height='" . strval($image->height + 1). "px' width='" . strval($image->width) . "px'><param value='#000000' name='bgcolor'><param name='allowFullScreen' value='true'><param value='high' name='quality'><param value='opaque' name='wmode'><param value='source=$ilink&amp;type=video&amp;streamtype=file&amp;controltype=0' name='flashvars'></object>\");
-}
-</script>
-<noscript>Javascript appears to be disabled. Please enable it and try again.</noscript>";
-		} elseif ($ext == "flv") {
-			$html = "Video not playing? <a href='" . $image->parse_link_template(make_link('image/$id/$id%20-%20$tags.$ext')) . "'>Click here</a> to download the file.<br/>
-			<object data='{$data_href}/lib/Jaris/bin/JarisFLVPlayer.swf' id='VideoPlayer' type='application/x-shockwave-flash' height='" . strval($image->height + 1). "px' width='" . strval($image->width) . "px'>
-			<param value='#000000' name='bgcolor'>
-			<param name='allowFullScreen' value='true'>
-			<param value='high' name='quality'>
-			<param value='opaque' name='wmode'>
-			<param value='source={$ilink}&amp;type=video&amp;streamtype=file&amp;controltype=0' name='flashvars'>
-			</object>";
-		} elseif ($ext == "ogv") {
-			$html = "Video not playing? <a href='" . $image->parse_link_template(make_link('image/$id/$id%20-%20$tags.$ext')) . "'>Click here</a> to download the file.<br/>
-			<video controls autoplay loop>
-			<source src='" . make_link("/image/" . $image->id) . "' type='video/ogg' />
-			</video>";
-		} elseif ($ext == "webm") {
-			$ie_only = "<!--[if IE]><p>To view webm files with IE, please <a href='http://tools.google.com/dlpage/webmmf/' target='_blank'>download this plugin</a>.</p><![endif]-->";
-			$html = $ie_only ."Video not playing? <a href='" . $image->parse_link_template(make_link('image/$id/$id%20-%20$tags.$ext')) . "'>Click here</a> to download the file.<br/>
-			<video controls autoplay loop>
-			<source src='" . make_link("/image/" . $image->id) . "' type='video/webm' />
-			</video>";
-		}
-		else {
+		$full_url = make_http($ilink);
+
+		$html = "Video not playing? <a href='" . $image->parse_link_template(make_link('image/$id/$id%20-%20$tags.$ext')) . "'>Click here</a> to download the file.<br/>";
+
+		//Browser media format support: https://developer.mozilla.org/en-US/docs/Web/HTML/Supported_media_formats
+		$supportedExts = ['mp4' => 'video/mp4', 'm4v' => 'video/mp4', 'ogv' => 'video/ogg', 'webm' => 'video/webm', 'flv' => 'video/flv'];
+		if(array_key_exists($ext, $supportedExts)) {
+			//FLV isn't supported by <video>, but it should always fallback to the flash-based method.
+			if($ext == "webm") {
+				//Several browsers still lack WebM support sadly: http://caniuse.com/#feat=webm
+				$html .= "<!--[if IE]><p>To view webm files with IE, please <a href='https://tools.google.com/dlpage/webmmf/' target='_blank'>download this plugin</a>.</p><![endif]-->";
+			}
+
+			$html_fallback = "
+						<object width=\"100%\" height=\"480px\" type=\"application/x-shockwave-flash\" data=\"lib/vendor/swf/flashmediaelement.swf\">
+							<param name=\"movie\" value=\"lib/vendor/swf/flashmediaelement.swf\" />
+
+							<param name=\"allowFullScreen\" value=\"true\" />
+							<param name=\"wmode\" value=\"opaque\" />
+
+							<param name=\"flashVars\" value=\"controls=true&autoplay=true&poster={$thumb_url}&file={$full_url}\" />
+							<img src=\"{$thumb_url}\" />
+						</object>";
+
+			if($ext == "flv") {
+				//FLV doesn't support <video>.
+				$html .= $html_fallback;
+			} else {
+				$html .= "
+					<video controls autoplay width=\"100%\">
+						<source src='{$ilink}' type='{$supportedExts[$ext]}'>
+
+						<!-- If browser doesn't support filetype, fallback to flash -->
+						{$html_fallback}
+
+					</video>";
+			}
+
+		} else {
+			//This should never happen, but just in case let's have a fallback..
 			$html = "Video type '$ext' not recognised";
 		}
 		$page->add_block(new Block("Video", $html, "main", 10));
diff --git a/lib/Jaris/Jaris FLV Player.hxproj b/lib/Jaris/Jaris FLV Player.hxproj
deleted file mode 100644
index f71a96a89..000000000
--- a/lib/Jaris/Jaris FLV Player.hxproj	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project version="2">
-  <!-- Output SWF options -->
-  <output>
-    <movie outputType="Application" />
-    <movie input="" />
-    <movie path="bin\JarisFLVPlayer.swf" />
-    <movie fps="30" />
-    <movie width="800" />
-    <movie height="600" />
-    <movie version="10" />
-    <movie minorVersion="0" />
-    <movie platform="Flash Player" />
-    <movie background="#FFFFFF" />
-  </output>
-  <!-- Other classes to be compiled into your SWF -->
-  <classpaths>
-    <class path="src" />
-  </classpaths>
-  <!-- Build options -->
-  <build>
-    <option directives="" />
-    <option flashStrict="False" />
-    <option mainClass="jaris.Main" />
-    <option enabledebug="False" />
-    <option additional="" />
-  </build>
-  <!-- haxelib libraries -->
-  <haxelib>
-    <!-- example: <library name="..." /> -->
-  </haxelib>
-  <!-- Class files to compile (other referenced classes will automatically be included) -->
-  <compileTargets>
-    <compile path="src\jaris\Main.hx" />
-  </compileTargets>
-  <!-- Assets to embed into the output SWF -->
-  <library>
-    <!-- example: <asset path="..." id="..." update="..." glyphs="..." mode="..." place="..." sharepoint="..." /> -->
-  </library>
-  <!-- Paths to exclude from the Project Explorer tree -->
-  <hiddenPaths>
-    <!-- example: <hidden path="..." /> -->
-  </hiddenPaths>
-  <!-- Executed before build -->
-  <preBuildCommand />
-  <!-- Executed after build -->
-  <postBuildCommand alwaysRun="False" />
-  <!-- Other project options -->
-  <options>
-    <option showHiddenPaths="True" />
-    <option testMovie="Default" />
-  </options>
-  <!-- Plugin storage -->
-  <storage />
-</project>
\ No newline at end of file
diff --git a/lib/Jaris/bin/JarisFLVPlayer.swf b/lib/Jaris/bin/JarisFLVPlayer.swf
deleted file mode 100644
index 467f2eb06ea6e1a4ae37677e46a23f4122d5424c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26245
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
R*Z%9Zu`j{X{{jb>x~#2=sx$xq

diff --git a/lib/Jaris/bin/expressInstall.swf b/lib/Jaris/bin/expressInstall.swf
deleted file mode 100644
index 86958bf3a726d6e946e36fb5d34aaf315c9f0b24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 773
zcmV+g1N!_!S5pQ-1pokeoP|`)Pt-sZ|8;lSEwI4K*P@gUAu&n}HSvZZ1PFwL1zA83
z#=~qoK%v_<?G)UziE`q&i6KUho;-Td#D9RR@#@hd|H1mEU07Bz_Aq_#H}7kH@6C9~
zYQV-EvI-UwwOVaf9S5Mmt8XYcqYt^hGp%>y{QdanFT+{w@Z$&6T61KWAk)|Bv_e13
zkzQ;4o&u7j&L%&Rbo@gZgY7bt`wO<^ArQ<L+n&h;hj2HAZ#lboE-D@$T?!pTSg!K|
zmI=e=%wKT?_YavJ1z2#)p3SA3RgRbSP#|>VUco)Icx1Iz$4zdt3Vd!_J~za6aTSF^
zv*wWj_qQlBDW*%Qh0S3w+b%KVVDs71dTF1GvFIK}IVLX)XduinxNUQ@0WC30>N}o!
zfs~oyyJbqvCJncY%}OA6838v!-x3v2KKE$REi=oZ<i;MK56Qqsfr&l%%rVI)jQFCG
zuqT8!rR)C;uX|xh-?3S+7avcLU3E(4b4TdG(T>hS;l>^CCrO`0sUmoQT`uOOu;q$6
z<1wpLl5wyqJ7`kX;<6{Fxuz}PE2`~CqyDMTstKsdnp_h_xh7Y--z9J#Qch{r3^Ix|
zY?;Y7Ii^WhkbL|$fhUn|CW@qLyV8B;f9`SK)?zc-Ru5WDQM`J@cCFfi%&#QSu{?Cr
z+dO47+WT0El2ODo)ND#oJJ!}4Kqmp6SAi}9x(K+2g<_uQx;mdgu9>dfO#WmHmO~fB
zwl@V6VL+ECF##orl&8!NIZCpil=6m7F5}+VAx1_(hoWP3OC?`ddg2}8P?yWZU&#pU
zyAA|S`>(kLz(c%xfPHqz0>igFF-4=}MthU|rRVb?Scz+2sQcc%_lSyYh1whUsV`!p
zKbnU;b*BUBKqL9hX!lleS`s;^YU+TtJS}a8{^W9)Z0I-Gn1C1`i8`)kF72nuKvgp>
z7h-#+EfR^Hl<YnEj7CA^q1D?n(;0kA_mF&tct=P6=apwmK5fVHnM)#jJ}R}}%;`Mr
D8O3}b

diff --git a/lib/Jaris/bin/index.html b/lib/Jaris/bin/index.html
deleted file mode 100644
index 0b4dedef8..000000000
--- a/lib/Jaris/bin/index.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-	<title>Jaris FLV Player</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="language" content="en" />
-	<meta name="description" content="" />
-	<meta name="keywords" content="" />
-	
-	<script src="js/swfobject.js" type="text/javascript"></script>
-	<script type="text/javascript">
-		var flashvarsVideo = {
-			source: "http://jaris.sourceforge.net/files/jaris-intro.flv",
-			type: "video",
-			streamtype: "file",
-			server: "",//Used for rtmp streams
-			duration: "52",
-			poster: "http://jaris.sourceforge.net/images/poster.png",
-			autostart: "false",
-			logo: "http://jaris.sourceforge.net/images/logo.png",
-			logoposition: "top left",
-			logoalpha: "30",
-			logowidth: "130",
-			logolink: "http://jaris.sourceforge.net",
-			hardwarescaling: "false",
-			darkcolor: "000000",
-			brightcolor: "4c4c4c",
-			controlcolor: "FFFFFF",
-			hovercolor: "67A8C1"
-		};
-		var flashvarsVideoNewControls = {
-			source: "http://jaris.sourceforge.net/files/jaris-intro.flv",
-			type: "video",
-			streamtype: "file",
-			server: "",//Used for rtmp streams
-			duration: "52",
-			poster: "http://jaris.sourceforge.net/images/poster.png",
-			autostart: "false",
-			logo: "http://jaris.sourceforge.net/images/logo.png",
-			logoposition: "top left",
-			logoalpha: "30",
-			logowidth: "130",
-			logolink: "http://jaris.sourceforge.net",
-			hardwarescaling: "false",
-			darkcolor: "000000",
-			brightcolor: "4c4c4c",
-			controlcolor: "FFFFFF",
-			hovercolor: "67A8C1",
-			controltype: 1
-		};
-		var flashvarsAudio = {
-			source: "http://jaris.sourceforge.net/files/audio.mp3",
-			type: "audio",
-			streamtype: "file",
-			server: "",//Used for rtmp streams
-			duration: "00:04:25",
-			poster: "http://jaris.sourceforge.net/images/poster.png",
-			autostart: "false",
-			logo: "http://jaris.sourceforge.net/images/logo.png",
-			logoposition: "top left",
-			logoalpha: "30",
-			logowidth: "130",
-			logolink: "http://jaris.sourceforge.net",
-			hardwarescaling: "false",
-			darkcolor: "D3D3D3",
-			brightcolor: "FFFFFF",
-			controlcolor: "000000",
-			hovercolor: "FF0000"
-		};
-		var params = {
-			menu: "false",
-			scale: "noScale",
-			allowFullscreen: "true",
-			allowScriptAccess: "always",
-			bgcolor: "#000000",
-			quality: "high",
-			wmode: "opaque"
-		};
-		var attributes = {
-			id:"JarisFLVPlayer"
-		};
-		swfobject.embedSWF("JarisFLVPlayer.swf", "altContentOne", "576px", "360px", "10.0.0", "expressInstall.swf", flashvarsVideo, params, attributes);
-		swfobject.embedSWF("JarisFLVPlayer.swf", "altContentOneNewControls", "576px", "360px", "10.0.0", "expressInstall.swf", flashvarsVideoNewControls, params, attributes);
-		swfobject.embedSWF("JarisFLVPlayer.swf", "altContentTwo", "576px", "360px", "10.0.0", "expressInstall.swf", flashvarsAudio, params, attributes);
-	</script>
-	<style>
-		html, body { height:100%; }
-		body { margin:0; }
-	</style>
-</head>
-<body>
-<br />
-	<center>
-	<h1>Video Example</h1>
-	<div id="altContentOne">
-		<h1>Jaris FLV Player</h1>
-		<p>Alternative content</p>
-		<p><a href="http://www.adobe.com/go/getflashplayer"><img 
-			src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" 
-			alt="Get Adobe Flash player" /></a></p>
-	</div>
-	
-	<br /><br />
-	
-	<h1>Video Example with New Controls</h1>
-	<div id="altContentOneNewControls">
-		<h1>Jaris FLV Player</h1>
-		<p>Alternative content</p>
-		<p><a href="http://www.adobe.com/go/getflashplayer"><img 
-			src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" 
-			alt="Get Adobe Flash player" /></a></p>
-	</div>
-	
-	<br /><br />
-	
-	<h1>Audio Example</h1>
-	<div id="altContentTwo">
-		<h1>Jaris FLV Player</h1>
-		<p>Alternative content</p>
-		<p><a href="http://www.adobe.com/go/getflashplayer"><img 
-			src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" 
-			alt="Get Adobe Flash player" /></a></p>
-	</div>
-	</center>
-</body>
-</html>
diff --git a/lib/Jaris/bin/jarisflvplayer.js b/lib/Jaris/bin/jarisflvplayer.js
deleted file mode 100644
index 08ae0a02f..000000000
--- a/lib/Jaris/bin/jarisflvplayer.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**    
- * @author Jefferson Gonzalez
- * @copyright 2010 Jefferson Gonzalez
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *Interface for the JarisFLVPlayer JavaScript API implemented 
- *by Sascha from http://projekktor.com/
- *@param id The id of the flash object
-*/
-function JarisFLVPlayer(id){
-
-	this.playerId = id; //Stores the id of the player
-	this.player = document.getElementById(id); //Object that points to the player
-}
-
-//Event constants
-JarisFLVPlayer.event = {
-	MOUSE_HIDE: "onMouseHide", 
-	MOUSE_SHOW: "onMouseShow",
-	MEDIA_INITIALIZED: "onDataInitialized",
-	BUFFERING: "onBuffering",
-	NOT_BUFFERING: "onNotBuffering",
-	RESIZE: "onResize",
-	PLAY_PAUSE: "onPlayPause",
-	PLAYBACK_FINISHED: "onPlaybackFinished",
-	CONNECTION_FAILED: "onConnectionFailed",
-	ASPECT_RATIO: "onAspectRatio",
-	VOLUME_UP: "onVolumeUp",
-	VOLUME_DOWN: "onVolumeDown",
-	VOLUME_CHANGE: "onVolumeChange",
-	MUTE: "onMute",
-	TIME: "onTimeUpdate",
-	PROGRESS: "onProgress",
-	SEEK: "onSeek",
-	ON_ALL: "on*"
-};
-	
-JarisFLVPlayer.prototype.isBuffering = function(){
-	return this.player.api_get("isBuffering");
-}
-
-JarisFLVPlayer.prototype.isPlaying = function(){
-	return this.player.api_get("isPlaying");
-}
-
-JarisFLVPlayer.prototype.getCurrentTime = function(){
-	return this.player.api_get("time");
-}
-
-JarisFLVPlayer.prototype.getBytesLoaded = function(){
-	return this.player.api_get("loaded");
-}
-
-JarisFLVPlayer.prototype.getVolume = function(){
-	return this.player.api_get("volume");
-}
-
-JarisFLVPlayer.prototype.addListener = function(event, listener){
-	this.player.api_addlistener(event, listener);
-}
-
-JarisFLVPlayer.prototype.removeListener = function(event){
-	this.player.api_removelistener(event);
-}
-
-JarisFLVPlayer.prototype.play = function(){
-	this.player.api_play();
-}
-
-JarisFLVPlayer.prototype.pause = function(){
-	this.player.api_pause();
-}
-
-JarisFLVPlayer.prototype.seek = function(seconds){
-	this.player.api_seek(seconds);
-}
-
-JarisFLVPlayer.prototype.volume = function(value){
-	this.player.api_volume(value);
-}
diff --git a/lib/Jaris/bin/js/swfobject.js b/lib/Jaris/bin/js/swfobject.js
deleted file mode 100644
index 8eafe9dd8..000000000
--- a/lib/Jaris/bin/js/swfobject.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*	SWFObject v2.2 <http://code.google.com/p/swfobject/> 
-	is released under the MIT License <http://www.opensource.org/licenses/mit-license.php> 
-*/
-var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y<X;Y++){U[Y]()}}function K(X){if(J){X()}else{U[U.length]=X}}function s(Y){if(typeof O.addEventListener!=D){O.addEventListener("load",Y,false)}else{if(typeof j.addEventListener!=D){j.addEventListener("load",Y,false)}else{if(typeof O.attachEvent!=D){i(O,"onload",Y)}else{if(typeof O.onload=="function"){var X=O.onload;O.onload=function(){X();Y()}}else{O.onload=Y}}}}}function h(){if(T){V()}else{H()}}function V(){var X=j.getElementsByTagName("body")[0];var aa=C(r);aa.setAttribute("type",q);var Z=X.appendChild(aa);if(Z){var Y=0;(function(){if(typeof Z.GetVariable!=D){var ab=Z.GetVariable("$version");if(ab){ab=ab.split(" ")[1].split(",");M.pv=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}else{if(Y<10){Y++;setTimeout(arguments.callee,10);return}}X.removeChild(aa);Z=null;H()})()}else{H()}}function H(){var ag=o.length;if(ag>0){for(var af=0;af<ag;af++){var Y=o[af].id;var ab=o[af].callbackFn;var aa={success:false,id:Y};if(M.pv[0]>0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad<ac;ad++){if(X[ad].getAttribute("name").toLowerCase()!="movie"){ah[X[ad].getAttribute("name")]=X[ad].getAttribute("value")}}P(ai,ah,Y,ab)}else{p(ae);if(ab){ab(aa)}}}}}else{w(Y,true);if(ab){var Z=z(Y);if(Z&&typeof Z.SetVariable!=D){aa.success=true;aa.ref=Z}ab(aa)}}}}}function z(aa){var X=null;var Y=c(aa);if(Y&&Y.nodeName=="OBJECT"){if(typeof Y.SetVariable!=D){X=Y}else{var Z=Y.getElementsByTagName(r)[0];if(Z){X=Z}}}return X}function A(){return !a&&F("6.0.65")&&(M.win||M.mac)&&!(M.wk&&M.wk<312)}function P(aa,ab,X,Z){a=true;E=Z||null;B={success:false,id:X};var ae=c(X);if(ae){if(ae.nodeName=="OBJECT"){l=g(ae);Q=null}else{l=ae;Q=X}aa.id=R;if(typeof aa.width==D||(!/%$/.test(aa.width)&&parseInt(aa.width,10)<310)){aa.width="310"}if(typeof aa.height==D||(!/%$/.test(aa.height)&&parseInt(aa.height,10)<137)){aa.height="137"}j.title=j.title.slice(0,47)+" - Flash Player Installation";var ad=M.ie&&M.win?"ActiveX":"PlugIn",ac="MMredirectURL="+O.location.toString().replace(/&/g,"%26")+"&MMplayerType="+ad+"&MMdoctitle="+j.title;if(typeof ab.flashvars!=D){ab.flashvars+="&"+ac}else{ab.flashvars=ac}if(M.ie&&M.win&&ae.readyState!=4){var Y=C("div");X+="SWFObjectNew";Y.setAttribute("id",X);ae.parentNode.insertBefore(Y,ae);ae.style.display="none";(function(){if(ae.readyState==4){ae.parentNode.removeChild(ae)}else{setTimeout(arguments.callee,10)}})()}u(aa,ab,X)}}function p(Y){if(M.ie&&M.win&&Y.readyState!=4){var X=C("div");Y.parentNode.insertBefore(X,Y);X.parentNode.replaceChild(g(Y),X);Y.style.display="none";(function(){if(Y.readyState==4){Y.parentNode.removeChild(Y)}else{setTimeout(arguments.callee,10)}})()}else{Y.parentNode.replaceChild(g(Y),Y)}}function g(ab){var aa=C("div");if(M.win&&M.ie){aa.innerHTML=ab.innerHTML}else{var Y=ab.getElementsByTagName(r)[0];if(Y){var ad=Y.childNodes;if(ad){var X=ad.length;for(var Z=0;Z<X;Z++){if(!(ad[Z].nodeType==1&&ad[Z].nodeName=="PARAM")&&!(ad[Z].nodeType==8)){aa.appendChild(ad[Z].cloneNode(true))}}}}}return aa}function u(ai,ag,Y){var X,aa=c(Y);if(M.wk&&M.wk<312){return X}if(aa){if(typeof ai.id==D){ai.id=Y}if(M.ie&&M.win){var ah="";for(var ae in ai){if(ai[ae]!=Object.prototype[ae]){if(ae.toLowerCase()=="data"){ag.movie=ai[ae]}else{if(ae.toLowerCase()=="styleclass"){ah+=' class="'+ai[ae]+'"'}else{if(ae.toLowerCase()!="classid"){ah+=" "+ae+'="'+ai[ae]+'"'}}}}}var af="";for(var ad in ag){if(ag[ad]!=Object.prototype[ad]){af+='<param name="'+ad+'" value="'+ag[ad]+'" />'}}aa.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+ah+">"+af+"</object>";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;ab<ac;ab++){I[ab][0].detachEvent(I[ab][1],I[ab][2])}var Z=N.length;for(var aa=0;aa<Z;aa++){y(N[aa])}for(var Y in M){M[Y]=null}M=null;for(var X in swfobject){swfobject[X]=null}swfobject=null})}}();return{registerObject:function(ab,X,aa,Z){if(M.w3&&ab&&X){var Y={};Y.id=ab;Y.swfVersion=X;Y.expressInstall=aa;Y.callbackFn=Z;o[o.length]=Y;w(ab,false)}else{if(Z){Z({success:false,id:ab})}}},getObjectById:function(X){if(M.w3){return z(X)}},embedSWF:function(ab,ah,ae,ag,Y,aa,Z,ad,af,ac){var X={success:false,id:ah};if(M.w3&&!(M.wk&&M.wk<312)&&ab&&ah&&ae&&ag&&Y){w(ah,false);K(function(){ae+="";ag+="";var aj={};if(af&&typeof af===r){for(var al in af){aj[al]=af[al]}}aj.data=ab;aj.width=ae;aj.height=ag;var am={};if(ad&&typeof ad===r){for(var ak in ad){am[ak]=ad[ak]}}if(Z&&typeof Z===r){for(var ai in Z){if(typeof am.flashvars!=D){am.flashvars+="&"+ai+"="+Z[ai]}else{am.flashvars=ai+"="+Z[ai]}}}if(F(Y)){var an=u(aj,am,ah);if(aj.id==ah){w(ah,true)}X.success=true;X.ref=an}else{if(aa&&A()){aj.data=aa;P(aj,am,ah,ac);return}else{w(ah,true)}}if(ac){ac(X)}})}else{if(ac){ac(X)}}},switchOffAutoHideShow:function(){m=false},ua:M,getFlashPlayerVersion:function(){return{major:M.pv[0],minor:M.pv[1],release:M.pv[2]}},hasFlashPlayerVersion:F,createSWF:function(Z,Y,X){if(M.w3){return u(Z,Y,X)}else{return undefined}},showExpressInstall:function(Z,aa,X,Y){if(M.w3&&A()){P(Z,aa,X,Y)}},removeSWF:function(X){if(M.w3){y(X)}},createCSS:function(aa,Z,Y,X){if(M.w3){v(aa,Z,Y,X)}},addDomLoadEvent:K,addLoadEvent:s,getQueryParamValue:function(aa){var Z=j.location.search||j.location.hash;if(Z){if(/\?/.test(Z)){Z=Z.split("?")[1]}if(aa==null){return L(Z)}var Y=Z.split("&");for(var X=0;X<Y.length;X++){if(Y[X].substring(0,Y[X].indexOf("="))==aa){return L(Y[X].substring((Y[X].indexOf("=")+1)))}}}return""},expressInstallCallback:function(){if(a){var X=c(R);if(X&&l){X.parentNode.replaceChild(l,X);if(Q){w(Q,true);if(M.ie&&M.win){l.style.display="block"}}if(E){E(B)}}a=false}}}}();
\ No newline at end of file
diff --git a/lib/Jaris/bin/logo-color.png b/lib/Jaris/bin/logo-color.png
deleted file mode 100644
index bdd975b710fa6302315fd22f82302876f8d58fdb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14039
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
JPDHLkV1m5W-l6~i

diff --git a/lib/Jaris/bin/logo.png b/lib/Jaris/bin/logo.png
deleted file mode 100644
index da997abc4f53a6043a45c565a69e83fb96bfe36a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34150
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

diff --git a/lib/Jaris/bin/poster.png b/lib/Jaris/bin/poster.png
deleted file mode 100644
index 029fd991d3cf8ee783ef7b6e71187fd05e3c75e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 89121
zcmZ6yWmKD8(>5HmK?(#f#R;y(-JRkV+*-6i@#0e4U5i7D1$UPM#ofKQyW5*y_xJqy
z7Gy#8TFIV0d*qmz;|x<#l6i|tgbDxv-pa{JssR89<NyHN6%Zb_B2T%>3i|`+q$VQ{
zC?6%>hrK~IRgjScy#D*iY5SD`TS56MtK$R!pyB*`!2!~L5W*JUILj$Yy;(#+e#6X~
zfYCJz0FVRZB*iqoEgrQQxGl*~mc5J9%=vVBk|kU-`}Equ!(%bJ)Mguj$iT6ahf01e
z=B-mL#h1Ok${Yp;;)`mKb1=rgzT9>=$N}l_S{MzVxt<TxU!QibI$ngHMP9Y<J6?5O
zpDXr#pKTtryRJ1{&5<a@#5g@yGNcgY0P*0pN5!cp=<_qx%jMcl_AATl<Ey|^hws?y
zqx72H)${sVhPkRJ02xaz9xNCC6gMw*!X>7QXkDzH89q~d<T{0C5+6q+I(fbz@)`^V
z)WE0e_zy!+p}Ne4>F<<RrQCI?|9uj*OhMAmADJU9O!7mO?uWx%s?`Z;`<$v_y8I+-
zb><mk_z_F6Bm#<B!<xW<JK;i7YS)hB`^bq(;jsUR+Yt=`;}NIL<Y_-ZEh0+v{zmr2
z-7ywogF68T$nl)m#pVCR1H&Ek9#<iXAx8d?XXe&ql>C72iuYNXP)<r)1F_}lug#hR
z9fz2-d^{qy>DU|W9CohMf1esy|4RwU__^Q2M+lcYi8|szZWTp2@dZtMq4WyVvo0m=
z+BN|_Ee%o5nAHc90uW06&RyyMPPO8|E*|cO7+92*qb@sHe-*>IP8(hc45nbpv!S<Q
zVnz&8=_KrnB?iT(nw0(9OpZm{SWJ{jxB;SD`y%m22%n;0@4&LCK)WMozI1j#b%6TM
zFhI5|t{iv%R^~86CkyhQKHv{0Ym>lD<O3NzSOv=&HgSU8a$l6*1^|RBI-hS6J`qyT
zLto)(1|&`<(#g_USumv{&+wIB{u47E{*b*uvq2)XHwB-0J$lDladljrMg7kT31OJ{
zAYymtFD`t4fN3jEGXoAKoeK8yl9we<`MWQ<_z?Y(8IN~b|LJyM8>MVSOK9EXc%4Uq
z*lzLmI|kZfmqm(zAR)k#N~$qgS*W-Yah?#T`WInCbEzLZs=7qRbLDU19kCFk;`Yi9
z|D6MoK#v&=2*<)ZGiLI!oX{r~asf(7Mq(HHji&&FeK+UBOZ>9lq1Pgd{5H9{#|q)Y
z7~T0AvjhC>;`yHx1T2+UezKrw$f8Nuf*A^D2#-jkzRDj2|EkV2zAIdc1|vWhq68a0
za}Aj}Gsn)tE+6dmolIXLg1Vb31&ijN5RSR<3TktjZ*9f&oaYaBa>#hjpL3qYc<fFr
z6^3)M#K)W9i`DJjph((gR>rboAH+dGZ9P*fNHXtmRkjPnId#)K%smVrRTcEEU;dv|
zh>eo8ZrBufgB#`bmRXxSKfN=)U2FQ1c-g0-_l6@8A$^yWK;&auiRz(9{4}R2<VhGG
z6iBWxr|*xIcTa2?U1%lz+h@YdQUt?+qd&Ko*clU(FN%Uqq3XXQBhB_6pD$j~Ai6Ot
zDr~ab2>*WR^Tj<uJsh=mV(g8)TI~-`lvK&{(B3&gQC@cVN;spd#)f<HC3m)wiJ$ms
zr_w89^RX<$&}gl;77_?R7<bZQXx~;TcrW?y>%C+LudlB^AD_>vxx0L!75g4nre&Rm
z&PJ$%%BU(EjvH`zAzIR34V-H3;*x6A>P7=fPW{zQ=4D!3V_LI+>fkv)4te$7^gVrE
zit^1cTVs3EYJn|wK4+bU`+t@Tl?(#w=7!*aQPTa@>5+Ox5v+?d0Ec<>;B+0HNg}<;
zFgq#$N3irlvdp2Bb_7OLNXDHH&RRS3>t+7)ZePdB?}j#CJvITMZZSlv8O{HcLcmbj
zOspn(`oyG$8mG}ID#x4-NNHJ)TmcPP!b2lih>vH3X4Dd~u+URl(rZSlME1-po_#T2
zcTcx{U$S1uZtt>BU$V(wvc0{s%{q#-8wDOne=v!+0+Q0Pk3VsqytYX2$SEYexJlU<
z-4Jhq<<yLym7;=jlOtz+-$OI4g3Q%KC!&^xmH|{z@JR6JbfPHn*CO)xEN(0c#25}W
zw`4po-ehaOcfR&dOKz`^G%u@<F|fTh*DV!C_B$7i9-gMpCUzomA#T!}h05yD%2{bJ
z+uSWqX}v_G1cVT{*KnJ4#1too=M;Zy>{(hiy$G9&{yeEE#e5_NU0hll-vjw$<%Ehl
z)$!RS^B!&P!1Qz%^Zxbm^j_rguKw2k@ou6PQE*EQ5UyyHIo$rBsXpDbus5K?uv<xx
zZA&Zi%J;VIdi>stpULY!N>aY)-w_QuXGE|R6&(;n^O7d>y1v=gJWfvI->2-8CHx%N
z$y2jEI7X2RD3G^7Lk|$t?aUbCxKUVM-s{JFz45-UkFj4{Tzm7n<C^+x9`=mw^p&ff
zsIAamk*JyHd~YIc-(_lblb?QcEY$z%$V1oWz$;YBcYa;a2)ma<>7pI|?qz(*!+d8T
z4Ls0`Ru<77D@WP05ulI6-YNg_(Uq!C(d(7}+05dxl%IzQ$F0S~K%-<<_uI`C1%PQt
zT<xrPH)pK*zRK&-^JT2;S=i3!uA!}+b&*GelSyG%Eas8K@!OAgcaZ{j4MbjTTWP}!
zhc|u@WL=+=qsbw%8LcnZiyVA%@mu+5WsOG}hbMFEU`eKQYCH?E=ZQ|b(e38pnw{^j
z^GSy`-nnHt`icUmJr!^{3x5^J#hI~c$ZlRXWghEe$k2AFF<{{YOC)_~!Cvz8fT7@o
z;Jmr0Q!lDD3*^Il+g?mcDuRU>t^8Ds5M&X9oJ~|(MH;w1P#rtfsrk<Y^jkZduh7!K
z90}bLa40^ZYC3v)<wKfG$Lo&<3q~odEseszF`H;I%H4xRbLjzC8fch}02#ffN~3nN
zD>Jf3zMY_<+-Hb0#0wvP009I%PunO-8G&@z{CrB_(!y95h$3||P5|GV!NQ8s+CV59
z2RmXQr%lJ7@Nk>eg_)xvY^N!o>e9anxrs$Q41sv*RkEmee-$st#fQq=&!34OzmwrJ
zMc3c?gyDa+!jQ!m6?JXElIN2F4{SC_Zi*zAFv!K@LI`rJfP_?jd^cFA)@D|gILX01
z#E;f3-Nlt!rOvMXs#Fs2b>DE{gH<xTv!2%>#O>)#tZi_$gnqaO4y-?JNIxkN3{*_h
zvqFVmu{>8!#Zr5<<l+lDn{lIppz9J8ax^kdO=iVE7>JexlXP{^O2C^tbnoKf9l791
zPjvB_R(@$%D@Fw7bOHlySI_$2Ux4p>4+dGT5kL9Z!or8Y%YX+Xr7ZmF5;v<QPKCG>
zH*)}D=&Zt*Fd(Ls%9jgEX8lkavU3JmWGS{y^??d3W!jFt6NA74lOhH9aKL>d@KJUJ
zsj;v8qBQXzwn57*d;m|+B#|?~cLyv)RUWffWS!we;yYe<fJk#+a`X|wu>l_9G}@=M
zr!>&$SygP=_%@s-j|`{kz2vH6lBKt+j}$QPzZZf(R7XBs;7SG;SKK6oD4fwDf8h>U
z{K*ND5DPP&Ge7*q^B0Ky34Op3Lt#}~DKo1|MxuP;eZsOw>?Sz<vpGnJOevn91xgsf
z^6jJVVX@no6EDoB+Yo0hj_<od_eju?qIbTF5{i>Qyf!Dy9DF16CuJVbv?@xeb#gil
zOBi61GxWs#I#=*<vZPdLCJAZ?KImv}NrQ?pA$WwMRhd^&o!r<p6Kq!tq#vyaZ*p9J
zhQTLVTuAl}zU%M@Gly&?yR(+{17E&o9Z)z+!O19Mf797bYm(dRfZjojqQZHiX*g*w
zk#8*D!^6y(Es2c{6!+#&@`Bd)Z%SjC$Ze~q_=j<KY1<ph@mo`9Wg@sj4Hm;qy=O3d
z*C6noI^Mt_Nlk$s-jb68a^7j@w(<(!+1-<$I-uw4(3s(&yG$*0rwj6(li9kl?eRn-
z5qiiRv{#7-(^s;%Pr`rgFzeS<FPynP8;I~$LLO+zD$<e%iA^3LaxhBcGxq*80R37~
z$|H|Qrib6yP?}t+t5y4XChgw11Zk!K*aRi7L=OuyIb0?0J}20cCV=IH>pJ6wH<F?;
zEA)*BJ~`C!6)f<Foo)T}VGL>#0SUXk4D3_!`RdvgdVj)X*P$<*&WvO-FRVPVESxT$
zCK>vqCHvi$RXdO|Pad(mCq>7xF4*$or{xg4j7>h_Aw+YYdah>_WAX;$R{7KZmkju<
z1=2Aeo4y|Yr8{x~O0e7o3Zm8=;nNpNu?*Gme4dR~&C%5w2Hbx3E`f^US<L=o3HnOm
z2GWPHgwrx}l{wAeEI55AK^bla!><ABx@N|y=+72~y2XWt@8xP71OR?O_eKd)=Dm@h
znXEMj0kd0*t5AoC25vjT>7F{coQiUxk~SC3H}4vloO5{>4wt&t_3#X)%@onUjsA+T
zU=_fB$F3B=b%8Yd)nyW4j&EVxaNF<{nUi6i>>IQ4>Gi!*g42bAWV4|Y;n;v(7HYJn
z_C#c#u1!_3zEMk3^-|Sz^P}3&L-u3q%t2=Z`F){GOJuP~(k^jcKW^65o$^vI;XC$z
zuUJVv#2^LKc(q&b3<4Zw^hz@=j`mUm#qr<z;H~p*k9)RlHyEr@W~l_Ac7+5=8zLr%
z=op_T`O69`=s2sInImZpouImC|FXK>E>&z<nGxYV{<*^Sr}<GlC(+dW0EMT!jXnSv
zbYQ2m)7IVd{xIv3q71cDFe9?Qv-qp^)W>Iq3edX2cMS>GIJX23jhMsLWR0b%c|5%a
zsa|Vp9xv7FzxCf6rix(xoWfN3l}0Q3fZ;yDeQs)P_#r?n16DaDR=2#URdg6WUlSbK
zEqd4OmrM^>Lt9EsrSXAnvJ5!~EPT{*$85?*?H(Cz%%9y{?ruip9gu9c^_MneEX~J2
zeX_?$J=_k{HJh^>-px~)7EXe_M0b;xu6|r*?fmJe;e;4YHijy{o1St<6;x`bwP7$1
z!#}B&racax(>=&KA80+Tk+f3V(!5h!I_K-)rrF^IHF`0*E;008Fz~HY)3IJr)EHZf
z<5U#~pc|1>1bhyGfpFV$?Kv%Lf#pA6_?E{%qKev1SlW=wn-FhU$(ajUGcbI+Km!g~
ziu+YkctzX(oV}ZaBn?d}G<)p7So7VE>vs2R5t=iW{0F6){#q}m>~hAoY8btf#b>P3
zrFU6em~m-(U^npHxSm^?^Yyy#7qM*?Z!4M7EXGlwcaaHWqEeB(;&<Pd-`Fs8&5doK
zUYuO~SgQ4l+@#RI5RH_)(b)yJi*yKHQXV@@)j=-KjDp!p9}OD?87aJ!2*)xX^kB(^
zBo4~h@pu|KzayaS_%EeAsQ(%u4%n(o#bfN1r*AoQe6BO}h0YoMWPL3%YCmazak-uo
z(W&^-%-~{CnEDPPm!9N;@S#kaGkh5jMEYe$Z$@7{RT?Gn+Al2$K35LAwYNF>Ectsm
z7U$H%`;q2QU1kM<I^>ow?)pS+rId#aJ6NrX2n49(K86{HoPQE{fK^3Xx_UOurFuoP
z?M1h|UH|#IVt;6Ef5_<iVd&%`LUE1(M+d4w)n#gKgTe=pH3<%7%NS2^+^H02G@l7)
z_Ph+W>5dEqs*Dtd-kB6~-^MW=sm?>|NyI5oV(7Tpz0Bwf{by~rOt0jR>L3(Q)+EAw
z`H#}y=U0@}Enx*B{NY>P>$&@=)={A(_bG3bAEe7`j(<+>#)X?i4pU48KNTkL54z4x
z%@8aZq#UwtAE5mzwYn`-G73daELJildC3!!YtS{9V^1!h=^GU4nw2EABByLUP{6&M
zb)7RJi0QREaE=;xY^<ubykm~UoJ{cH3=|KXnPlEXs)|H)J%_ZB0<jW}3miV7!iA#d
z&RL+K-oP@bMe8MWxI!-;oUL!X!d-i>GcegQ;}gi+#hUPWz+SMiV>@<56?yl@V#;KB
zSyE?613KM&=%Q_8>-KqS#`(GKsNA-h1!g^SmDXiqR6`{`(e{ga_!zz12UVi)6p(a=
zB`1ENA`xmULVK&H_nU(TSz1SSb~fU*%-jaXqeQIG|NJ41W#<5i`?XD7(K(2)2qYuU
zTSE)6BJ<^x1MwtM<%A+#ES5ct4m5OO4rb`@;^Fi>HIa#l-Q|%G#xWpq!|~{36q1JL
z$E~PkQ>>omI&}@Z)j5yn-k*p2Ln&$%WhW2@1!m5-b9%yrk4@JyHSjphvfqDZ5~NRI
z!MS})XaQZW4%w-F1Sv@cO2+4)<e+n!A&$r*QRfrp_v8B4C3MOCt%zV@$lGOW>4OIl
z!E=h4iwB<Q(;2!Ez<`P42lzu<+M;PXxr?*5HvlRddY5W7sFJqPYss9^;7RjQIfSNE
zn`uT~ioUk`p4{1HqQ6}Sd&I-N*&**;7~SU*F5RUdMqRz+JjP22tAsggLvoB1Rn%Hh
z=Uxd86?W`{LTv*vohlPiOgZTsg^Ja$&Hd*^d9yY(@VJp6au1cVQ!7I{7^*QtoXt-j
z=+E-Br|xw8ogjj9Xb3DE4^JwFWx>+Y!;Zn3>yrn@FD2S@1v=0GIKu7CzJzTb3p?{a
zCS`!wNI%i4`QIxk6`n@CnkOY=L50;?$<}ob?3fWM<)p`8a%}d&Pv&&A25)Q+Gwb+6
z!UHUW{BY5K1C8R?wAscL$vSx-(m#<3%f*XG8!rqn-()I$1Ng1d#gAcnex3<wI^%fz
z(dgSci`kD6bgZbU+R~}=qw<3jkLCxpUj|JN;-xUdPoJ=^crWAjid#4l@U$`3Asr~r
zU%&o=u|5KL`?bru&MHq)%X*sf0`lJcEVPahAF+}RSIfB9*gzvn$ge8p6I@PU9EkWJ
z5>6`TZT2mIz9hvSPE04)i&tRlT^4wNjI#2Zf;q88PNNXTb8GN@CA^Jur}v@l%}8IG
z44M0ea!H6XrhRsy$MMj$bj$g4(;8zJR5w$8CCRFxr8&L4eVV`ONPfj%Ge>7aOKw#m
z9l#NB_U6*+*L8G0-qk#_d{H6qr@FyX#RLO`g=(IPvR+qBL*v8*X;HQS<6EnWV0cIo
z;oDkv{!QE|eC|V7+YcbA!p*6DdvMTK*yAmXo0A65ggm!c$_4|ImuO|^-vH|wNC$m4
z^)qR%JICL4G(G<E4P>f%L_NIj8@hRwQ_fk^nSILDypqMHV~omw@YF`tnU;`VpZ)Is
zCxs*Xv^LU8Hk&KwGp9~2SWAcgGsD!Uso$UfYA7t#JuBXl<7qp+`A)7BM5E>Uio{5h
z03?*Fj_mc@C~csVWW^#xEY7k+e>=w%EStL3c1H>)O3AcY`>#BB_$Wx9ySkSy((NMH
zp(u7M@a3>x{}12Z(R#a-Y*NKqA8-4Z#uhtA&=>9S<3E%cDnHp3T^5s8%9XUu)r;#|
z$RdNhSC*|0>z{@>G7ya^fmO9YT?$4W`LqMhI$h{V-mq3_DgC0>4jyi4oF7P92g0TC
zJq$fnC%4ffK`UM(QqlymEYU@ba-yJ~zwLH~=R*!wNbl2P(LcT6pfTC;F(Gt!ZbrGC
zvbH>+AN(bFDYFwgg;t1C9HCJ6dp^julHiyqiDIHrwM~5RxV{ti_EOGT5<)9OM74oa
zpii)5gBKIWg8KG!8|xoSG++$w7TzHErsOr$_;V%&R2tJ4CAqvC5D8uvw=dvOl0=|T
zVMCzjjZzhN4%3RlH`(JyNA7DB#0rcMGJyao5b<Fc5>A!IwY2OwI={uf3ezlW>wkgl
zQQli$rVUw_^JAW`ovCNnk1GMZ`S<i?7AQeR4I%@jeXq=kjp99lZF-K_a7XfWYL=Xg
zobQn~^)y0=A2!1pHrtF>={|_)7+MDE6bGx7#r8sEb)lfu_p(F!xM=+hlHbwkDhKJv
zqonc2AMy_Z(Di6Z5Qrzbhx05GNs?7dk$A3ug`27rh*6j*;_k@7T*LwovWPz}lzO$U
z*Xwd2&2_I{w@ehZHG!3Th&3>aHJ5q%M_DRjp#5PSi2p8sPAHD^yDA$5u1gn}y~Y@q
z2+cAuEQqt49F+#Q5(^np(H&A7j6I{!NKS;1>*wF=afV8v!bt}Vm$v-fCx$#*{qPS$
z(pOSatHihdY9&HxyjGZPVY(HKBPZng$b0Q7_YFY;K9bUE_Vt~Wxxr+TE*EQnc%F_*
z5Di8KP^-HWUJJn=75f7vgk2Oa-@Q?v{6NDSg^>nRRf`F}?G9a%bu}EA57*{jODO@f
zTrWHS>mp{wn`+tk>}l;D9)DUNtr5MlKF!IqV0KR{!QFP>B}hw&NfJQYsDbBct}yhh
z-L(E%%P%o4D9omPg4Z!<h27MKlKFdDSeth=gqgC8DAW>F3e!6`-5-<(C&Vm^Z`L@B
z9^IO&5Wj`lrNs!hgU2ejdT3)VL%nsff&(YY=F{zOducE5+#t^^^+yV+TL>2Sx3MO0
zg#%Nhf2tjpdNf#w1yE8_dPr%_>9Qp_fRQ7@CJf$>Yh&CHCL!iae`NurfhM4`wvdrs
zTUgTejqF@xnQe8uhn10F`|s0Hb5e(f2W`>CWegV2qtDBFfY4B2!|F#Y3Z(VJ$I@NI
z!ce<CjL9#!QgS_oCDUwqx1>x3{@h+o^P8$vYjhm3`a^#-tbN%dCL;AO6P_ok64D4i
z#&3<~>|lXm6*?po$b+<{*610S=dQOLPMJr$r^VsimN%ODX)PMG@fLNE;!SJHbci?w
zfFiW?PyD<m^36KVMtIgtU{#Bb&KP!e1zDoB?~m&G_WiC((pp`d6dR$}#Z(yz<-@pt
zkd<1_@ym^j<Kz9k<L=d5?6O{xXT}VXL`a4Ny~0A*Zeitk8QO=9J-*wI4dnul+&*~S
zRLMKg>u$$@`0mU@_4%j<LK|FbI%Y;ZBy*MAk8FqmoB**@4|Pkz1@-X!Z$^1o7tF8U
z{=Ve3H>zed7{bbG3j#=7aVMCMHeTAnBXD6TJVg3!f{yYZJoP{s8>W#IomG|Adq+GB
z#!xn~3v$c)<exp?`gaZ*ZGJhHbPSb@H4h<B6@>yr00im7CU6Yg=Y6XuKRYthfYq`&
zMQrw!@N|NoxbY>3P}KU3HRo*o%Ub}_&Ny%2Df|=jei2AacwTNH(ZaH(m~q?Rdf{1t
zBTSDZFRRLpuGpT-2H$hi+W`-T!>zlU9wNWo5NktUemPXkgzgOY1lA2Dx8UxKg<37y
zFcnF+Bz}C^tSi;M#XqCj2U};VF|+vgU80=XzE2Q4yXo|FnM+9e79k_r3`z5>7Pkp|
z<QLLyBK%`eK^SU~4r^;Q%gjUgpYlBM4<Bg(O<?ukvrTa;%|5u!6pv!mau-cVvk?T>
zsX84d&z0E+g<ZiZgVoHH4!c3wxw+%nVRjbV9z2~R`X-k^Z)m3}D-z~_!NvxQy(F3u
z?n%3B3y?|?+hfsoir!2;hM6Z47%9q$B<tvAKaxVN8?lWg%%NKwglf+L3MWU{`>P61
zXuQGOKs{BZRZ5^9Mu8eDQ_-a6AA}$l7<_|+mlIrbU@2RqCm#N7um4{Fp{X>a26D^%
zR(A3Bs^cco0q?tXv)uFczi0rLu{BF4-5**U^va<|IC%}y_@J}TFE7WZtXc=oZNxV?
z(7Il0xKJP=TyciQbzY%K?hJyI+p}y4aU=i>6#(Tj!Z*U0Fuz^!wj1hN`rBT6k9BgP
zf=HJ>9x$_q4ix*g1}Dl%2*#|`Zn?!u85dfRQ5KgK<E0x6A|yeXFf-$2M7z}bU!Cj-
z^l1@R5M~j&5g$BClbPdIF2PBY3X|l-MANdkgzRvSg`BPpVEaMJX4RT6HF9ocg>@51
zh15M*cLiuOD5r-uTfQf;S}RsbE<HMOklF3@tYSX8Hd@)51TIs*34<kq&TjYwTvPvR
zXwZ->J_D8?{ECMLDLKg}QH+R_=g#9%g|^Y>`aX@>I+(e^Gs?v?g9o^z`Z?H}=V~fg
z^-7!O01#g=t`x|6r;s_~SP<h)RejIu!RTQ-vp`r<8>6DOF#OwQ^`dDUk6&F}ap-Pz
zxF@z@g}v3kTa7T*ZbV)LUhf1JeO6ypGV(`+X1VZ@g6qF&8ezzeQyK3uqVaSvK`1mt
z<)mGCn8RanCH*LS&w!Z7cz<QV(Ond?l(#T7!Dbm37L!slKTFX|ZSJkUn`TYh**m_0
zSAl@}JXRV$`E6}f0cJ|VS)Hc&4z@zPOMB({AerR=vk!Wgeu%`Pzb9z_7LXq95pT59
zb(7cC6Js1#?p8BBk`0Z-z*KeFetdg|uW;yMoH)B3XQrBsczrXxx`YwX!#Omq{YI_!
z8s|pRgur+8t)e0YmvbRf*Y8lmzPB5}-DYu~;jp=)nsH{fpW{*dSWl6gF5Zm1k)Z5k
zuqTf6;MZ33z+ZMjbr05}0MR%UlOq;n3Ge$>S@iS;v6YaT%8vq!Ggi{Uo|!Z$dR3b9
zNM$#&nrp6sW==XPq9EbN>c$q`nzQ=hp^;l|vc-*Y3@3r%v*0t!Rf2bRENCF?UU8i1
z7Hkg!dkQ~h>DdItcagTC08#TiB3!nz$4Og7s<MpKk~a;~)WUXYX0TfG2{w9DMk#BR
zq#<LuxoW*kbNj0~Pn_lPXYh+bA}z;eb53k+0u;KEuKjt&JC756vgHkYOn8LaH_ot0
zbhtU78l`10R(G!XRFYS<?$2W0C?;|WBR2pM^N+_1VS37RPrba6iS#k2+J)VWo|i|*
zyNQUlZi11TRw=|hR^;VAF<h)3Ec-?}UfDzHd(P&~-^dY%s4^e60(3<qu}FaAzxP^b
z?;tqu;Qh-Nz}Gjk?$tDM7imbd`*{TkFT~H>Tory6v<H#v-Wq?OR5?~Bb@M=G)ntU|
z1>gk#p4}-+1FcLw>P4GMagYOL{p>h_EZJw}0E*?2k3&o~uA+f5jp9{zCa-Nr<rS|F
zAv2{`4H7L3Q%bl|J)*vc2HF3|1?ZBk_6(8FXRV?1va(%$6!g@)5otGDSo3<dZ@FJh
zmKY96#hfso!=3<#M5Su*lpf4#N(jrLkI!-QP@xToch=psy>n>D&)7RCl6s?$+mi_h
zK-C5uFk^d`fKVy^jTP^&;B8u{PN~~KRn}!1+A&CSu!;Jh)ux+S3^CV1J&L*tw?-nk
z+XKn1A)xx?mzBAB+td*LLUUm`Vw8D+xfIn`JPNXRZJ~6fe4ftA#VnDFlbMrI(ppr^
z<+u~_#RAMHiMlrCbsupgSgs2`+n~Ww_4HuHw=!S8$S^@kFhWjWgT`PswcUSf>7-{~
zOJhHwE155VPTEz@+HhuoIQ;NehKulR4i=pT5FOB#Hl_vS4w&C?mcDHdpLxSrr0R_n
zOwrwELny`}Nk^~(yQ2XlEhFuADDDBl{4wb(-r(kUi??HG^vgOAJ`bg{KdD#qNo+`l
zTYM&2Tt(t&gg7$W_ZPi|_e?5<7O7a5)I9_?MNdt>5DRA)CQ=m4K9r~p{$xaL*kRiw
zQ9ST|5I?x375CG4NAjQ*aiiJ{2BHQI2yr6NF}?AAqta7oStl)7jI*WXT9{~wQ-&yu
zP;ANaM|5DjJk)ZidbqtKZ1$;AJ7crbKE%6L=cIjDm?wyl7*&$hhHP#2M5~bfN3$`x
zKMfvsWb91tPfAnb{w(>Uqzlu)adH40&IVjuUP1Q(_UHUx(UI7q91PW+<p1?IAE5ii
znmeJRttSt+O9)2!_;<_sF-6HUV{tZ4Yai&-UE*dqB+o7N_}jl$jLuZ|=GPbU59|n=
zl2!b=*-asdb7Hx7UBY?2@4sE%ZM%%Ke=VsZ9Q|0@)aa*+N=J(0Aq46#ubL&3KK6V^
zE!&X%7TY|a!u)MK90r@9Y?TeF>;-hQn#ZE^W8MfaWRE<k;b25G1HZJ6<fib*8tUQ}
zWm@$hC7IDOt&KR{oxyquQ^Z=&%IzaJSu&Z3sm>M*z)a+*TwSKs%jX0AIoZL|%GmMn
z;ztv7{=Iqojf-Ck@MNBf-R#ZXI<Y;m6sq`z5hob29<W5~ZDs$~Kzm``GZt9b;{<j!
z-XmxK$Rf*l6&9@oj}CXm-xXQ&Wgcr^X6eDDLaR=CmP9(NVlmC}8U{^QaXcMvW4zeN
zIcwJ?9(!cI3w3-nJ6FXkOtDwm<#E}K`lj4FN!TBLoy5Xv2@Yju26Awi(FYyr)Fcp{
z;`o2o3vQ!*(=XnkNIB&f8f(1rWPH`*;HHxyL)NK+lh?#*GBqmS_TXqRXh-9wJ;y{X
ziq9x%qrfAe;`ArQH79R`XUOL?<a3%uHm2~Yw-wOM2%wFKWv~L2lvDwOL_ZutvBV@;
z?N6U`JTn&?xg)O_PBox$1r2*y5afj06aH%31!JQsSx4uo{UH6?T>}&LVOR&T5S2+t
z1-Gol>8{Yhj^9^bSy0CI?4|l?7nrUNy%|?HL6jn0O!sjdTRYGsduYtQ_q6}f#AQ#a
zBTgkd+1y7sXd7h&$6jN~R5)$@X@7Fv2U5it5=)5-!uTfXtEs13;Y%jv*;}ysE)A8y
z64?XbZ>bPrIr0-lt(N=PHN>*lnjXnESqESq6m0p{+sd%P2G%RiU3}W4Sx#vRVjZgH
zq0d8E^`7l_OrB^9E=8kT54e8Mh+=~5{}UTDQImE=Z5eA~>&t;Umlwf&iuWaQb)D8P
zmND{Z$uIiWCZmYx5S1ewc1&0ecxztRYWC!ZN)a=Z@%9iJ3w}o>ozE;HTX|bXZ(f-A
zVsr>!+F$!;D)Lt_s0gcT^{8)nWkpkdf64hazse$or1W!9i-H2ZlxPB#ZlE>PvIeMI
zr*^<ul^iRd>4Eb6Rmx3{dAV)mVs__U0DcOOM<b8yifm@V7Oj7~B2BM3_k;mq4!jty
zX)Ot^>78xe`osB5=}U_~8fbbC@Ky@TZ%^2IrM`SYFX|^E#7Hv@HlwjZnr&(lv}gAH
z;2|q@j;)2EzYeh}BIEe}$^7%RDV>c^<*cs42af!-B-IU;^XPs6s29MQ;CY$ll~nN6
zsI+<({z<^|!(?bUw?HIkh`j8GO)Y|Dt!Z6-8XZz#5<I=2G%kzyDi#P;ynVQhG9tEB
zH9SuKHyd1%M{*2AalvH8niSkj98O-G15l3(AxX$X7TK|wd0s`zzYgXPJt6MOf+t}v
zlIdg^&yc`$A8h>%lX(DXR<7=<&-Hu+ZT)mcPcXkZUdB{&%(4G?^~it^mk~MM{0NRA
z<EH_A?;mlFnqng3-Y=4sZ0z3oUhi#?aMB$ZK+Hro)NKUuGPSxR21F#No(A`!`BJ>^
zp3@R3THXEL#A_+gt7n8wmiEXp>S`M@1jKK7gWzzjnFY7Jt#Zg(Bw`A?+Nv%ILpy)s
z9M3;|eal6``5XV?GTOic?Ee`@cBQ}>u`Af`fRXd<2647V8~o~n&u!qBf<N-{Tk2>`
zlS<kJ8(R5wTesFhTO){C=tB8i-z16;kxOVNyGKf{OKjcb)S+T{@s+xa{<;kQYSx(O
zQk)z%RfVgTk(D{$t*fE)nVVKJGT+kWP+c}A=IY}?BbF>_pjt~6oDnveR8gF0MGw)y
zmg`R@fi2mot!{J9*F?YC`zo{rQ1H!&>(?#k)Y`beG`^jZ&e*kc;_tJQTraDDu28O&
zW&`P6ThzkC$ra0)pL$*FrO6qU&tS8}hEAe}#!%vjtzYgvMZ5bySB-0I&ccuA+gD3_
zhuMw@<;RedP1~+Ya5+k~tmzA9i?ssOp<qv;<Uc^FPPRy4KKu#24ar1PP%mMw>1?y7
zXP^ri-T0rch~6{i2FMiPL26VCv`NAsAfn`&b+>jtqWfi?rqeP#`V#K2wE<V2DmOl&
z-B`V*NR(dLs(eWAgU<lZE1ESO`$E<8ckUiHXK(xinmgf0YHlN;Rh@*4|JjKL2t%+o
znOQC?o<$HjY_y~>rG(KFLf+Pk;bvuO-gZ><X!j*%#&CXhMiZ+3s?Ff1D^D*)^!do!
z-NcEERhzXb{!2lxd?5I?URUfZqklgZ8UDlwdob$$`_NFea7to!q{#U1s0$x1^4an!
zC=nOsXpyr>iJ(bFf^j8+82iO*{ZKe@L}O0k_ivD`%;a{ol>4Sqa(3}sl$KlhQg7{H
zkaGYY&HfW8olAlhwOEiZwW2f2O>$NK<K-vK-+Iu1EeXcgtTNfn{8N`@W0?9TEtTdA
z<*H_YjGqcwS4-8Qy<e)UGic;mtSA?l-^+iX5AK>O3dn1D@5v^|{$9~B?=dl}5h}dC
zIh0T$05NL)6}Oc@9B%jqFaHoe$`swc)DU^*^7|5lSe7guMHaJa6VZaB?N}rzohV2>
z<0n7AsT86zvBxP%w9~G1>yp*Kkl{}WvCk{Nc)0tR<)r+|5uY-K<z(+taED=mWW<P?
z?Sb(b94-Bpssyp~kEzxWL=YlNWmD{ZysBXXO#-VnQ#9csuIQD4nBc`^XQ&wDWy|LS
zw1v7kAK?CgJc=wM&HTxWXKszrK-YsmS-yEV9~6wu%$7Zu2U!3D+ax!LibJz3wygWx
zkF%xU&CZ^u<=-lu5=XTlX$kt8&U<Dh!{%0G)B)EvdF)|^lv&^I-vo8Is*jx`@2U=!
zWk$$xq;^FjFIILmBS2H5;N9ifsB$MToA4QMzXA%AEoJh(^5Ir{^&32PEz>VMv&dSI
z0PB19QwgqZwo@K2Uk^K`TgHBr4YnlFc+F5WLgShPiK~h?B3+1k2<-}Z>oW$2r2ftG
z<I(Vm2fqKkUamxgKQ4$wp&a@UDP`v7^hS2`2B2fZtQC0_fhm`oRPH|<2^TYAF<_}B
z??$(GeL>NrTXA>5KuswsIC<R2_-j@F9^Ci2l<w%K`XQO!ySe>iucK(b1$D8KrT5y1
zvN$rj>|-$ZgjIk8ztpv3ej~MzHYKHT9UA6;F1U-VH8n4=W$zx;&0)FjS2DB%$d7e_
zq>B>`4_D`|GcA*<ew6q74KppfFM(dJn!e=-@MhC4_^K^0`!=n--_|>}4b~Mx$=VKs
z@lfGE{R-c@tW-R^ech;Kx4L>$0LRI=(r0DkEo41`6l*SxoB9^c#RzhBGq&Q70~`=q
zmbsM3@%$M>S=KK56&k9&M$)o-_OeW~EVzGm8y#@X8wroFMK}PH9gL)PAv1odb3QH-
z#WIFCi%J{G9gweSv~OTZ8T>%8p1-LmNtgFn*MET6(e@co{<WB%IDB>7ywQ^=gtBWO
z0t>{J;Bx8Io0)!Ar$eE%tZwH^icHCikKbNn+;%N6CI}lg!P@Wg!i-+~`Iv6L#9@4S
zkvC(T6}N-Ek3$AxH71`b`#Q5)`l(!s9(_A%)@}nF!6#RePes+*?@nMLTN!Lq87~sl
zuWqlK?L-N*qyIksftq&3kp)s0U*BDPVl+eb@h?vA(X)ZkoWRcap_FoRGI}lrX!1Yy
z4Y=ux2lT=0@-~cMPnV7h=vG=6bUK`;*A#QoN4d9>B+p*6Q=Z^<^!E8gX3zt>vZYxh
zPdp2kxNZCeUi#(N%w(b0JWPH?<Ij9j7cDz0GPR@bA~$o$o)3vWL|MAtlMS|*{i+y>
z<S~{TL6ziG!(UKn2fq5p!>`mCK$|={Z}CY{#aQl(_V~jY_LD2mW<pIKRWN<doXAr2
zoOa#_AHET}V=W&w;<7ZXhzB=e`Qy1Or#|7kTw5-^2UUj{NuAXl_)o5MQ*Ze59Q2;D
zOIuov3=4`w<I4OB)X>@7Zok5jg8X+*!ef&|@j;*yQZ-r94G`c|v)10!@=CJ3L&PiZ
z5tqzMqxJab*?IIUs~3zSIdF;vaqpG)nL~f?^@Va9HcMvGyv@m4Vwk0hY%3&R(Lu%A
zI4MjAyPaCgg7zrUW5<^fzO3p7R!pKEm7-DQxy|y;c2snwg36nzf{R*4wJPrZEL6j|
zU0Xb8Wisp^`1l6|6v~WlOFVaPpsQm{SF@1tk6^}yWx3d1^pg`#xlk2)aKq0*Qi@Ik
zIOY@5jgynrZXwEo(6g^78_#nmh;W_3yWgGNxX9O@s9<d$aEGC>P;3|o7`W~74DVjb
zO`q)<*-Vz)jFO!6w=H;O1)T0;<9cJq122g05rYyWS)D3(fTwW+5_LMQD(%&CGSYpI
zp$jrd1qFW%MJ;QKqyJhaJ-h@9r}1Mnl_$!5MBKA{`~;;H7xS59q+$W@a92<gy-AFm
zXrb|n7dts&8a5P~HLLRrZPys%Q2&BbTGZ`a?%G5TpRb(6iGsKkejv3-eouOFbh*4#
z$A6?MC)6^}t?L)Z0khk!vn#(iWAAr4pFR<YN(Z5Z7tdl5ItG9M?>0b)lzA1LwQA{}
zG5+qxiM0|!3iG|Q>^`D4P`&u9qXD*6dG91x%<l)5Z7I!fewrZS;JvcKD0(LvCdNnv
zMR`2GuJgrM_Q!UV>jPjFR^D3KF*_eI68dp6EPL{Kl|{MfUS@ritca!sN+VjO?ESc>
zRG!v;Uj!pM>$i7KB8&<UkIYxI6)6AaCT@O&tYqPyI?F8lOdz;ca4!vWwQX@ce{=G-
zf9s`-y@oV`p%Bn^XbjlWO`2I-S@}#;oLo&umqwwaKc}rngNzHZRph#vWCVaVR;-+b
z*uWIuLTh=eD*1)F49~+>_g(*vZp=$p#7thgop#0C)c5mz)`#T^C1cy2KUFLh2OTl4
zUj~ld|2kJUQI#ms=B5~)uYL8n<HQ+hQA%ruMtb^w=D>lYq$C!lU-@bf{|*ILH_&55
z>-Dd!Oh+(FWiz{z+ax?TTt1S=F`fsNMKt?^E!XBg%FTz6=d06-uNoa43yG4jX^NwN
zF9)-I0_`SaD}m1+zD?|X_jWb;ihPDbUdbwf2zXKG$mc$M_8Q<q(FoDAo}jc%=6KOp
zf{lyNubAES_#r*GHpk|vzZ76z^a~F%nDi{-o&W04jXB^Xg$E!9>wSj^9nYwH_I}Yx
z)-9!ED_Ng-ODw&BXTM<SZo~nr<PMJ={Hl^w;NeA!UJY2{29vU2_6;L3Y-4%J@1F(o
zfAnrmk3#OO%d-s3U-ne*oYk%9w+87U%_Ng7T{%mRm$@Xk<>_%bUnA#aw8co&xWpqf
zQT6}(4n5=j+;{x6>qDB_$~UqDa^C8)6xZ|l1?|C=bJ|GmlMB*%nfO44;W9TJQtvE^
zt6Fj}d3Q^6IPZjJX+3IG!?3;1KfWFT1hbFZ5u@FB<t&nR>wJY1zdpVwA;<?b(Kg$X
zOvL?G%j2+X<NN1eO|I*w9NDPuGKc};EZfYyxv#)Z0~5^nV{jk?g{7rG>V4H5uj_n-
zCUGgmIrS7a8pN;7gjFxpn|6eKqJZP3XrJOJC=`}pTshbTg+LD9q)i@TOJh+A7ZUuM
zmbPq#990*vlpZ{D$`H->+XoRWH_^~QlKiqcG^2T{b9W|@Vv6wkWhT4t=70I+Kwo-q
zf-k)Ji0|X6YS(lM5T2L2XP-Ud1P+OM9OyiTggsfbuFK<R>yTSN$=pjqwm4@gLNPk8
zq@y38H9NJtb&g{tDDoNhKtl>^C41pj)B3$%|LH;okG8hxd}`R5oya~AD4m~lGTy#;
z)6Y;ZiG>;<s;#7F-?agI2xlQk^(^|hLgZH}Gbu@2OvPQcH|6i~N=)B!Ttk?<#dpSU
zlY>t=YHs{~FQIZ%pd<d~(YBv1`8d-%r7Jj-x!g}ni8Noe)@AU^kN|+3S6ZHJ53KRt
ziokzn_1O9TMmq(&3TAWr@Qfkk_n$ouZFdgb9C-IWFov5Ytu4~VcA8IhlvC_II{@-+
zZLk`kmUMwEv(7SRdkEfJG44<IjH7w5XtzdNdBJ~EMO&)M_WVQVmViuNxE{f4iD!Mu
zTP+K$?Sd{qFL_9bIw|)m=P>fVTo}Cv$>&OHJyU2Jdi!@MdTv|BHjB)Dnkwc`&Q&Lj
zh3SZxOxjFj{`bsmOnZ8we7{OZku_~;l};s>Yn9!4!j?|lGvv1U`f|)mZNoXpD8^*v
zfgG8xwmuipMTSp4XJx5Iy`OQFG%qCP(5&aG!0%~%a5IeuLC|*;LDmIU)Nccsg!BWG
zQmS@~esI(T+6h_U3U|1W%V8TU+a{lSbDm<t&&>IY9l=r9p>B<qu9|*4Nld$R2|3Co
zxX}0-rG2^e8jUH$_J@|QXKF>@U9{5yZfi%wB-E@}9jQTRce1_OqGamMro8~>Kc_5}
z^{dtc&nWA7S+ROzSM@<7B>RdaH1~I{bxjCQj(S6NQ<0(pwf*4Xv6IEj%6S}6nGqk+
zty<vN43<~0Jns_2L*8#mqVoS5j<Xew5v?C*CwB<Y`^?pw+*Mzqi=TN~_gAK58YIVM
zcr&lUn5Lz+=D1=00%MiG>4A4I^jT57Au+i2w4e1&$qF?CVE*;gzT8hc_{-6&aB&FB
zR*rG-jI3(|OCMjo>_gyMm@6IkZD5_Q3ll`G!Qw50Bz)iAj4i0xzon`_sQ*S2u;2gh
zNsE85_`ijJ)5`z;`~NR^X&vl3VtRxGJxsPRz0PGK(=|U*W#2nKU+K{juHZDhOq2Q8
zlL<(W3Yyhj_j<in3@fxtx)EVlXZ#X+o*BY{<vmQ+%IJ|SmyHzG8~TfD57mYhhNfrV
z){(EvM8?+6{-jfna!Wg_lzgOkV$Xb7pWH+~Oz1IUlDOClN|L;mC`{{4zpo!P6lq5S
z1g^ZV$|lUYCD#3pD357PQ{@&V%<w_}88K#Qq(E6Y*sXQpZ_h{(QWi!fmf$gh^G>Oo
zeS`1IBMd8F+`yMMY#rZ5;5ysuHvXWoOO$*Xc9tzWPAhakU|wm0`ix%dVh#`I-=FVw
zp`U$<hrB<E)J6o1p9MyaTiSd56gg{h?dih-eMp?ArU<v6%GK`=^Cj{8t~9lCzS!ly
zCORLhlxSBsMQU%G;WuZMm{7Uoh#a4zM~h{&q`nu%F+<7^nmbLg^G0x>>>c$zzCyl8
zTCnGri+3Y{n5`0})Tm2Qx6ORIu>s>7@sK&{S0gQ+AFOPO)XV2t7)Ek&JKD_dH!HdY
zP|||Re6&Y*`;~q#fx-z!p9Sx?Cu!cbCxN$U?BD_cVXk^a&-!-<UEp#*ZQ{BX2KV1=
z?jmfQ@Ku8M{Aa^Uaad9+BJbxwMl3u7As1V%9U~#_GxlT}O7UQK8-JJ6a2F4~TiWHn
z`@C@H{sUf7tU^XxLU~V(cAQ5y8Rwtp9yTL;wY?29hfP{5zh6gQa89A|(0AS$*11|l
zlNhy$d1{!qR*Kv&{YmPla`oC-bGH%D8x-FB2n%=hogOVH+qU*-YX<OGp_gp|_pY0c
zc_yAs11ng#+0R*sn=@8)BxVTBof&s;lz}Vho7dsC(Fg@RGde^JH-_GuXyFa^zMNRV
zu5Y)eA`-2=V(#}y8~#+qo>H-15i77rc#jBwNV#8wx2C>yKDzbcp!rUvV3W_jna0_O
zBKDh2Uvt@>Ul!M7#ghuWb4x*(z1!8=g|k7-djE180a?|r8!!Uw38aF~ZdM?#L3N~O
z3}1A|9v7K8IvILc>wwkmja+w1Na|nr{s;os*<CIe0UsCQTYfjdw~n(n9Ro(3(H?92
z`1u2-_CFjzp1GW`<y|NxANilZ4b+UwWAujb)A0deo;L6%cc<1l8b^IRgp4wc{g8(=
zz2z3w{M3QTXY<^93;ihx;qeXXUuSZ~_^r2y$vVhYecLainspJht`@hKTY#4bDi=Fc
zuNe39hOxSA$Lf?sqaU!2P*dk11usvO5Iyw8Phe$^xA)hM>;({p>|mu9sj9XsWsRd9
z?4sr3cjHwbwhX8jOUV@fy+xy;f(*1=$Yvy<Oa2Q4uqZIrx8qxUJI!C5w|ZmjeP-K!
z*iNtf>%Xi_mQ6cycrR`5U}rdtyKxy}U|$tCrFj0V8L^tDti%B0>#{(Mx2c&duG})W
zQk`~L`989)jM`)by@q>_{v3nhE#!YJRvGEjdP1qwreW%97~$TRvniZSPMBARA_XQ8
z{2{{fk*{zyg#P{$ZPJBaEUcHit6m61sFaC<Gjxl2{nmBH+IX^b%olvx#Np)*+1y=A
z@ik<U>X7?zl^d<SqTA+?eM)B3{^Xh7bpsRVqw)S~(COqZ^cFJeW4Cz6MfKByVCYOp
z<kYj{^!>@0ROi|Q$wbA9#q-rq_5hf4K`3R)E_gV<jd)!4wS60DSG7x<6OCINCH{#A
z&ek?IV1erdv{f}vGAy2~`l5AI)2{Bvdt~{lDYrmoS^gC$1NPgOxZGIlWTeQTGO`Ku
zH~&=oZ&9+cKD?+wlVB??6y&>P;q^(|ceDM!09<{JlCo3KEc@?Lwr<s^;ns<s_c~}g
zjA*hnzO~(p?Z1DG>QBEtn5)lhx*Y#5Fkl3Exw&r#fvJUfgJXQ>=iWY2W2{#QcENn1
z7Jg{>V(=m^&Uu&6J3wb^6w&wLo$~IcQ}*-C&~>@$&@Ex1)5Fg7`_`H<<pB~7fnWM-
zPnSE?FhN8#V9;}G<jVe4g|-7ZjM>SXWw!cdo1m7l-OtRUpGtAe^Ke=ScA8W9MJigd
z<G@<=xLE#mYH`>o9(+&t36b&Mub{|d|84w#iN%Z4KWT1z>)Cmd<2~QS&6-h356cO$
z57?2I_2G^d$?`@erpq?=_-S24efpqyWv6WyroN{Mc*dH*ffnnsT|uI;<j-z~<q<;u
z_l}^;$`h2zPB7MXt`@Ss%-yH!PJ|b`^QjgR*0?#?_Sr_p+fr=za#!fg*MBs;jWh*~
zjL&oD2P|gt8{V|BB7B;I7<@U{^3O-6R?cGDqezL&o+{o=v@?WJknZ!5wBn!mb<QwY
zUweKZS?gOAkO#dN3!B{gL67DvL@ioKC~gXhtOksP#@Yo{-YM;Nl4P{O?&@DY_0o@;
zLBj7YEF5vd+fty5q;bxrj-}}8G_9o6&}~{Y;1c6}#y0RA{R&gkKTf2R(#g|hxW;|R
z+;%x_mxp{RpnSjMgKdTS6StPgyB~xZ-o0AU72n2)%Chm_*#D((wv$Yh1yaJ3wiA2Z
zn-qx0BB0)%bK+amla|k-ip6T}ZugnAu)e~3+B;hd`~ln*9r3@4eH*JXsCW<;D(lmF
zRF@NULltt-dVM`=vr7E3ph<e?{kZ%d#Mjz%(B{F_nyyg7FjM3%jgXug`DwGS_I-^9
zl)DZ6q^{C|r!?g~QAN-(>DLxpH-xAv5IG7;<y*qsFfpJU&>tDBSzJKGsZm@|GWq^u
z8w+%sRnzg}U?(XZ&C0=esp!%WPiZ76z3e$wIo9yY-b|0|i?<!Lc5<-h4TP=d6W5%R
zUe!@q>hXm`6d=};n=~v;tTJq_Hp5KHur>err~!d~U&kk=CJYcCFAz#OV2v5Q=;2s#
z*i6@wl!waLLIO+#gX#N9$`5sd;W>3G^MDky3Y=7;_!Im}2=u99CW`efuKZeyCxr6z
zIaXbFrM1silhHd3E-iJF@{D6d#&!IkzxU5MvGd6i6J$DUv)v6Q#2!O3$r5Q~1GbPu
z5S3|UON0tjlM^vW1zh(A8N<_x5AB*A*8CUJ_R}D9(&=gaiE0lI32VI1zj>5IuBVsx
zr+UOXzMiT@Qeue{0D;IrN5Z)W=TW|<W?tlyBrRR5?Y~G6sE3Wr_tNYvy>}U|+eh1x
zSYIg%Avl$Zv9(*ILn<HL3@<b7g&ptC&dvHy+YV1kV@Qq@;Z8p5nCsKXuqm7<XL;;I
zVEXQ(VG5t^{?vH;e_Vh)f{wd!i`Np;D>Nyb%sPmC7a^j9%=_HTXV|`lNiNQt?T05{
zWO9?VSd<2~-l&4C_FT5rto%>VPAVR=PWc_L_H2wUs^2UBz_K(K112ti*HH?OPn{YL
z@t06`yybm5BYW-&c|F4ve%)7AR95~aKhO+RNAD5`7~6g=`**lP*x70w?~RM)W&<6d
zVZd+V49E(yGi;D;pGOk6tj6o)Q;$Qvispxs;vXVOB5a_>k%7c7C7@LDcXaWN%1#!e
zt&f?fck>}4>=5EUjRYhKF|<l@NXEvBJR`LB;)vQAli2pZ1HhYEY>$4C=OxJs=MT0{
z-Rd#?w(5QBvvg?q+R*;`Si$Q!ACDS8VpNjbW2%m{=tV*CM>b*DvLJ{}sO@z1@l?d;
znk)NtdAD=}JLzK@CnN9t?D#*UfYt&^Vfs<_`|Q_}5U%N)O=mj#6jb3kVq^H)e0o26
z8r;$(pWYO}PD3dghcyy;71^9hPYSNy=#N(rRZVVKbMFtsp>0148q4x}D8~AK0KPy$
zzXBv!AVaQvY*AJ#t+dk0vjbTBk2ZWYt6Q~dL*3sh-d0-K8-Ud?W#rs;rBn};>LTe(
ztX}rl-uU|0zy3{cc;mw2Vqr$mK$DvVkq&qhDTD-r5mfVkASuw8Nh1I=3!&d196Ns1
zU3WhJp)Y*l%;{4kh(M5;wP7vkR13LUX{D7`wgIpX9&IvdS79tOkfR^0_-Un;R(4k=
z+AouY1;Ugn#9=`U;P<@YwYS`M+gtwHcl6JmEjp!%1{zJE1-g~B1apA^3o}BZ0isrv
zh6*q<GDvP_?%Kb9-=U*de)5x_t_H(Eqdb_&f@m}@D}h#8X{D7`wgs?y2d;!jYFs=d
zfMza=6!MQW=9g?CRx7RSx)7jGWV#owLUFP1njXq4kKA<c-T%#7-db2-8LUnvXrKtU
zQU&@7EDO@<P6mS)a>qE)y+K(GfHP3C?4Xh;JAT8BmH6OaectL=1kmURjv!*B0SJQ6
znlZJNR$6K0IRvn#4;~AJNeX5lj3Yl4iRENjn=oU=7Gky1%3ffsrg4oK$yl*oEDZg`
z7k|%pzUYp-o_FJoB1n|9+;dQ5p-`vl-@NPHk9_mVV~4IhFte|&mO=<%hek;@@?hD>
zd;$z$rj#WEilQvaFx7kV>8HN_<wrY&TnT|@M$1ibMm32oz-pzHR$AGrSg#YNI%Tg@
z^twf_Qxt`jg%xH78Z4)7w8PX&E9XU&sTNpQ7W?vgAiL)IFW~glYhLjx!6aGo<Vp^Q
zAQoU@VF5aF#j$t4|NS3&;DO%kfzmoPltj{2c$@{xhLa@7CCJTTL%;j>7u<FK{fDkQ
zUMqR5=?Q||-M!6rZ>5!1TG<J}nw{x&yEZ%1?R7%08_Ggu!4P0XFc@gQig~crw&(rO
z-QMfFb%~a6^85~kn>?5pJXt;L))kZb2{+z(=WKVXPai0m8t;?n0$_+{4id%pzWUq#
z)ld9SXTSBWfBuXA;ZxsyYG|lIce>~aa>yxBo}Fa5ln`=ROh#%@-Eh-QH{ExSg1H1G
za|btZS)HHdLBP)S(`ux>Sj@Vh^WM%yE0=>52ljPHrj#TN2E#y0Zov=?0_vEOWTH1E
zMBJdA#_}n#qeaG11f!L$t2x^xyqm}0*L>A>iyC|ndJ<j?Yh&{%*uCc+_tKW6T8w@7
z8}7Ml&?#Sj`wL1Ckjv?AArMS1cTcE01v?5ej>C2R6F>NO9y>Gt@8A6!A6cCL&Nsd3
zXwm7JQKSoWHzoo=0ZB>%fdoXaQ5IJoK0G^naH*W0jf<WJ7CKaE+~jsS(Xi4t9tu0x
z@NV*1Zf)SW2b1o52HkYwaG`HaZ|Gd3eW`$2zqoI&EgZYt0oI}YJ(tT15W}7ghn*^F
zv0vBGQ&O-{M^6dSr7bBA?r4#r?H9a-1BQEG0F8$|Y+288jS8FO`QRQr{smkcdUj|3
z_8&O=mn4@Gi^JDk7pA9XX7?@5&lm6n8W1E2F-fp0)!ovn#86mZ?8NxI!w3J@AO7$E
z;=u=h{x{xn;<j7=`paI^9eN-D)OA(6ha!{^#3ZLfNTj8zMku<o2T$B~=jqS=CE)M~
zH^30Mh1m%^8bh56fnAWPKj&TT>^m>GyJG8`l+WVbi^@9PeBoUT57M4`mo>oJKU2E9
zq~u;$5dynzMPb7#)zOE;Xt0W4Qk`5E;>c++)&?3ud%VfDHOt#pVk};cgMYprY81V5
zcL?S5^i|j2a3-dtFidi}lMoagfJ<PgoI|hsV6DVZ27z&K!1=m6o_Ft0{?xDj-tYgr
zcfS4A_r2(*>#r|@)m5T|+AE4Q<bH(^;GPUckDaMI?z#7)4}Jz-6G>Et8Ol7RI~k(Q
z5fU%rNx%G#Qa;CGQd?P*?U~ieUIMJy=_324l6w`4UKNvvvfyBt>gb&!3@gW=s!7tK
z<j$sx?0Onk;~r|;OpG0WVM`&ssj~2uuW&cMb`#tBIWZAh>6{%ezw@~i^R<j}IUyR!
z;>v5T@v<z6lAYc#!fBN|<oN^nPWvvSL?DokfZ(cxSa>|5@Z*2`Z-4eRul$vFyz2`O
zKXl)H_g{JNaFBZ)tH59mIY9>jRWT(N(YgP?AvZ%3+~Emyg@&M%D`59pM`mkuT{e!2
zO^hX7`q75T4c@NIR`wELO;44{y^bl!LSPxpVMRb$#=)>IgN0Co#jx_Kc0?p&N@=5m
zXYz1bZ&h<W*GMiG=a^-BqXTdAbMd(+x)7IG`--o8eH(W*p7Cuf$errNbukmou;w-<
z|MEPnG-6cW2e^`mDy7?Ry{+hUI*wCw^Ha9Jq#GsxR-zzTh(?12f)bGgPbMhAlon1s
z@8E&|<sbeJfBLbH{m%P7c<s%%-Er&f9fsucdQezS5|@OEp^`e?DHH*{Da1NJQEmpI
zp=S_m&GhObSf%IpaK6OP<fbe57S`i>f5r)nwI@Td-Muz8%g+gGC#W8Gc+uAKZ)Mv6
zi&PO<gaSZv#N;umEV@PDR3|JAV+af(07C+j(@7Q?W4Sv)+49!4jo0G17%|5tRw>~z
zhxMutZnX3znYDTG7lWL87FL0kRllE4wYA=|%-CV|JCpxD4|lk{%GJ<~niaE$4q9Oy
z*}~GoaR0O`20DP0I}AFFu$YFSD2%}@1$T!FR52p5OGb1mf8BlezWCnz-u|8s{O1q6
z|K%@v>7m)_IP4oOgsDKMG15++Ios(?7iD6nD+I}f1WzE%0x~C7>!7+!@!?9_W1}oI
zO_bN1*ZbSZot*ct`8wo`k_2#Ers3GAVxvV)t?U)RGAzgDGO=K3mRwX>2e)8F5z0;i
z&<{zd`olyuE0W}-Q9y21vq5YcdC@sOwa%7kOI$A%rH<^I$v#X<kO55tfeSp1jY&Ro
z&E$aDE<y<3`o~8cpz;I<!RhIJq0=p8iwjFJIp8iQ>2wMvy1NN+<O3c%nkJ478N6rc
z2OUxIkN*1iKK5<j_HX~=Z#{En{w4R`JKdY=IBQRI4mCKt*e`lL_~5`5N9RtR3Q`@T
z%voe+2$`OX=a2x|<?}GMfyGKpYSfJ~2Q*Rax+lZ3&IVkmLsngv6SwBJF>ccG9&e?U
z^9Qh`WoIulWxFYu8PO?2SqHL$%V#>Y2tlg*!z7~N(LuB5&v_V4Y+h>3?on$(T=pny
z@*f)0eq2m9w?+%+HZjl2FSWJ42U=yULjXFRj+I@x#aIvPnuQ63ToN3i@x95l{z)gu
zNVtq?8l<IA*0&v={n@|w-~G`85B<V>e*c;)ue$x3YdQsF9Mo8<Du#|(oZYwYbV{@k
zLP#J8cbS<#S2rmyn-XVkg!s9WUAzbQZ&Mh=jjns{1E_63(#iz^SQ%Qmi-h2`9I*4U
zupk&26Nn%=Qo+O&Jw+dQGB5$M<?L%amrrVwJlHnc_Z)^>7tvjDs|V6npK|MGvjZW=
z%9RPOLa#fmvUCIlJ9&2g=-~rQ%Aks{oOPaavDT*x(<oP2AVfLSuypo1v#-7Ht|#Ue
zfBTRB;KWr&*qITqR1F;rolehaq@<*jud{4`wac}Al=Hj+w+PJa^1{KbTs8nJtL4U*
z>fWqV^W2?~1!t$aodN-7iU5;$>*x?`7hFj0)OvYU4aOS7ENf9zE6>3Li97fJMH5*T
z0m1sPvgn>!TIx>E^g1C30jA^z&&m18Wf`1Jr16Rr6E%WtVxj?s(HE<wpZ=xa`r6l@
zdD&g}O^0qBRj0Hx92UJ&v5uZnj7GX-1Zgg?-MXz@{F}5zSFK!p0BdrcT9b@U108@F
zf}sqUo#~Mgs8aNLs^eaHOwpaB88>QJHd*Pb7GSl~%En@V2zQ8PWeJ2-S2MkC?F<av
z5c)BS>X;P*!Q=>ZNzQf77v^rxIY^n)-KqgPQ(ro>_%lEE%d^L>e&wrP%ety#RUs`^
zLuXM0qY*Jx{eCdY)3_saJ3Fnk(n>4O24HEz99Xu5LnugjmC6ETf$6Dkom9sZ-OWsZ
z%eP{>vn6Y9rIn2(*F1?P26>7po|!vy#Z+%lr@+D^VN9-C2_!tn2L;L<IZ1iKhebGH
znE{rL5Gd@w;y-=(&)@NTAH3(j7tQp#u^tkh7>5zVlo*OY8o6(FX8z1+0}uikQWLjn
zH*PDJ{0`glU$(2gm0bf^TDb(3|3gsB<$fYj6tsv=$D*gAuwJiICDmTLCydCeRvEf$
zt5A02!P;5REbeHVaW^(+E0;9Nxj_CJfo76KLnu>9ArwzP`Q!`AV#*A%S}M!Za<+-*
z+<Q6PMFjx#Ca2yY<zy6hkf9b(cE2V5%b$PS6Q|~0_==a$bfy@S5rSJ8%&Z#%z`|IB
zQ21bR?sQio3n&<ZGmLil?$)BP-DRzuN3m_}#&#*TvP%HVS8F{s9CHrH)!4~Ur?lju
zN?w#;<we0VPzsW~!DYLDK54=|ww57svV1DPJEG0<(Ti()%WTe2yw%N_FSIeK%trTo
z86uKxJ?RA;nY=i)l2~NTU2zrp+IF97-4AZEFY;R?JeSgv7J>{x!_WTtN8k8&exRem
z%Fr!30OW3j35qUHP;dyc8YV}9;4U!`1T+LGOJ(QJAA00%zw@5n!Nd35bB_x#c@fNE
zu+jnxqZKft!KtcSgnDtl7i^p&PeC+MyUmQ^&*BK&+r_-IB|51Sw$7J%-ZsKHZ)s=G
zd(Lm$*>(4T+?OkB+1IBHQqv=Wdok==UmH8P{uZZW@5i~76#$D{nH4h@P^YwRx0s4v
zCDkzvD=;Ax0gmKp#EGqj`e8Q++{mz&?t7%jNUmn`HRCwlYvN-WRQaY#eEmjU<7=%x
z3T#6L;oWVqvi1@e6)m2P$ot%VEB876`}0r4pKoXK1}2#mn{F_qwC$T*OMAPf8^LCG
zMULX<bT|!WM#RC~nWec?C-)t^HW4U7N|7Oukc$+Zu~LE;C~9)CKj75<ge0<rA&O<u
zH~TLi{^<KY_VJr;zV(VLkIxT=X2Hx9f`u~I2bM*{7;K2WGJN_^Kh_1IWJT94K$3ZO
zYHw2Gwf))T+QOJz7P--1pU=g-v-N4liC$q_z320`5jMZ2Rktzu&y7B1#;rWpwywLy
zyL}cI>l{zF>la-+N?W<Y4pzk`Beu!6Z9a*uJbQq(rJ0l5%!&eK!Kq%^AJpBl9G0ny
zF(pl|o89K-9uZVd7#!;@S#GS9*Y=R#QnTt2L)d0pZqw`TmRh_tHo$g?^)L8yt>tQ;
z{O`7Ia-H@&JAOJN+{{9fX3Fy9!;f9_+S?WoD;L=@Lojo9gFy-%hbMCi5IG1IrIK)w
z-R@BO@qhV$E`;(WFMX9q45Es%2g1xO1Pfuz?T`sy3whV$@BGTI?K8^3vI`cpAmly3
zwPo;Qkh-JiUH9O*SXTSaW^f0ex=1$ouH%dy@12WwaxdLGY^mxmVt^&UoE#@-c`$T4
zMSqY&5y%7}6HM>XN?R3P8G9PqP1wq1DH+#GLaIOfd+&MC8@{`c6zBp;Gc(9&a)d%1
z(mgrFP=ru=L`-Qu@FNd=_TT@`f4=VK+ipF4oC;;P6FQyjgksZ0gvN#>D|?f=3h9|A
zZGK4w6hg8PtOGOUzgf>LK5v_`l~!75<uU<SYZ|7L26N?Z&?%r(7E@CgR3a<F4NQBc
zXV-q~HZRm_|5h#~$+2|{g<|~XqmMrPz-Ml}_wH!jdfasxo-?LM6cViKv;?avhjj)4
zZ~x$XKk(^KzVh|oK0AE?3Ej>VSyWZ!a9T!aVguqD2UH2nF#Lyi{rdh+FRCBPu7@sQ
z$tl~cvwMrKT4|+~R<;VTv>u;AR>c7{qnT(RRTS3k6m_hd<l&2mhJh`{YUL6Z>sYa0
zaiL@Ndw=!kfAVF&bk>8pB><Ep%LH_AOUcSYfYS!u?n7UH;+Nj_P8>S$9dG#?y|N1{
z>Oo{E<SM$|T#k|fmKo*BE-a(0t{;E&;lKRTKbeB}x?Kw$Lx{?W_i7uBw9-l|t?UB8
zTDPQQ+(g!lWzjU#AYoJyEGAt{M55g0>#ekMu?PhbPO|J2-br=!*h8Ov-*3MAJHG$#
z&PS_gK5on_1u=wD1~@TefBe9MZ~rg<<?eg$yZP2z-JM05<lSx|0Rip;j3lIx6UqZ9
z4}cE_hkD(g`;}j&$4~}Xkd<)4xU$!1E3LHBN-NI-V66j7G8=*fV=yMdz)o30b+7;=
zwia$Ht?ZU{kVAnMLJ<_PzuW!ocmMjE-|{y*<+KYP0!YCj(#2qM@1gjGU;FJ-XTSB*
zH@xxq(PLhvz#<9ooL<$Wb%6muFwtd}8#j0tnx5_b)-S*9(NFzFX|NCwx^9I?2Vqd#
zioKOqT4`nbvK^-r4GxM%D?%t}h0%-zLT)rDtf;ciR9d5-)rF#4vx+5Q?awBEkDXkl
zl~#6Lw4Hagyj>(hW)3oRd)=u*z+mtr|MlP2(wv6#1?o;fK@>(SN&z7hGo9Yd!9(Bq
z*T47JmB;GjwQ*p%gS%x<bCZfrfEXpM8|9Yjv^f9OFMRHIfAwusy<Vs6g>nj^RE|W_
z9nR+p?_yKN1D%^3NV~mM1UNS6iLq;o?z}$K`QK$L51dx_w{qbnyyV5VZyAbNhBq;K
zoswjODpqx>qDNP9_e|4(jZ$JU)?XtE!_`}b>wQX@hmq9yXW7(W{bMWtEkay=0d1JD
zm2Il;NouC;)>im>OH}Lk<)k;?-&FSH|Ixy*io+_VVfCp$`}lXf>CGz3K2>ykDJ8;4
zGYfa!b@vrl9tokOjG#n{5T)$FVzYmn&VnogNe`B&IQPh7KlLO3;9##;Ee&d+nBM0I
zfPtLMz2b;z^s?Sc%UvCv8_wPCW<x9wsdC%M&91xrqm9Z7R!ojoUSjhfJJ&|IIJc)y
ztjSgP$xH2tF5ob>a$x}$0lMIh<f>B=!@|;_U&UccG06p&gDazjHUd&yGm9$$Rt`fr
z&@=&A21u?oJ7o;dw2^|`;3~V`Q*G~-<{o|X=0{_@)7Aw^+dZhXvBuw2^>g9}1f@`m
zo#`nCvtf<l@Gm~`i5I@|<u*HA*9oFEU7wXw&0rD@fM6m;8ONk_w2_Gdz`aC7ta|W=
zKl|x__GAC>P$(4BzQaelvj-{|Xk-JYGUhX^=#r!DY^6(QQE_qxv=tz>Tf0&MB<3bZ
zTm3N`O)$BM*7NPm)Oi4ud$c{d-n?vL<k<E#=eB+>?3&-!ty-(-_e_dyPFdCl2|!HI
zbKF57O-Om0`-Jm}t2|ho_%5yTk7c8g4jJgcDD!K3tIAg?el4#a?Lmtv+k4%CJ-A`t
z!sE2<xON31Z1ll%POig9CEDR5ho67*^&kJ>2SeTe`eP6O<Nx-De)?bk>*F`vHt-bX
z7D|CG<!{Vg6mla42_WQBHdW|G##EP7sdS**`R#YS?Kgh$7iP;|zfLwi^M>zu^Y8xd
z@0Xok*ya;!^`2X?a%>BKbLp=SHSM-1b=)eeFc)NIW<PKlw`Z4Slj!DKT~_0=qt!EI
zYyR}oa5$cGNpMHyOWXir`X1{6-@={m=`Ps%-8x#iI6PRA1i52a$GS#;7>8A=qUxyR
zD?0t1b9Pr%esft-fuL5txRGZ{=iFx8`3|`l?6W<(;Vpi1>(JT@cf}U3*&u9MG1WVC
z`>ofUxb7=o_yUslb$h@6Yj3ZI!xz8!MJ~5db13CfU%EJQWKr%3fEh_Q0;wv!+Ha~)
zp8V;5^kbiR{|9G6QJ2Lagzx^rA3WI~JoeaEI#!HlUYj0i+}Idc3#aTdUJ{LM$mNZ-
zzJuKWBSexEndilF^H<Wy+!@R^{>c$uSpFx#)duCd{j+T^b;)_c1nV#dZPeXt&2a42
zlXJHpYEN}+tGX{afCULIq~ul9picckJsA3+PIYu2Q5O0NU)5&D${KI#Isj|Lt;n6N
zo;`KjYVUvc?uNOA$7#3dg+6aA0p-5gscWw}cJ<Xa-FVa2zWmj?KbV=Ce)xgUzyH1O
z87wTk;We+W27_Te2xSmzA)(2KbTcO+>4s#AAys7@hNb!c>!*J5*Z$4_Q=ggZg(8a6
z*IxUE|LXgfSoEVm@#QZUP)@hP%0MT!aFVZGIhX%JQie>8Pboib&XzZ2iq@P6Y7mw4
z;~*My`^(&5DubmAwniORC;mJ71wau(2tkk`dnDO7Es0EWHUb?+SjJyc5HOK>F`f>t
zL@B(0if(NPe(ieOv36STkM}wPtd)1pi!+kg%3e#cjV04CIw#SR5R)e{iAo?1NTb{l
z0P<~y7}m|E^5z!`O-zxac4a=gr_G6^_jLJQa(jcV#dC=PEC7}i_E~Rfn7W6Ly!fr(
z`|w}<<>@azGG#@2>X|=!$2<S%U2lKm-+1d?uYT3-FMY|NMm<cmVvdTGDL@{mg6Q_T
zfBb<z_^Xe6>@WZ5Po|tlSjxI*Jl*o*7u|aQ{Ywlo1{;P@Al6vf6nAaccCLwlVAE7H
ztt=F{3|5+t)KPBKEx>amDmdYg<dOmAgh0p(DJfOKGQ`PEh7@Zj9JR<?yO_r*tIv>?
zo|H0?Gl@(M+v)a5Q|Q)75=19tfdZuf7E}?)P#`8(Y;Yc!Bmm|j5J*A^NXs)ryMUVE
zoNi8TaBA>e#|qEkf!!AN+PbctXlc6oh--Ci3$WI#80M~LNy(8M(Gio!7+sK$=?EqG
z*x|&j_0Q2VcoK3#N&bzJObvz4NSEa|v%`#RIOL@*wiewTU9j9JeoNiUSN@r{vrBhR
ze{Ik}eq!i|iT1s_r)w@6yz(rb<~;O+S#^68-OX8+Jr&&nR2=Nw_qsPcb@bRHpZSb0
z#4@<2>Vv=e?%#jcJEvx5ZoB91+wQt+|B)lnQ(2alyc5DVp8WbJ|KbymKKKCo{pqRc
zLo6b37Cw9Bk^Aqz|G;(EEz%N;PAH6Ju!5dO_@Qawt@Q?u+gy0dkF&?ei*|b#t!lRD
z?lx*S1W1UmD7akFy`YTAeMleHwYr_KZ~yGUgZr4`!2=6Nrc*aqrz}H&nN3aUiX(>%
z5nSMMEDtL(w15melzm|^InJIP4l54o%E@n?S#l>BQVgfh_UFzn4VLP&a|CB<6tZ4X
zPC<d}$ve?&hNVDrI7Be!$|XQl0dy`V^G~aG$ErQZ@s?rp%UUyFN7{Akd_r5YSjX+C
zMtfX)rcAUOW3OFNn5~=>V6D`IlBgslp{in)QdOr|D@LW{IY5|KQMS<RT<6lt{CAG>
z=Nr#?{xbJW(ZDgD$(v{uCLp)Iymn{FjPG#WvuCW4#~a>#vKjW4(owby8Ml4U>zRVf
zBV%S04|Q2(&X{d`K(lg`Hmt<jTnBAy2F=#NC8NA51A-gGFbH<d3-3R6^G#oQ@C#2o
z@<@H^nP8kM3k>@Yed6N}e*9yh>{<vA1t~_#<!M^(MHwudO@8>qi925O@*~$?XT9lx
zU=B|*D{?RQU>wi8OO3O|x7*Eqyx5wC&}-dYd!)T>JG)&Q&)@iQ%|_8TNpeU^vcR(R
z*{RsIxx(i5P2;v(4<0{$q-*ioW3xA1cl4?&yVG42h2Z8cS^->JpsK5RX-K#lCr2{L
z&>e3>jxyf4d~cI{8TrMIfW(wgrgR8qu0f|;oH}#n@ZlSbQ;$E<fAEVZAN}g-M<1X2
z`qyoKK~<dY4|-J!E-Cb2wG;4tP{)`i+MH=@Xl-soo`?OqYV)q0tPyaLHB8v+?9*rc
zAoeUz6SL)+Ty<3KcBAy2d55*p^X@=lwz74A#mNa1<x+IjDMi<CPz{GMrZhUaSDxeB
zgw5XMg=R=$qqxNKk;9d~>$O)Hn+WF;-(CB8-Dh3<npxPcQO!N<Pr~&cVcCg2@d}^g
z-t0UQBsbEtyL$Sp_IgsI{2H<dp^_9BrL#cy@R3_y^@=-R`Km`BfAlL4JaGE4uZCEa
zK&M+s@+!$aL1id9-QGffiJfkkp1S(^&%gGLJ25?@Fx|H@#3m{fC?n)4)seDs0B{+S
zTR6vYvZ82Zb+m_E$8O`ZShQOlNuCQ`nb}64H>HpkyG1`>!8l*{{iYjm<F%dp@45ci
z6}{)*a{YmQUDH75hcN6EOdicr)t@WFJn;+^gPVq)oPqh|@3^xxDDyRE=nOMw$Oy_k
zPY3f|`KWHFNyNg4N;3nXq)@wyJe9#TYj(N`ON)Trc(`}ttBUxlLlIZjJ_Sx!UJRps
z<!f_~KT&<~LtpyRqr*X6N>>2;q^`49lL>XxOzFJ1Y<H@u*8MXFNQUj~&@GlEZlnW!
z>p2%|A{gA@iMYEXwj+Smf~s8xSm&%0YF3g1F1ag4uWO}Rv374L+Bp#MxrhJ&AOJ~3
zK~&+x-Ku9%>s%{i`c)yS-J0@CtC)!w;&N@Gz(!W=c?fN-F}@*^!I(S+d100yv5+&G
zfvDUMTz}hr*WNU3OpEgiCr>{4)vw9jNV#gSL(w^S=+M5y2M-=OjG_~*7?QNIU{IpS
z92`P`XVE&ebLTeM#g*q6*TYfTp5Z@=r)*~_PWr{Pi8VwKMk|Us)<)8+0!szv5l<~G
z)GxTB^Sql6-*M})d!B#WOegk2>~wT+e+XenEqPoBwgmqy-Jxh^aG=UWvED%{X(=Vi
zEd=+%vWtb_m`$I{H3X20A;CenpqL^;a4{5J2bp4-9r(he6*N+jAs7PSg4_VJVD6Ft
ztB5)<g``4f9O@Opdg16DofqG+|NGwbihkW04vS~LHTT35!$16kM?doCr}}olJI5nt
zi|+JbPyqvykw~=QEHcvPMX4Fo_+56XC;1k=tK4byaH9`iC~KDIR79=pF2I`120$);
z5h<6uQc_i?7#S0CGL~!A@$+mrgL1TxdxMACb#w0V-_n8l937nV{rxto9&<S$Lk=6$
zg3*jH<wCNcrBsLg-I;wyZol#QIir>|$ZH^ZB-saDQf3MuAs8)T91c?Qlv0FzGSit`
zJOIwgk23Mu?Tq7OP-r4co+}fTl-)bRiY%|(u5lcjF<5ZIq@dKXYNpd)n1B4p{`!V%
zr*6Ob*b8nwe)Qn+Ymd(!KRPAN85V;L(%_4wso{~LJk_9rxdc%SaSgnw%%d4fvXqPz
z7~PXgR+Rbw8?3*$G&?(!B(p#zG3L-?ZOKXZvY5Ie`E*rx_s<?%m|HA6CCYAC&zqeY
zV*y1V*B}~c5Tvv7XS$u5VF*RH1dqVLwWv4<p-(L-J=2YtEqTQ?e#bRa-|@=lCp-G^
z6Z4;b;F}-)#Fzi-f%$LsJH_l(;#5#bsWvNf3jL^Fk-2D*<mE`B#Eo*2b_ow%<Y9sK
zl-y;2bx!L*0$d@<>!doNPKXW{hjogc$+5WH>SNa?xSi>CvpuIp4S)cEU?$Kos_bw4
z2^L_I(>juBAU60&kV7V;m7OM=OEOq48JB@DG;F{!5gsMKsLa>(ILZYW+$OM8809!;
zMwccWA5#s00p=bUjl(kZ>GOy8#T&1gz3Hmi+peE^@rz!2>`HbzLre2<@N_{ZA}WD$
zx!}PvYGdQp%eD5*t}te}JIcj`(I95vn=5Y;5WVgcs8WKJw0+ZuuB|mqo9@?fVOR}@
zdit5gK@}DU!@2o*`egO!V^1wCrf)tqH@BENo!-e)gT?*|W`*&#41kRyhfR-GXHj6^
zes+6y?AYx7{WyN?P%s`jeCUcJGlvcyx$<yl|E%qsExM(LVkuyrik{{b=b$g&a;0v5
zUHN@)yosF?pZx4oAN<H8AO83wr%ufzU6pKqL;yRYxjPsEa3ZznBGFQ8bzm!(0>H|4
zNmkS@Qi8k3+N-Ex<-?)(2eChlDM6w)WqcP&*uIrkE*pfE>;FZ-%$m|Z$t6w%8gfTx
zKt@WLV`-u#sMDIxdTQ93MyE1N1cMa><bEmnEOS<N<Jz%CWzhk-JG?GAq~=4tczCux
zG8^x><>1R+e8Y?HzT)s~-_jZLg~IyMLunXQc_Kr@;pZ7RjV#OTy9Y>jnKgAMQtl8T
ziX;9%NS<I)DRjV&*l|n^z$c#>R;hsPd+<vqKlbNeIC)B6eB{ijIfNck3el(K)1A;O
zZ3^lMH_;^2ZpNjcK+KBkA(;du0n8qx>=dy|T&lsEkDmoFlp<ZmDulD$Fo=WG!=;6z
zSKyYLXK%cI=H9!mz4Nx?`=|RIJJYd+!iK;=>8n;he($Zi>z48#{k>N`@zk;Z?`<FZ
z<maD0y|^ECB>F7b6{6VmLd<1J?M`i_m2G*jII0U~^5n2V?Nt>AgSgm_gDMRMv5rtq
zNS~ljXr+}_cG-)Q(|1Eaa?o5(qalo(Dgv!>tOz#BP$mLLr+-7BLQWipoM5+Vn&44@
zJ1ktJzPxeYxl!|-hCN-$Oz>gQpi`t&&0TS@xb4P$uX*Y7@4xfVH3zF6Pa>WU#Yy6u
zs46f6DHEJQgh>ukBPKu3=3?&c$Q%!p1w#`Q%gpUY1fg)02~)1Fd#U2!H&5b`FMsR7
zFFpR~V<#W{(r|7bo!;RXdr`fi?W=KvED0xU+Gyq>$)lMiuyz3mmfW2*2DlR4+(-{=
zjaN}lQzph5<8gSC+aVf)RKP@_MrTk@hvE?SaZbIDKREc<=c?a)?_96^8q+iP+*!W<
zRo8#pt8bg>o|Vs)s*^9!hXo(G@z5hb^JAUU)yux})X{(bf4t+=+~I+a4ZH((Btl^#
zMA+u;w9?8N1^y3y<Zo{9mP>FlCMCDQu<j4j!csjqUo9-wXBVm}qE7G;TY+!8kh_&u
zTG>pJdu_Jwieq=Y`V|L`98N;htyyAj)R}3jFp+?ip_7=KdkQOZ#q+zl8T7IWFu;YX
zI`zckpZLK0_Z8(u=EWPu=8&>qsezJE5Q1v2=7$SUUU#(k?r*>2C3jwV<JF;8&i8s%
zS=K;ha5BlGh1_OBq(C`R9zB=K+(pO>mJQFkg|aB;7Z!TG?#PE2fG*LklUdOPyYq|n
zR~|q0;1^GR?32SMpYgMcT&nji3`=JTc7(!ND8~&2(Xv;u3D?3wjS2kBAg3m{0LRs%
zkYT-oVm4V|wr-Qv34)k}QE*d&ku<nN@<0;Z0F~@_P<8F(!Rgc2U)TMiAH3`KTY~kU
znC{Bu3IXUwlo2!EcxL8Te&eBEf8SFISI^8|H5df4Mgu%oX70AqN-G-ytX%Kn0?7U_
zRneCQaailjT>tDsHNRL@(W=^$!y8trhNNT_sbDLuwDN2KRy3PAa^+pGef9nkz#5T8
z1T<+!-c+Zp;`<SpJu~JFF|ROgDXbN2H>TvMhi4xD`k%e;z56<yi{$Y~$^<#Z-xvat
zdB3zu!@22VaK|mj?!N8l?KkvZaLe@J*~MOO!P8lJ1x6?#sNo|vr!t%ZX|M(fI9wDU
zhglKi9_!fc^-@YuFzYaMk~3JBVP=r_fA)dXUw*<r^|^07@#Nsl0-ieAkLX43vY2uY
zLP!We7=hQE>NfK2h}i(8ltY=AAkW-5zhaXfg4(zwC8vnl2#~KpV55)&1i}j=DG!LW
zp|i5ugW{D3hp&01z4`S=UwC^DgVR)<l4!w0<>mCZPG9?Lzx9oG{qEzjbKJd0SZo3r
z5hz#Qd@HRyr=?i2KS!Yi8Re819fK-XmHPd-*sm9ss;WjxtfMEFkLWZdHT(+9gzuhT
zY?0OlvG}uQW9zlQ94sKl7&Bv&B+>GmTGP*2V_Kv!L+lt}K?;D&#!XO&amoxQ8e8Rb
za--Qrkw>YfYoE~oLD7_gB8Q9nJN=uk33uGuz4wlT_rBoD!!xeIT;XTrwGRgoVsOFX
z3Pw28B&Q*J!9<8TWjw!Oxow0Ql>~;+DF>B0odXFoXU=w>d{U2p4Uas$_=!({{^2JF
z1Di?3K8Bvq6ACdnfB<GFV+Pr{wy;Tc)5y8VwR!5xgT146Up(h4T%iNB@>-ls;!CoG
zBEmvZ7SNLm^*cXM{Q7&IdFfsL_kZYlciebprh6JG7KExZ*YyVf^A8_=>-W6uXMXlC
z|LUQL@@lc`FjseFrRXNTYP12Y<a%JSl~yiYfHev*NS3t^XvtC4Ifp&ebyynK3;lF<
zez-J9!x~j$om}KfLvvK{J#uK7*(#*fLay^*^mA0uDZ=uhf(;Da<wKmCSjW4|Mb^re
zVMcEMOOG++7QgNpU>P}1eIb_1?I!oy*rzo~!P_vB1G%)nakFH+W`?H!l!WuZceH%)
zFIxm7C!9G+b}R%fb;I0&snfTeD8B1;&wuHiM;T8d&4n;1^bIT|YckPc!KIv-M3Au|
zY6XqCzjEFRQp&&4LIS`b!dX<cB^_CqJACTo)JH!0$ooF}`L8_V-Z_Y{kL;2+Xtqd#
znl{+Y7-r?ylo*bvVabU-#-<V7GSWFO9fKs0z8-d2)sIP|<XM`Rot)DKcXTUuytwMa
z4-G%`W1so97o>mkqc1#h{EX>a1ytJ52T#B7n(CMT=`A1rV)!Tj`)3CAO|^Q7A$fu&
zz}T=S=ImTe0y>R|qbG9$M~h&D$;Q6F1`xOEr<F?+V96Y?oY+7xxf~eQsg82DI;Q!h
z;Zi>?EX6^EL8Yoz72UBupD35@Bd+Zj)1s@r_jeFvlYleQbGFJouwF|RY``(9QI<z5
z=M!3)U_i=oJ+iLr1kub!ZRs-E_n3l-D|>M?8?EWP-t-2QkupbOCQd>Fs1hU!MwbH+
z%tn4O->Z{ta#@jZN`d)as*c58=#~D=t;Yx7`|UTq?C!hEv{;4(@+=152thCqLUI5u
zlCWj~Ja?R+8BOj<2FeIC1Or8r5*gqf$5hn*L4DxlT=zpC|MGu+?<c=?=Bv&_j(yR)
z3D5J{GKooW_YeX>7i`pUl}%Fom@vY|`EFDizv|6<0Abr|l=p1)z~(I(x$L@X@Ssd%
zr&A{Gtc?JAVd}=edL;hPkACirubuwUzyG}1?gJ5nZYTAtzFGN-d-whB+u!^n|L_A3
zK613^9hK!oIkyoil4KSdC1WGs>Ih(I#8OQH$s2&T>|t%%+_w0tl}pxxm3v-^4#b3*
z<U&js)~aLd_v6waEe+CAzaG{Nx=Jl2!^MoTM%J;7tnAfqd*-afsH-D$|5~}PKds)j
z%(*c0*svVAXCIY>zy|kZWL1E!Ne}Tl?ZeE*(ZHM=A21Oh%m7Yu5Snb_G2vO-J%^Q=
z{B2G&)}sIh#_2HFU(W3-PQU5pH^21W69=cRJ~%Z9I@L{&8dAX|B{v_%-0}kV>~V8>
zKCDMrlbHt7lZ%N^LO{`rHWR}k>s<ZbKYZ{HKJ@V8PYo9Oy?!-4^eGQ_Mij0BG$)Xo
zDhtM@<28J_gm7Fvt!46XjlzNrCskvyaQS~)Ihq%!*&kQA4@b8NUv|6^fQ@Q41v?v6
zh2!u0v&Bz-{=+}_uikRSzE5y4D8W*g*3jz*{_Veb@vr~(H{bCeA5XYCVIUAXm^0ys
z(D?T9?2{G@u-x4;SHa3%@*EK!ujJ-VWa2isOt&5++0$@J8>?xh0a!6gE&)-9Ny%Bq
z6qBEw@7GcNVH^y7X^;lPn4Br6YEGoIPxd^XTvDr6*otni8@#>)Z_T>bz09D})`tUQ
zm*IpeT}A)ejF@xO+=%1+9-6uPx<?}}i_YphQ+b=Os8yYecd&Zb-ro2aXLAGrLI}Y<
zw*Xe-kOBc_7Vn9BUAG}_6Qdc|^sjIf<hGv{NWz+kjxvnV>f*F@2Z$>jCaciX#8NcM
zgh+QnC0S@_X)dH^UU1{V*T3wB7u<N=@q?J@EXLuNiXga$z}$d3JFCFZ_(6zFLgDfZ
zUPk<%xiZgDm=m;FgaZsmAAd6a$tNEB+#_Fm`0)pxIbALeOW2{Pp4bCR7+i37hw_)(
z*sD9S`Wrf`T-&EysyPnTHhB@_tgGgq8Qw~xe$C5i6&bhX#x@+8tn2kN=H93^ZT{Be
z+o4lb?v8`LaNw;!@Spz0PrmSVFJFrFVi&0UzOSgKx=;Sy?>ijA@c(_==Zo1B(K|pC
z5Ugm@`$o1L*buS8kWD*DqRUer(@|H!Cfi}ec6N>ms`2>P21;!0sIK~+bB^%l*Ii@P
z*ksk$*0od1c68YRtPxM>pi0S^eN=;Cz1Xjlb8!%d)ri17CLiZ-P9DtU+LZQHsaNB_
zT(vqkYPP!bBlB{x8^#1<TQNv|l=_y{<M<@Nn)C&Z6Cc!Mrev#|<0fY#^|pN8FBd=X
zQXkSy9zi>RWm2O|cW^V=Yq*~4QRCDoHb;TG(~OWDw8l%t6%e5L3fpv!MxnF`fF+1<
zrSZC;*{IfVYd~`Z0arGAW`jva5vcr~^i&$BiWJhqzT)(qH_X2L-fLfW*GrCc7cqD`
z=rm%ad$7EqrJU^U6lA2UNg|&}*va=y85KAb5V~$NgLL4Tx#FS67XJK`Pki>lPd)xL
zis`Fr97()p7)6??sVek|vzZeBm*mFfd&{fBRxcILAUKC{n_t#xPT$;rgR{-@0NR>d
z)kY7DU%vqRP_8M_6XO!P`wqYQfBdOW|BHWm!|Pvhi0Mp+f~rt29kj(C{(+mHdfMOf
z$4iF&9tN-}LrIz~=LiPCY^-D;QJz5-qD!E=$I)I)E@j6b!OiU%j?NKj`FCPt{_D}}
z+``$xO@Y)Vs%8fVT<iC`+yK_ug-Sq5J{Z<9v5Kl|^@nj-)m20lQ=Jf#l8^*5Bh%zk
zST<fKboVHobK<S+QD3#(*UJ=WWh+o%MW*c7)gh5I(QKJsa_tV+$k6s&s33VxJCzc~
zNfOlRi(UGYwcG1$C3WXE=htkNbI~V!mJP9{T+R?eO3BQm)Xe4tz&aPETK}k+@F$PE
z2T#KCk(X@c(`|Gm$<eS7K(M3|lrfnw>K)AhOqVtBjbpRCYCpc~_4nO<OEKl&n6bsK
z9tukiB+?xsnQ~Vj$VJOXl{-dxJvmHjX2@CVU}DFuH?V_q{qh?p@u|;#<M%%Jr_Y?-
z7sD~<)s7RIje`Uy<ghTNVsB2>oKb4DmGLueYSe7FH#Kr#H0XOd4|Q$H+%i0F8jh`C
zs9$~Rb1fz~Pp))=!BJJJ&sJskz|H^c|9*J((DU!V&5TQ>yn~9VO8syC;~%}}D_{Qj
zBTs~3U_xQm4KkV;%@9ay@~|3=1xRl0@|Yr!9G*A?lv15BnG5489WF1{705{#m20ka
zpF-SFjgDI0>RjkbBQs|QIB8p-y0o-w3j?<bu;vzOcaO<qQXMs@QdP^H!%9i06YALH
z8FIar4ccI#tQ)9kGq-ldjv1?J5p>89ywQRLjWj8kK{+jYtzM@xjV$TzPL3;%D9_Xz
zKFTgx(UYZ>UD7h^o|G#hxrC{SePI<U8W-J-zGPdwYK<2ev<7qg%I%$b!MTOUC4JnA
zR6vc6F`B0UH>Cn~2g3tpy#4y#_kHI**B^~#eX@hElqnWSmL!B401_d~tXDakNra2W
z(Ge$-jwF~sr*&rz4l4|OW}%vX>}&Dgz5Sz4ot~K=9H@Dq)_t)sS&%|*S?D=?jVsKD
z2_t294v$<c<bZ{+LPL%Mv6JJUQd)+}F8T`3)y1TZs>Z`ciT!y*bZ+>m|Lrrs^UgO_
z{m++LAT6*cu@K@zKlu~){P2%GRO5!Cm<iSi2*C<67z06LhFKWd3`!|FybSIhqiVCl
zy(Y~)QBF^y=Tvvg0bpB$JD2VHmEd(#HOejT@$*A=b7@iPv;;s~1z2YmsuaEU<gPlY
zj;d>UVss_RMfaRBY7;4tE^wmuSR1U#z19)D^eus1c>W;f&b=luqbtya!b0wa%ZYN%
zQHBi?CCM!~l%zn4Ow!1q1p~a@L>IvRqyQU7aVOKO8c$QsN5&4&)q00#jv9{xc^f_$
zH+#z(f+>hlm;KTe6cZK?p#Q>K_P^y#cOE}@YPLArOHX(ELqkQYp#mW2&c4%uB3MXc
z(gR21h|TMkh)NbZ&O%`-g_%k-4}GnE--jN0=&SW(kLzqT6YbW7u3MR4o_WCBNpVbH
zqOs3oIpo9%+_|;f<kgP&$zXmS$?Rz4s4@47Jh*Xeam;H2Kn>G7gdDlwac<w<EX#&;
zO@Ne=g?{R)I`I#F{QbZDv#*JR&ruPeG4;a2^~aa~)?1GK;;%ow|G-hRuEB~>8iR#E
znOQIf5-~*!0a8lt9#g7io>W(9=&YkEXG*EcX$&wzQO?z5s+%1L+yWBNq`A7$aOu1p
zD!imBiE=4NtM|_hu+A>jNs>^<l#;uUoXM5EX?p4oFf&@^tjwml#)M015_>H(#H_7g
z+k;bWEw;1Ec(#^PhR2Z?a|7Wj%#1W3kS3H2S%U{P2Mb5}&?1r)GiwmwQ0-}wF^Oa*
z=+_FD<z)}HcC0UUan-5GUT-q6d}NB}s8e%(k4YFtTu)nad~PJpoN&w$1%Z|?(eMyy
zGABz|?&mUULmEV*Qh^vSgcg0U^t@}zx4iP`i*BDfJUz7PE2YF3p%maE;Uy_q&a&z<
zU#!VVV{VQ}3jmVj$yF3JieWXynX4aotpA4}{puILGWg<S3n~sO97*h^P$s&h<Pm1M
zKO+pem*6;EdQwSo4Ts;v0BSV;>wA#3I*>TZ^rvi;bVMR^w~i3(>fCB;lJc7zO2{);
z7renTSe@A|ZNO*6^`V2Ut2}nP$l0h|`p~0c`k}{W|LoKAue@_QD8UPe#uV#szWLiv
z{O0eS>Xbd>ObA7=5Uc=<Fj{~NP%!04Um4(@JSB%GugIn76;;Y=XHokwc_k&6+(twh
z>(I1q!f2|EABXD&26oL+eI9+{=UY{>EiB(6z*^|LpyVzwIde^Ta=McH$i~w+X+8gv
z=|gh|ds~qZvU;s>FPGgWo9BXW3GMEuve9hWoD;_AHuv`}%m^=t0t{dPI%F>CFPhLw
zc5VSclkGyd<V2EcLjt^^WMs<PeZ+gMrs16~YnJ6_50akkU}UT@PJ+vQUSL5agORil
z=uLvo_`uDnNSlJj)m09YG?-1~g&GkYSZ<7$yYe(~ArRv&Pf|{ffR{Wcb0gJ-s;<x9
zdbqmly6$(q_VyD;fc`1?Nn4BtFUIwWnR}Ba%PskAl5n9Rs3&NaBnCP=p?CP{h4Ao`
z@zW12eelB{dS<?h@<`$pK6N}NqbCmua5?GLIH-z-YzdxYON|B_(_D^n%ySJv_AO~O
zWU-B=I=3-w#*?GcLIMmlqcy?6T*pAm$^IIZeU4{56F`6&L^@2A<P??3AbiwI$Ftwe
z#<AGZp5&OJb;Y(cZsyn7F6hrUZv-5Ph!B$)apFB6eC(C?-r`jiY>EzQP;hX=)%EjE
zOn>8KVVn(CgisJh<|aZ-8kWOJx)SB0WbW?CI%J5dVjL#Lh#_FXij;<R)9^4;y>f#M
zs11PBC5>h-+So}eTL4&#gL*R015L^*edNy0;qV*<&so$o^O4=WhWL5chhCdzn_k$N
z-rRZ29X-*8r=)o{9U7ox#!N?9$PMg<5WrF_$$~6sfe2uUob#@XopW=t2zQ9VDk-{(
zzy#E;B7~uPB+We{yW}+*=oLghmuU?Cf<05_V+1nYq6Erl7TgSA*FtH<&^?tjp~#Np
zroL>8zK4x0Q3N2sYAMBBOPG0TspV5zBol%&7-FECI~eFGidKY<#lz*?&9i6!&KsV0
z_lfDnxHMCoF8WnqEk!{App$`~NlgJTSp#w4NJfJKq3m#tFe`g1yQc?y?8)$_pPv8y
z4?jHbhZOcpH~Um@n8p>&%Drk}C>sCya<<xtz<pFJI~ua=GSkM$TH1I$5bjO&bn^%x
zEijFunKZ&+Av7+lF!Gj-QzFMaV<HTM8zCno%Z84SkRTg3ku*Y?lmcVj+kg#@66TuQ
z8}ZX}wW{GxH-(Q=K@2R@G+>lhq4?uJn;#CZF7brZK{r+|_0K-_U2nSg?Z0WRsbEDJ
z3LubyG-fss(BV1WNM#E@Dkv#|3|^Q*orW|JjBYXyaCoiJ7_0}THd^N`8ffLh0j%ib
z0$1m_{#g?6|FidIv6iLhdEWbe-@n!#&QR5-hMw7MHrY)!2XPW9$&4kzqGiKy1O-ME
zB|rcJF>;~HAU8s;eBsD94qza;5^M($0tL1L$BH34k!;hlM2dq%Hr1SZV6(f~-Bn%F
zsXD{nYyJQC=Hg##pHpL3bvM~X@+=fkRi{p!z4sda{~O-#c^y{UM9x*i0;`36Sl@!H
zoGeBb-%m`i%pcDGI;`&)R^_U-B0ZF7tyv2;LIX}{3Dy`5O5)U<k^zFzEohQ57zmm5
z!cxlc06J496QdJ)WrL_FWI2Fo{n!UscR}slXtV%e4jSC(4PdlnEHTEpew)ag>bQ4P
zwc>!5by^=NQG-0L*xF;cM1my+kb}%fH1mi=KQ-CEuYK)TfBt<x^MUtF^7#q((7(2B
zy_bU8(<BDYo|%bG7Eo3loHSrl8MH_=rY4YzZ=C1Wi|3l(`MocG{n_2lw)Ugx`Tmj`
z)_(Y*CqhsyNQoeV*EP%P3FB%=lQInFu&PJ~L+CqsNJpS+B{tFAL7Dro!@FDKumKmq
zWONf$=M;4?!3IeY0a1mjjrk&&nCo}DLI9OzG(@bp@s-z5E7Elq_^?DnJY1c;&6@ff
zFG3nh<{}&*&5E$SxADTuyH7qWpsPV_a!k;@|2<o?mZ438jW=eAmL$5@?4T;mWFDpD
zy0aAJ64}6_CVA^Q^(9$J!!)V_#)up@PEe0lqod=l46s70t&;`|h0*G)hGCFvYS4lV
zA`J}AUgA|<Bi;~|#;Yw0uleE+xk!Mkd2Vm<ZM-2~_16FKhG*%9+n|jJ^$5NmMg<ei
z4O6oj*@8)E$q8*@o=9W;Yckb~Cyh;zEESX>dtpIksDQn38L=c)GH6m1p@z)H9}@ze
zZtm}Nvk&+~y;n83I1h3;bI?|ff}qvFhi~+W4h}mciNAhNvV#GYffVmaD#I35#nu4e
z1PnomFv#ZKt>st#+LI?f`-ywsed^Sj@1uXltwe|vOJ`nVpYdJ8XcgMP5n!rO_vHaM
zCMfO1{ogsi_D}xh7r*oJa~JnhvEzjg=U^~{#%g<`Yh9BM%b~6rkt7i^a-iXdwCZi*
zEzs)g{W2Kp*@{12dxK<hB&VS;+$>Dq$UF_EF?IlRQi!FL9AGdE0Wp|^i7W%*LW1mI
z!jq$-{*a?z?XJd6@*f@g{mnRVaI6V(EO`#+Rsbb8_!$5IAOJ~3K~yoFK5*{hetB1q
zfDaQj#Te?lHXSRP8_g}%;by=L6b6N7js6?+p#Ud0I$(jEqH|BFv|XPd1u`H+C((gW
zsQ~!vKhE2-u;1m&*P8|=-;AyLCibi&Uf1mgShe%SF_|+1R2;02?+{hhT!{z1okCPd
zTwPy=ROx^qhZ_b}Hw?CJYoB;KcD_2%v%=Hd&MUql#ryh~IMivq>4tsHsThX)Zu0PO
zwWbR;gt4UHv_xxxx%m{Fk&Us1O)Vv%H9FbACU9e&N|Odb3Nj)~0(+vRcZwd?6Gl=|
z=yh)`wIGj*J{!SE;}Xw1To>N9vf)i>OmDpU+=AeI{XgM{0#?@5g9Ibg%pfzm!Ohyp
zMUa_k(0{*iTzFNCb+c<V{)^LU)DG18QUNQ3$__SGCL-qf{BfNBwa<R^=ic*)Q_YU$
zvu*ShBCIgLB4oAegF2czlHL{OE<`W}F_r){U71YQAAaij-GBR)m%sF_ue`Q9S^8$+
zfoLs9uWCm_JBS=^-bG(6Q$yh@bU@TS#3j-po&NPB&{zG$n}((iN(h<@bayj?#>T)J
zCzv&s8qx$exYd(lZm5PZ^<_gqqYO&Q1ybpH<y86z7DQ<5ghgGCW1tDL;<XevpgB~u
zDM%PWjpmhd9CB8^6NiXHl05?iQMH0a0m(P7T-hT7=7tCe5tO^n+$P2;MW@rPhR6_r
zz^Lcvfh;AYLK$SiWR}zuMkENK{vf<W1fUZ6hH(QA8I9ag*7Vi@Z$Oa0or~TU@1tA)
zkT=}6Zjs^Nkal~+HROix;hN>~h&X?{0hSFU<Wb@|Sg8hKsSXW~E?+fMtBH_6DQcOw
z;+V$O>MAd^JG$6!<BoNUpLR#i)3^Vw4!`KFDRbAa2#4dp8!q(qAux*LG<QR5z!`l)
z%wRLKDQyy*x=&yY(V8V7!KUW5f@K7TXc{@97hu+h7E(v+$R%kg2xN)~0of>7Aqf>J
z1`iO^$PeJ{otd}D>%XJG>t<K~W?z59fb0hyUD*MIS~QnHIN)YAx@saz0juz*LuiIW
z;D%eiNgXb1=sI-uz%5_>m81cMk&~q&Lpas2o0dx-fA{(?ed4i?Kk|WjoJV&iiIETo
z+ghzs1j1=Gs%NOwC?rr9l`1=m!ugKf`_e^z{n<<Z@k?L$)~m5Ud3UFi;m9aCSP)EY
z9kCmA35KB=b^{zAIf|(Qqn;deG*KoBNp?UfWr6L0LEf@&c5|VmS!GDjY;f?Q)7d6Z
zE;7vMDK)LbB&Sj;<_WpZ7Xk;ag(2i@%V<kL5z*w_WlhvAbCg1$<UsDZT&z)~g;W9Y
zRIDsDpt8DCjV2I5d7^n#K01*H)H6eO#@MRHgsQO*X_7^okQ04kX@cc!nk1Phg(2WD
z%)kF?G-<uaO;*K)LsCW%F2E!yhDjVj3?Z>N;DMm};*ywIoNcl!NK#QqWyA(W++=Ne
z!$tmjC%3n_M!j9D+%<{!9j!=j<vkpJ-P`#gM-{Bw4zK`I)L|S`R64TPks;Q8M94^5
z8B#(jqE>-QMAcHnfwCZUpx1e4uE9HU?QcJBdlTC{Mg>IO!IIDhC+1W7oS4C;;G8~n
zn}Ab#OHN?Pkid4R&X2+cnSerMCV(AclG^<!`+|>Yel`pqtP-hSh(R(N<Jc1K+RJhK
zG5y_e9E{%&P*~8CU}niZC2!qQxJ3pv)GncN*oW$kKi5^L(3{PaRUk`{<`oz~(tXyj
zT>k#)dH=D;j{n-vfBfCki(GuaS%g{bEZ3yVhNz5im56YkAiz|kof0ab8C$_1^|rPj
zo6o$0fAoL+$qPFh`#iq1hstCoOfa3>bZX6HcK>}niIiq*8*7`#1i%<Eyu<55N(#uO
z+gqrVs?QH<seWr>FMa+$&X&7EMZ+_~l-gbRd;i8SFPoW#7kb>u-C|VfbM8Ax2<<QS
zCzDBu0_ELHukY?%S)V5B7l^K%D0zlOqy|POQnJBdTY*w4ZM@7jbmBv4vJQfwl6!+S
z)*uum3qj;#uYd3RU;4axMA%4ZfdVlOqF8Mu(+jPG<zz@LCNrPT1n0&Er!zK_we?Mj
zx})cJ5Ezu&wocGJq3{3se`<=kwGA)bb9{y(bEjxh$lz;#`Hdd7X-Wo;ueYjwTTRny
zy>lop(ja+q6&J(8N$-Z4fdC3}$SckwNJN3q+jSOgZ*G-%>x;wNzP!Bk5B28i5l4~J
z4<Nv*HDAC;3mMeVKsi($BtRBKsc{r)%q7WsDF{^*Gyqkm4gxouq&+&`(j!N~K_?Q}
zfK5T`oRDjl=H@fm1elpO;LObw4Q%R(kPUcItEpy@WfYMetc#M|SxN;hLso!<!6%O)
zbCjaM0GmB34gUb@Se5Z@0%=CLr^c*tZ`~W3DeCa9i6YDnxvk%R&U%Zg{^)rKC!r|F
z6ZQ8HX}SG({>J-1^Thh`{K`6?ZMv?`*P}Wli-Wl#N2pZIu_DZ?*&^IZMiewlHQ`&A
z_L~3gcR%;F@3-6juFLULv35*Nqc&|m_{i4#Ka{pk?!gygCTS_aC2T>Kp;-xlH=U%B
z24KZdMw6@eE9bTRT!tA{p$bJ@7Q;jD+I#S^OGwZpFwrfB0B(d<G6;zJa-{VLfGOE*
zxo^f+^1WSLId}Q>XWMdq;=Qq-B!?$+H-jM{lN?1o(`C%dy&v4iOj48*B_}sGQ;D`s
zrDVt6>tFrSY+|J^KvG0)&%uNM1bNCC;b|$u#+Kdx&;w6A*>0WO^>&A8DFxlkif|e9
z)ZXFk8IH!nK?EX|rM>*kz5TK|S;J(aa%pWgH6}@oHzgRQT;4nWwWqpfZBDL$WGe@t
zVGMfgauXwMEEE)M@GG?1ceTuMph_hoS(ZvyikT}yC`SRok77OICn&&bBqtNekQ<yx
zWR17dNZcWrLvW7@zmkFoA`ux3A;`WCnAC>hAUVAj33r&7dvsNAd;48QS8~FEmfnI>
z+LSgiPT({1HKsW^0Vd$oY(ge_Lu>13IJL5V7MK-<R)C4yzGM{0rn=OU#oVMo6iTKX
z#Q=&%l%vb>gNm^<$fOB3cXy+^H}0)@g1M)*ARFQCe6v~mL5#IBlpZu#6bccg>^sXe
zzy86K`mcZC1MffiK+|1F`>!;O3=v?MLB(haF-Uq<YXwJZC4%Z}6FI}BwWV+F;neT^
z%Rl+cS6+Gg;#N#PyzpN0*;4mxedK5EdE%!or}bq@XDyf7-a;*n+h`X^4R9>e0Lr>f
zZzqtd05_5W^$0Vaf8ix`Ik#%6$Q>%l4DEwI^@(k?MJ>@3rqO=o>MO!Q%yfOgkq0X&
z9DD<fg<(d712$cotliJ8`@5YNeDCZuE(!aIY!VIG1PGx3EJr(=pS~Dv!31D<FsW)E
zBWV!<wwrlxxw}7s2dhSw5n+%Z2|cXKrupXdk;m?T{K@{lhj-HKd}d(is0K>~kJV5m
z?(i8VJS%`)OHY$1m!5xSGO1HE?)Lh<r{2}D5j+=LmfWQEZ$9_HWbJWqG89>zSG6U1
zZ4Gr$cESdKkQxiaolWD4kfUonB85~6!ci0wRZ6T-VYjN>9vw%=I~8EHgh36Ms5;*7
zfKe2TNba>N3%3|%YY{*g1MCAiBFJ7ep%4Wq2nNLvM&{p*e1eZ+tlO<^jC1w|B(Ncq
z)S5NIgq&zlU(Fj|gUwi5gqqNtO2L*@x^mT-FJ3u;$e=q@6f-y!29YI9CCdy*Qpr#s
zDvDZ7E`$8{=<2;qaTQ5A0GOGXF}WpUGB#$7v4tm@F*!>a+Qcz%j^4l&{2J}*A&+pg
zm8r0a0WblR*gsLueCA!V|NLW*zh|?|({>m8-eiYW+PKw<)nE%aECv!OnO785mC`87
zv#)o}iNAPh`G<dg=1bpvW{DHoj>TlMz0=#{A3O2EPsY6u^wW)3X))9=(tri^G-!u_
zB3Y$+LW;1#n%n>xDV4*qQLHQ)Rodw9b$$1nPp>D>>|r$~qToxmJa%fy7H}7Zs8bwc
z%rv?`56(JQ^GUR_8XjxHRUTRUeoO%bkq}+<Y}R?=gW7yRi&tm;8H;Uam)KNBa}fk5
z<}uwYj0zVW&{hIXP!Yq8vkMn@l?UUUkkzS7vMaIh1fSmj>7Td9p1ho<`)QVQShfNN
zt@;FcpoK+=8irO8oACfcABvGDJtSc|<bxuhrqdviW2(6D+DpeB@-oBn!;f#=bKJN?
zDa^f;G@U>CZ~nbyKW+ty*JX;gSm-#u^pFe?azk=&n>0f~iIPj_(HFQ|%DEpcLvCT?
zbaWgY?`VLPfQC$phHR;Z^fA+ItS*=^QiuXcC={&9-c{T)lz~3f5uHR@mFpA$3fW3U
zI~3fHqN_WsI)EXPuAz@(Vq-p`Pt9g#bEX+>N>34uCkGNRp*K*1C7^*xg~N_I1iS_q
zou$~IPB!HNpopQ!wK@T1m0rp~p#`**N|jL@UB9=fGD+I1KUndUq?;v2<K8%vrNoqA
z62mMU@S5h2Zg;Es)9a7J-NV|w8x(Y^nD8PpMG9LsT0EQ<4<Eny$^YuH$2Ky%i>`vu
z#2`7SfJ{}FS;yD197O?2w5A3HW-@D1+eduw^4gc4ZU4pRo_T3+g0v>i7uh0h=7%0X
z`KeF$$4~57ifBa3^_Db3w2%pnN`wq$Ac0n0G+C!;&H6=2Ia+l^NyW;j@ENQ#g)pLT
zbos^SaQPyW3?US$HF%DK)A#Jp){#l`0*is|1X7cTC4Hi0>sE<mL9aD?Rm(89+6t9a
zN{N6hWkv|8BJjs#GRy;3VEcZ5o*m0Ro0spT=z>;R?+SIYV)tC0yt|WEgI98#AgYiY
zU{bp7`KQ;da>Xj204*S~v-#xlj~)A&|Ljsb-_N2Y1_d|3EGMO+G`w3^i2}mN<RYRq
zGbkb|ECMw?9vcu=6T12)LL~sOO>U8wXI`0f6IalfxcKZZzOQtzHKIl7<5IH6{`k*M
zo;iCu`4$~97#LnNb{u1cX(bGW+km4tQm}|zM<EF_n!)RH0ZXFMOaU4xii`-tM#K7}
z3f9qaHw9R8(iI76iN=`fJTFm~7o)Alb_B{0U{u1W6o8{R%@ZwP#txvE6$lh^@HNm?
zdEilt@Q%YQkWeyrprN<432jE3nNMMJPiwR}ZE9$P?TY6vB%oP&*cn%ZzPcx;WCcp1
zO3<vrt`rs!>ACb1TCd2k9+AL|Vbjx5hWOUvs>4=jLkWsBIGN0nS?k`~@aJTyQ6-M5
zPP&h*^&tf3?aZRrs92SY6-G3srBGTdPw&0($l|$scb{25eaWJ;MNV~_A3FXT28b(N
z9;nO)<}g|b!P!~kM)zhH^A|23|GhuE@VT$P<kJ(o%ahsKWf;?JG2dMOg};9Mq4(^h
zCQ?&!5xsJ$LM6$XkfZ0~!aeF1ufBfq)mPaqtaSZy7wVuek?@Qr=vv=8{R@BVVu4wu
zaYDuc>4y-?8q4<c-)j3^OI@I#u3KbgI`y-EWtU!%Y-M^lhH^_1$u=)-zxp5k4J^>@
zqHfy?gy04yPB)v@t!+;{`efcby~l)UThhczH4+L9$)rUkKhc)99+QU`-MP7z#tufO
zMM2SIVOvXI6HJx`)*c`SK9^IaUG6N-eSbZbC=3~eUfQ#EQD(<K`?t&ek8OLB%#6d3
zsaau!I8*7ZpQW^3g1c9+x0CuD`#byF=gMNg^vj~Ugd-G1Wf%zuRbgvZUATZ8D0HR_
zXYO}jeqkfR+QuWV*^8h4@MC%T4ZuKnnuG8CzyI}Gqz4RPwAu&dO~aklV9>#DiXdU0
zLg7LP2~oT)%ofR0W5p3BRfIzZi35tq(XMiI++_jQ)aYVEOGKg)kZc%%wQ5JlLCPAc
z1HmIUfL<UUzySlqG9qYhu<SC~sL(pP@!wi}Rj1Aa$<3rB4Oc4EP_5KJGvgF!5i?p#
zCa9q$z(>*}#v<Zq#HJz!X)2<Vq9MWyBa?mf4K1m-&=^xNi3t`az;bQY99@~W8epx0
zA2)NOxu;YMS4=6j=E=+tS?65~#;hXu8#W3Le{m)7iYmyn40UU{JGuMHeS3d--~Ovx
zd3##6O&Lh$3}{HBu)><sh)|_P$iPICXr6jZyOOVH^Bb?O|L_0L*S5>%*}c@+y|yq~
z(}O+NaL>b!{pzosHNQxN#AObk5I{JA+)v!r``x{#pSt`PU%ZTcltSeRVd~dLGfhdL
zceLDF|Kz4-t_~IWc^IY%!XhSnJC|R2Y28#1fQhZMgbLc@v9_@=6HF@^)ll2DOstXT
zzV@Z&rDx_TvX{fRxg>fMc#RIGboTqtbL-w?k3Dhx(T`nZ%C3;gSg;@bnnOU&O0tc8
zKNj3>tjHiHLsFS8bYG|u6Of4*JZ>;Jw5Oc&>(52MW9kDL^hA`B7n9>#zw|51hu*iS
zgNU^N2uZadXAP3L*owXWYu`Ncjj!YKMRZFzpi<9ya&oYIbN~%Bx}PzmYM!V-RrEL3
zRI@Y_?}4S%(0o$%Kl<LwTkY8?nY*Rf?04_`C%;?HFW$A6+l{2bh4D@o{{u%z4h>it
zU<?|~;f*(;7K|>JuoM!Gq@hR0T^nFch(snR0f{itB`8vz#;J;j&;f%c#L*ts1$T2*
z+6xSF+A_jO1O=HG9MlazQB|uq{IGXoZ7+j4=`@C_>qJ8~wAw42&|1<JjX0q-(!|)1
z2_#^HP4mhWWvt2z)z`Ul&}uiJhZ-nJ6Z3`S$PL*`UQ^V{csS%D`$HcWy}^0ClQVf&
z-5X=tUNHwSj<jpCj-9xBq9xJmw+-Jxj`E<PMs+h3&{ZzbgLsOKw3&BK?Ywki=Y<n{
zFCHsrH_DP!Au`<{zZP*e3<wutNVK2=36^czH(O`>jo<lqPk-sVXD)QJrJtm&!Gj@)
zIjr}!=@TE_`1CKns;1Jry~>k~5S%fw;<2Bf{>E!x{d~K3WtOv122z;{B2cY>htNrg
z+{ecH6CYm|H>uz-&8pI3qD9e#bGCOSnYyaS2Wcu~b8L(28!<@buWFz|(Ll{|vHR+a
z$FScNKxw5#8qA+5SSHQT&6x9*<@u+#*VA!6^xmLnj2M#`8nGrD=$VY(rfO!5FQtGr
zC{{4v&+C92s*ho9L{`aVFgS^>KmX#fjTSrA_}hY5aK81?pWD0ly+umu0Tw3I<+;Lk
zfFRa(uU!5Qf1p=inCGQM06-DU1_@mixhWLYd%2QO1<+UFe^t>FG7}jvSc1>!jj=sG
z)BpGzpK0QYMZq-fc=Flrz3WR)oo+WDZc8PK)}Gy+k(maQ$I$?ssw-b2-QdZaE*n4v
zAv>fhyzwHSo4Z8uM{U=5!-ekZZ}<Uy#G~fZ9R^qpqBSN}&sVXoZf2`=5Qj(eCAZNp
zRSL>v6`E7CE=D13ITo~3Egr}i-Q*8@>)eGU5MF(=9{wWl@aM!WzoD)=@kT#{qc2WH
zC^ViNav;GPvcd3cLYtbmWD{!17IMKkEV`o|_aIJ>A-H0-v?C1>t-GLNTmloR7iR7q
zQg7-*O`s(*JQQ`%D+ZU_!4+6<@YLVYxxcgHcFyG8bR3R`xDuLFf(B`B?v~8lJ-Ihv
zf~Vns4)cRXI|#6D+#eiT`eCwxqGCu<j(3+%?Y?~9-uKq8eD9uoVOFjr6QK+QSqO)`
z8V^e#GYkNSj!}RSisX^4JwJKZ^XKDV{lPb$esTY@pW2CIU1XyHSzs|sNDG_Z^YNce
zANka!b_$s(Jb+4JfB+d{y4a0ppStqLf4G5+D5YM~!TUukd-CB^RczAQ+I;KuZXXU-
zCskIP0ul;G%%fcT`d3>Pi{cDIg*hvAeH{PvXZm)^o-22qx}J%YqE*@2zi{co*=XDS
z5(YcGUzu5uuqu?GQw@<CoO|voTkm;dUkN3z?qmWrvQtHjL5=5>;FiRotdDj_>tS<@
zaw~;=bjd&!fGsc2@~$gen=H^}^dW4WYTx(d6@`TZX^_TIgP08kzyy8wmtWDVFHFip
zDB%^u;gl&f*2JS?4l$5iLqp;W)5z~1h&<KF6jtN>WHW5vxAn~Cv7Tkw^~gH@;_Dy$
zt^ei1Z2jk0Y@QAZS9i3?OQZUJIFAHm<_()1$>a>s+&H>uYZV3ZhND#WX4mJpbx*n7
zER<Kv)9!Skt2b-BeOn=KzBudZi_5F^KS#%*3YJ*|IOG*8sug4bE5EK73Kzp;S9!@?
zQI*XYg+`N@%pxeO;~>K{Gb<a%?(*PQ*G1_%^jF<-gTK?`cJ%&Hg{G?)l2J&s#w?Mo
zSpzoa6Y~T%usRAlAhc_mS})O6mam7QKUH4>H@cW2T+z~6`czm(PPC*!Slx_&t`k!{
z1O?X*AZ)tRpT?Uoi|*FD%vK}*V_AyH-D!Z6!!N+i9cEF5@G;2X6-K+NSaqX3GXOS$
z0=3EJW&6bbtH;iK``(?Gx5@>x-4<aKE6^N4!E5oPQqKuVj5^y@Xw|O4<nvb+%{R~L
zUwr<lZ@s#R$-N!!RUx6K>cK-n^fahVkG!}2$R{r}vjVyVIKgZzfJG+qaqlnv`JeV*
z`@*rt`W^{#aBxtm{X63!$=|>#x6@ngWU|{^jJKXui8ug-OOt+)FP>XR7{Vi95hx3^
zv9ZNd5AJlutyK(<Ud{aKPMy%b`sF`%l;R$>O?qG(vZBMAsxg8!G<WFOI=kFw^E3#>
zhiV(3!XRi+i1Rj@G_(-i8*#qdoeG#N2ffB_V=l)C^y;v8-j;jD0x}FF3V~xMt{@pz
z1Xxps_H7Wu3=$D0b(b!cSS+-hx>pYyDF{zyVjaemX++8oXavQ<<m3>(Th*t_Es_}%
z)Tp=pXMf}Gy({z*8E8*ly7IBV|64B|JMrtKCo5HBh<^;X?a+Eqk;Q1exH7yck(jcX
zS!&$-OwtIrTPZYpMBI>m9OIm!-qELBceuXAxa086?<xF2yzRqg>VX@VOO9$>*Ho~O
z0H+yMpE^mb=n@VEk3%Jo3UjZ9^zcEXC3DLH4Tv&K!HBA^Q9ub*+}vG`G~<o7@j;}2
z^SdVArWd_Q4zU7>(aah%DhxD|K%ynEMn4WD&{_QoAt_dksJO-g_i%Crp{(Lb0&Vgp
zM*}+Of}xf+X;1<i^DNmo(SD?^dke8OtLac0(B$=+y0JEdS<#{-g9lbNgV*OFVatuT
zE&{R!P3!%-mRtK5*Ux@+^ZYkX=F3wRbC!tUFvggpfYnKv7Boe*C8-fTB~L(;_PPGr
zjz9lu{PrLG#p`@9^VD+E_NXHfv|7?pkdahcZ<h0|dw>437t=f=NpywCLJp{Pm9@O9
z?>yCi<BM}EeW|6FsFq#gN-9`&^;PwWpk<}`hd;KHEz=9ip#hpYgN8;07tZ3+x#UI4
z)sv9)AT}O*yuhPY<LcPQm~I3?g>^go&wP72g>r6&7hGBM)L7I2gVo_S%1~0md@HrH
zwnM-Vjp`0ho5`utsB3-Eq+&p!cVySBcRE>28mvA!qP3t3M2n^GotbzfQ<w$KsBl02
z&?DPET@L>t>H<|SnMfdtxQn#@z+=mopJ`fou8OcIh}xkr_ZUPQBpeDvI1DJHMYS;0
zkVUJ~9fA~HOez!gpZV$Z{>OUe-JL~qW%=a)^!J}%JN7GmiDVO+Gi(Ub$K~@*9}tqD
zL!wm8b_lcLjisfGFsFs3Qu@)R?Jn(X@l7R}Z=z@N_9nHwji`%1l$82MKEO((9l((X
zA?-NW#Hdd3<c$l57<3Vms<<bHK47&dWHAk5(pVXs{)ipI${6-8cr#KBt(@i{L&@o&
z1C4uicID`1ed9+#H!j<as~{1mL0gg~(1l@|sJ41Tqk-L_zT?qxhh0Jpyd{nW4~|Oq
z@ek(U;9WG7ysXwCV)Xk)iKq&9v#Sh1Ytbcv_w@a|JG*)I8~2`l`V`K1*>ffusUS*K
zH4QIc0}PM|kx<AbvbQLlEi~KD$N$ymzx%mocVFvfY9B8d1)ixoS4yO+VWP1FKrO^$
zfBlzt=BE|~gZUf)pb)`;^2GD{x$j;0i$9qycWJB?(SeyqRtK0vQZSMXDW{av+T`K)
zUXWX?>Q8lTsdcz)>c0QguS_gLod$GR3MdTrp7$1-n_s^rQ);Q{m2G&j=vh4}?7-!P
z;{!Ds6br`Gw%fwmiAS$2i%FSnP^Q9zD=jFfyphh#n?0bDDZmA$XLeJ^R;Z17q0ZcK
z><>Wma;4op)4F06W10)TALvty(reHvRrhLD<Jj>$`||ORY;CNa|98K?-zK0#=>VAx
z7@i8oB2iK6?qn1xtj?*HB81bW>V;++5&$*o7Te$bd;i@Nx%+P0oaW>s|M0h7%l27f
z+Mp4rI@&n|nbezNg$qy&0#T^Sfonoiy(WpPe&L8l{=+Ol936KMU|EE79MU=5NLoQc
zuMS%WwR*J<<(MB<F*VrI7(ufjir5H21}vZe^N;3TbvM*J2e}jJR_!N1pfwxh(6rj(
zA?QXaR%Q8Xr^$xi&!H-oFhUMlr9c#utU)AMBRI?8`Hi9AUI+d)RuA6U^YbGX;SB{5
zBdLh-O0EJUt<>lPfYc0T5)7pIKuXu}E#TFD#Uvn?rdpoR{yndK^}#bwpX|>|3wbuL
z7q?N+Y;Uxb92#GU!Qs1_6$jX{*+=ST5C7x;^UuDsy?Lfv+sE7+k5Ff67RymEKp+S+
zRZ4&_iu{Qub?T8tc31%-!~jq!PLf-h?_PT4-~YjU_e#@Db6J{l$O*4!M6}glOf_k)
z^6Shrd-&01LHN)-JRIh`n8?Xu7w2DVs4CzNQbGYR+q6^nF9+@QaN0FOMNKi6UVG{(
zM|dufimXOvimEa7u^eF)9hb!`%bXqs<5Wlh03ZNKL_t(}kjGAC7?HJVWvX(T)C8bB
zv)xm(*IVv_7DS=%=gB^fhi9l^xELBgNrlyW*=?@8JdOR-c*!Zc;$}te#k6~cvGAJs
zfI%uM25O+Df`W2xH+CQT;Pk(FXrs@zb7gIsP?izBqGv8r0d?idPU)A3(hB>RF7KQ@
zgY8R*Ak(Io$erj04V5ewfVq3^fB21$ZqC1()qeNP2mZlty;jnv(9D4rgVx?+=uq3C
z2lUQX2(2jkIsodDRG>ZulF9(1#o?mBkNo=ZW3$j59W}sOt+PUm4ipHBG5feacpcz9
z(!f!%ntqL8mYWrY(M(Fl9H5F-0MD4RbM)#M${_<#kawF%ZdGA;r@R#<nK^|7xKynK
z9dIE57HY{9N)#2eq3B_78w0784!V+{RmH#uvSAt>kPIGj6h`<#k7H0$RQ+8AP2<38
zgYS4|quVH1-(9QZ%8D%nz>VXb53@l8#cDcL^)WOOP+^5w6=Ow>#~{K=kcGmm(9B93
z%ln$;`ip;d?3pi|_Oh-;VqaJgG&Tl;rD7VP+5ybrGQsHp!>lu8pP-q4_w4>Z{ld9#
zpFO|J)4SLxjWy9J<iHFCN-H`-&}t#XqU1E`)5iUO<!_$rr`Z-&z5_-kOff~?S7U+l
z%y)e|yF3&`op~LLdjOb+69hm?8j2_(qz`;}0r!Y1Dbhg`CQ=kw(JL=wxwBG!dsvt+
zz1e#I&+etQK5UeCNrRgg$(V-Lm&=RKKIe^-4OGNRE~QMU(OP{5Bur8ch|~2Cd<u_!
zYzGsV0w(o96Eq<^;G$7$e(_}U+E%jzb*dCiazD~;Y}A&bS^X@A!Ra+A(8O}OJO|6A
z>vG>C<ZwuBzubNH+Yi3?LuY-Se6~~s9Yd>=v1+f9895WyY+h_5t#9t26lGN+Cm}Gp
z{pNutmu$3YYEoC$n@JmCySs}Qp56ZHA0|Z;Xsfw6ml1tYdhEWvzw?VbZp{~;dHf&#
z_GS7fTO4a_T8rJRQWBG@w&Xy(%G+P@R;i!{ahOWvoV$n;gXW$wfZ9Ssbamq{gMI|3
zjDI{9x}#$ZuoxPA9)?Mo!=coz6hdQxq>5w#Qs#t&hAD(h6v?4PEA^p2#A~1s2Gf{C
zAGE9QrbwOd^gTUxTeVV2sSZoY5*^ha_+TobR+Wa$g*<$v4liMcz9J(dWV9-{8BOoO
z!CV+NnA?`|;?c-bAvy2#)BYp3*3@yeVJD>--KvhfPM$jtoR`Pc$4Dv6OeRE7NM?d%
zD1hP<p`*}<ThZV9>eo-c_=V=m3n#p7awZF`%A<#R*N{p<W)zgEP=%cJON)J*lyu_j
z=lu7+eCEq9_1+%OoCK#?vKSC}Ljm;gIJkxwT*LxA_UIE`vzCjE>C@Q4p(&<KXv_1N
zFaF6yIfRj;uEQ6!pu#C?L#~KL=7M3qcI=_|>~wSv%A;W(Zm8;&3Hx(j`%1%LWK{ED
zXCEkGc=Yi_SR;TH76pnL%d+#f*?H-8FqP6T)d)?<LbArqETTv0r6MERd2AkUAAHQ;
z_la(PqQE*!0YVjtVqg|Zz|A$&`Q!G|v348m&76{Gz1DX7jcPtvRj%VS-w;($%e1(V
zmKP0KF@WO<FbXaE^8Abc{GXlvo4>ku>fw|vDfTO}wU*^78hV($6rl+9Vju;qW?Yp?
z-!$_G(FtO^gpy@pVf2kz`=NVIec=6z=fBlG_2tFu-)p@IO;T&!rKkSa-~4OyiT>&D
zZT|NE^~!wx6K$HXO@?IjYDF;gKMpEbcUr1H%y|nCh(Ht|B8nmuF-)jer)%i2zU9ZY
zt92Aq{ip_5P}CWvH_<G=stGkn+u?*DrzJ%-vC5&UlIBQ#(2<$ln|i=F_Loq(uVj_C
z1sFD}*Cm?kCfVUNgZ%_c)KF<9ctF$%Pz=j@=)ioiwvn`o@_vl0*rgxJr{UqGw9b?a
zTTu{RbN``lSUtFFlS^hO3fj={s@M}F$>QRyTzT}|i^pF2;<23<kD-UP7^lDLEIVPw
zp=?}Zp@>>DQ-d6AmcDgvY0r0S|Ll*x^};q5?dfiEZ-XTus87JSpIy63RPHy(AO%~}
z*B^gkH+Sw$k)sxhKuJY1<J8-8-+R6}c{)nh*^MgJwH!XyuZpqM5UMMuKJv-!5|$c8
zEtQO>feJG)&|Kcel}l3wS)UJt(EAj#Q+Dz`bk(vNfR9<pFpIO(_xt<1_T)#f+|6Dm
z{gS7q&Qc1<eJ=>}+5I1Q(q@}G)?Ugqn}Z%!X9j4X7-Vjwmi?5Mj@t{z)6UFl!L3L+
zrS)z(-_M(&GypvrgRf(4#33fJSdZ-#OQ4W2SWyWeQzDwuC6=?l|Iasn`meSRJ+hdu
zH9mDTK<ZT?EDl6%{YI^Mvyp;K_4?I1YW)t0B}&b+s$pYC6#7ot*m(StTaP|^?vH+d
z@#6E7D05x>&ENcmd+v#U@Q*M2>p$&m?L)H3sAR8;#V~hHNFk0B>2E_C#wrukXe4l;
z1+EtKSF0Y5j-%tQ39wWhR7RA_oo+KV*N%v>l{9R`4kd$xY)oVy<RD6wn^orfQCxoe
z#o<v{I}8j|{z8EYhT*Frr;}h7QR@@88%ETyDWEd8T{1#Ikun0c9Xz_*4u!@#QFW8)
z=%eWBwxg|8A8hE1)E-nNpAm+Dk!d!i8KO{>p_oj?ktgb`@PWP8?|b>H>#u+N`0`>x
z4s*BRju>eUq*0Y=zPhPsoiz!m;o?kl{5$s0|M$$!=f3dFY;t<PNnvdQ43)Sp)g7C+
zx<$iSM8LaK_hnCt?AC?~E9R0kDq_C_@bG))4?P6+H)L=dtLfrFRXaq2S*34hOT^H+
zJ8+V(R@1p@u=mWjJ(i4K14l*zvUuOeetM^e!^Lt~u47f?W5|K&2cC3%u&JsqiHaDy
zlvXTMsRp5Qxv(U$aYj;)C>_8`W)?EcGS=hrrk`2!vs2rd0?NfbmZfhjIokbh+Lv`R
z&#Dz@TbW1$@+fV-JnJqbsfU$8>urdzpcg4ZrEKN?%9sDR|I+8Vb?Tl6ADut)NOSVk
z0@f*YmU<w^z~4wtL$2ydcLQP(A+TB{4&FQi7@!#I>~KNj`$B0?9{;8P;^M#gJ^$Vp
zKKkhH&wl8>U-^yS-PbSLbVGEYgSs(EsP}KFVgz38jrJBQzNoW1^)3^mS|P=t=NqO)
zZsrzsbQ~S;bOq~e*(f-Uj8xf(XdGnkHG^d}<%(e=7iov8EJxL>TV-xF6Q!aKx&uWj
zP_FcCC<7VFQl=#iP8V3I+HM)U)ml^?PK$#;tu9)%!Jru79jl8SRUb2qR_SJK-CNk?
zy)!5CmZxK-rM)Kb`oY9ihhC?K!U7QBa6Kb(7$S_800bJvbOMJhGYS+f;IjL3zwzRi
zH(&Vr>HcDi9j9Qm=prgq6?ZVAL=g;$JyBG>agiXq=*^j9AKbtH!_V$C-^yQGv^xcT
zW=0e<6%1FJ1J~)sA19ayC1?R_-t+imvbLm!Ie==gLx^S+CZI|Qw{4P~GH!51Od~Xs
zFcBtMs4&8;L>-SEO>Rb7W`NLC-MJUPw}D7NS1qDJ6ERuCLyu(o;oGsoW?TZ$Ma^7T
z5PfaC0|76ds=1(0!&(qPLa8+%_detnrp{rlN};WFudn6T*RZ{AyKU^XW){OR;>3~6
zcKg^bldO4^p{gGM=|DsT>13aDq3tfXQh{gWIu$IS)ImWJh+s_n-3ctt>}{WU`NE(7
zC(LH>#*OqO8!V~;_9K)Qayx!vy0*4{^7Puf9=>9!_w}wg=wd~Y)-_qB;w6Gzr11It
z{s&Gi+yD0O{+ECI*Z=2k<0I3QCapIF5<}|C(wICl0An*$$oMABw61&NLMW9w3o1%3
zC6_3b#;WR9&7&#8cVNLhI&L?>;+RRl=@U9^PJ=?D%79o+)Dn?^1m>uIwY9x9zSs?{
z4vsGBRqG8fpkzb_kflNuD2O5zDn^<{fCVZXtc(n|^d}mKJ+;*c5rrtQ7}(8~VW!$%
zilWhs5~ae5R?0c@7BBLn@`w&M<8|-$ZGZnOexksYakij3oL{kVLPYct6bgb0B<6&!
z0fk25#LNA$d*bZ#{@l~+7oRz${bZe(VMzlL-l94R4y7KG!bG5m5Iu*TZ%%BVdf)E-
z??1Qp@ZR*~3zuFflZ|B&nuH<nsXBXB@2dl~-*unKDu+CTc6QI>PxfpJECzbg;cA3s
zG$o}WVySV_b@Jr#%&czGQldCg%cj=72mCG%VL}W^(z)09`kAKWC8PG-av(JmJ8?R1
z+|vsp(h3AB7~wDv6reZdS|S0;aFIf>9EK3g%qz}Q;^0L?dPUSAY@RQ!=Zj@$JLU81
zX?NOm$!Lv7h+#n!O+|fUdsyEs8@-IREkBHI0z`dsU3*P;0o_8y7*?_(psf1IRjW-h
z7_9`N7>ZZJ%4L?qD5wPF1OJYP@Re3BzPM9z_~hbrZSv^*Hb43qn{3KF*F|8^v{6u?
zjHugoGEXP&eb?Xp@Bh)p*2ls&g<K*h%~U)nDI#)VwwkUBG3cVWx`cNcU1?<!4M{mz
zgve0>g|50n)plrYyc~rBN5@?oVA(;0^%iR_&|w%^1-v*%A0EnuAj`EgwYuGn>Bhx?
zpNL#S8p=znj!cON8~S<~k-;)9j&-dRZw^tY(N)!25n0gzJ&>V3&_h}3r7Y!Y4{L}r
zj6vY2wfokN;MLc)M!7@(PUEIhj|dclne9(fA94XF%JS6N7uTNsi>>p|9oMe213Gb#
zXOU4Gi`A<Is7kr2e~v76)?VWJl@m`a9{#CU*WZ1yIc+XlE4U(PfEi;%aI(hOG3Z`y
zbT0`o<sc$WN}BuW2QR@&eZi5iPQnxh7Bq<L6yQLSm7rZ)+&joEIP|5XlnBb55?UMr
z0Mvxdq=}+?;kkqoiZHr@AT8}9oqY0xS46o(xdwKsXt%MmIWr`N2uBs>gJKG~3L;?a
zSuy}tGldl-LryRXqU=8R=V|fEhIj4U+j(OKmL@|6FRTJM0?mGDw)5s*Sq}`1{J{;w
z#yM)0X}&yJT!fgTlu{^Tts+Y*D+cSxCatE@Q6pJ`$_gSpMDZGtxd9E4Op3tHV*ja~
z*E??g!Y}V3WF87oF>(xzf-wZku{{6!SD$+6<h?(=(=R3OMVCs6Y&oUXf>d*B5fQ8i
zpK-qQHsY#Pwfj&Nxz^50MC6illwA70^vk|0r2|6|M}5Jg<L(czbf<a7%^#FH+9P9~
zA*sdo+NF@wI5;g0Mxuw}I^7&NHKwRH*{yyuc6$v%C`z<yKomk&bczHtWQGNip#<g<
zsfw_8wQxoUYi(84)PSt^9DAt`EfEWqMQ9nNQ)EM5)T^>76~lz#FyMZBQSwnZc7yA=
z^2(|D+%cYtK#7vw8!3Q@LNiQFO-ksxQ@p(P+?Vft_Al>ST#}<l2Q9<HF#10SS)25O
zXa%5E*O&0g_T<?1{J!nePn^I1Q&%R(dNiTbp!ZO#Xd*jHEtm|?vjl~q4gve&?eMD1
zia}tn*!<zg_HCYrFh!$H6NymHu9%B<{`*tJUI|bmOZD1kTGZ&8QqAus-E@6-y0+Bd
ztvI|78{#oT%!yaN{jCYh(&aI5u5xgHK0o!)!{^C}+5{XpV<C_#ULx<67hdw6?Pb3&
z(afsasv#S)owPkHZJlUNJ+MF%D=W_d8zzGi(X^BGWz4)-L<(b=s<ZOIEki_+x`o#E
zW23O85CgVm1yq$mt(I%$O0&3}bLskwJWkFPMX5#`jHsMD4P%sKT$7B|z;+zrTr~-d
zVN!}hlwyhQJIh7mUUI08at?wHk?@GHlFa7ti&yeAZ7edxgn~llD8{ZYo%f3-O@(pT
zk%PMfA)+GO%D_zIVcy$S)zGTqJrr-nV12_nI#_bfeRMgxtQ_bIOD?&D%HS*#w@k>7
z)}N!}oeQvdy<Od#E@7!M{2YRTB_d)NF^W)D2~lQ*$W^kALk5?(@VHz(Cx@qhe*zL1
zvckqP>#Ts1Ba<E30ZXV+IFw|r%7`|12jEbF9Cp>znjM@qfg%f(rJxn4f^&MI&^q)>
zMF;GcvQTtTr-(YF5ZCLHbjus)sN{9s4Lv0H6~8TnKt%*lV1)`rr%=v}rfq<^*=ft|
znQw1>=kq7eeRs{&ahXczmVzRxBEA|1*118WkyL?5WZGgfyEr?&_s}OU-2YQ&r^gkk
zz)eUf4gop$ol0*gP74!CslIg8v}Z-X!;N%lM%GdKM?UpeU&5S2-D|kbYC*`ssh08G
zr?&s--)6&Q^^>;sT6h%?Khp}1u|XINXm>H6efqP_`#;`$q5;Ttxv@|f38n~bpKrSb
zq6<V@t0DC8X>;<v?b=zZ3@V`^E2*Lojq*l!`Sm~je|7oNOi@_zxpK%5GIeg3cNX(^
zzxU+d`t=1JG}GvGE(t17lV*P32e-FhO8stvvzHS^vIvVvXu_*&Vl2zNLrYczo^hrc
zR^SG2xLAwbX8&9&iy~BgQ53{L;;Pnu0u8l^M-xnv`RXa76h_lvpEDXdR2v42Kw+Vz
zNtY(};KMm!W?2DJWr#1KFhVFE(OkLIy>?~}%jgCHJ0g^G^nL7G*hF1ljPM#tHrAM@
zq1ql|E#Bd(aO&_aH2zuD!(bJD{r~K}dAucAStYvGw<FFucgU$SvqmVW0ZOpC!6%fc
zC7`rQYd15>YxVhTpWTYmuYa@yjvxY}$OBrXWoQsV?QRu;wrK~H0&PK{1w=rRLFOuI
z%Ha+tBKG&K_s5Pn_uQNJ=2V$Az>VLj{AJ}m=iG=LvA@0c_pNU&50CO#$+L2&&edhL
zS-H(^jxOLKapy_)CA3WJ9(Usm)+Q70v)_{!37DDZih6&;qM}q7JYkGYX2aS%4Nj*H
zXkSuplD+OL7!fVXqJgQgil||Uk!XoZWM!-kHPI+Yt9s2!_6<tvneqx1iJbEH4sy{I
zSuQX`ozy@LA{$$wakM}eaxlwV$%%3kwe`t4iGkJbv5{UFC|HU>G3Iv42Dc)qh*U@9
zMrJuTOKE-o@$vZ2e)IBMKe{*8fbakqxlhDY5XCA&H66$uOhBbdu&~sbt)zwZ2R!_i
zL-)Hi?K^Huol>nxMo0#9iePHI%bp3NORy$;Ro6+q2yhXsEvId1>kX#2rV$R@>(=oe
z$Jo@&O!WX1)eti?==g^|P%Td)M@38S6)2@4YqgOPgS=0C17W~q>EN{wx~WT0K%#9}
zGYT+j)a0Ar`PZhdGMbFW%1mjp)}{UTy^7;S`i2{niYh{BcD9PE&3N^eYBZhXk!C&x
zD(O2Q$DxJAl^Z{Q+eiOaUv^!DjnFyiHeykEms)Rpyl4M~_glaDe=mfXL&jvGT!gkF
zs;aZft)AM!u;n6ZQT0?Z3#1?wG{ra{t-IsOIcK>?<f0NG(qM}03P?pxp}3Lt7P0fb
zF#^D<jHUM|*94kb0G)TL>ekbR*L|%X@K078!QvdtO0@z37(GYh!eX?a{louO=c6v~
zQ<0d4YM~O{(K&L{tp!8bQ7hGz5FrPU`U<FVvxhOILh9d)v1a+LFe@3*h=`_Z+S~=B
z^|tlKBZqRxL#64bbW~$=5^G+@VK@Hl9(OgsIwx7wncAhziWLGSW9hqA*&3OdZ++;`
z^p~G2banRuYTW5eW-5*@8RUdZIlLnpLk(+zmaK`Xl)N+>sc<PqmOQe-pqSNcqKCrt
z2oaqtBc|>RVk)ddQ<W;A)^eUw1ziQ<=#3`J2WL9}ySb?|e|S0DvKM8Pk_#!cmk>gM
zpghptdWh|#FIjlNv16AWUzwyv{e38z1cN9e2R)@qNnuTLW0#QEY<ye2_sAs=Ub)wG
z#}@XjRinnnL8}NRvSg@$1k+GiYz^6xWy_<5>@ai%ZPb&o<er<M?znkx<zvUfo~s_%
zRFhUwJm90xLREx`itMSG=CxzvX0>=cuyj%k!x94vi80szqG*G*|Io1x4nR4`!f7_J
zLj>g!K;&b`VAgpBfeurxRAYJn{;MDG`HnO6HbZBih*%8&!n@zGoXV!5*CLr278Qr0
zh&-kp`@nmb?tiVL0_&nVLnK)$ogdXGuU>H9>CK<KAXXPVB~RACYF1_zRcP$Cm{G0a
zK&wTv_mJ*Y2*MLuS@LGBX`9t1=;N-9ZrU-%Yt6c$@~+EWD3T)N8q_U9(G5>k>N_R2
zdc{T&aslbt!13bc4_vs{<-G6JD|-&KVM6j=9!<G-9t`DHmM*NY^2dK%uY7J|E+zFH
zHxbCLmP)47bn6vUN>r6xZ5LBg#Hg5dAc#RPhMT-4VoPb5WQ6zBHo41lZo6nbTA^!w
z-PHziAotH|p`L9JQ|)xZ={<kDy&G=tnE>ltE+1v_=w%W)qoVc-hlAnT-Q&4Ay{V|P
z8G<vIG$+>rAVM@+D2mU9i%w*qMXW_O7zyi@ujGIWPPxK@6_t#=fJR}C01?Pg1Uf}Y
zSxu#enuewkYw&gV2GI#!co11C(hS8~*dxH*=y1nlrK0>1pcx{}D23;ijEPnsxQ~yz
ztbX9a+C=M<2$yvv!Bp_BR7|*w$x1NR8KNv0s%{<aId-oH-+G^i-n8ek^|UAj!9-D+
zvW@&tuiRgrw5swtp^ghLsjm6*g-h;ZNl*w1$G~ekK|~E<G@7NwrM2)vdY)Botn|kj
zp*a4@PfompI)Swtdmo2kI5u1pG}G%cFq`eW_S!WQ;b2FNNR=OtgaA9*@zJRMhJTip
z#}*E`EQ3NyZIf>wO~R9q5Z((`LIjdoikPe)#Z8|@IKv_$5@S<6OAbas3b%bWfBZv}
ztG_A-i&dhE(zsBYnbLZ_e{$vZUBxz4jv%C*BQgwCHMUd}Ib%;0=R>i$GYCKu0|B<E
z*Qx`4!GnB1C`GuuOMnm+QH9#vhC~>YHp^`W5TI`#K9mIWrrm$=(87U(YveSL!#dUd
z#Tuc2LX;xc>Xs|{YP0r^w@*Lu!Tptcj$oQ~d8_Z8$nKV^%A*advW&r`)OwL|OCcGn
zGVEq4B3NufdJdmv(5hb)ilA0F;5oW3Pjj>$ZQHGMzSj9PN8_H|J%`WnOO&=gll&qL
zN&~m;4hNr^GstO-hPIpX;BIE{E&*7>x>2@+vxmLtmnNIzHf|{@Nn4X)=YM+ebik8J
z9pyCVt$O2+{xVMQDGc%?VhZZ{6Ea!|omAp$LRg?OP6>vRf@bhg->9vQsw^c$6)YV~
zLlR4l$daSb<h34NFxEP-rf8{#=){iUME_36iwx#$5!@l7%~XmuYd8$+!Cf~q?<Uc7
z!x9*C=9@$yy4=z@ve@g#zv{4k^A!gV=NlJW1>uHJ5Ix7+%AzXCNV7~56|A#>j}Co&
zv_F5v^*0~B_6Qc3Mo<y^ELzy?1;c^9m9Es?OYcHGZucFy=%4?~o70|YOvtq&S0_nG
zy`T8j)U`PXG9x-j@KKlsH<OA+SWuH1D<Axu<*qR*V5Z(YU=|LvNx4lW-%Tbh?Av$Q
zeOIfx_7HMHWi%+tbCv-`xRefD&?OGg%mW?-O$|oDA^9>e??Ey0NI7o5b>dS46KZU@
zA7aDMi*k}s#kPI-UoBnsfNr!eN}2~|kOAY|<y6%+ZuVT(Q6!4=JQZ~Up*EBqMo}Zs
zAi-Fg;AF*yaBNB%v8!t#XqJpb;kZ+bh)6{&VkoFdTYBhDwqhz`WVRkL6}%L66N7;u
zjZ`q)Ad{Aos&>8o)TfTV^WC=og=NbTqhOeP;NcbeS%Gxn(YR7pLO?KOtCN(GtTtAa
z0Wh;vWEZ&U9%~5u(m;_11bV0wv)H-Xrd!R?<Y>Cww7GF~SuVt^JZhjes~vB0s^A79
zIYB5_JL$TegE+zS6~ScZ;9Gd&w@_z<>SDKeaaU!qiY#8Z`n?fMF3{975{ou3IqzqN
z=zE6B|3sXguE`yJ)}+(<j&iD}c~)X7l14hcFF*BwY7VeuijYypq9Q2?5v5X;(06<>
z15P?wNfps45);t-gajBshj5`qG!YH89^MdZ(kgsiT8F04RM8+Zkf|JneFeaJvb?sJ
zaW7u4)<-%!ac15nnl&Z&b{3yH_xn)IghmZ8siU<(7#8GfwI9E-UjNPq-S0kHpRC=I
ztP3l~CdFv7XR?&ZlgNNm!BkV(S>Lkn@|A18{<e$mf1A}AW2I4_yG*nw{Nw<8KVFr_
z1p$CdLGP9pF8k+C_*^y0l_J_2C2=*g8{D2|7h;ipq!~-+Diey5I2yN95eL@SR#uM(
zE21vCqeHH$j~h0(zp6{^N9Zi=x$?@RqskE-f}8}02Z&(lf@ZP=d6aNN1+1z-QehFk
zo?xb#;}D@#Nx?{roBr|RRU)%Oj+9gy@(9KZN&r%2R?Cju@|nr;&*{SbtAS*_k`{}f
zBT6~ZvSdU3FQDkc7(?c)w}cEp#X(tCiuN!8*^0%qNGW?!L@9#JWsI1$F-oB*_j87j
zw+S}`BP-xpC4(vUj?8@^u9(_(I;zuxrWaVV{)vy@^se{V?YE7pFf~$$c`&`7b$@4%
zp;bewQrC8+WqewCEg%X}S!DOhMv=u-r&9fcq+VvC_y5?C*h9bt&uW_7G~HU$u6Ew!
zn0CG%YCw1IJi4Cd)vF>WvyI?9Kh1m0)(5MtqodLsa-NR!=5TQ?e22KrJ~z12>UM4x
zvR#06&LDQbu`We&xrz}goQl4Gn=_k>&Cg7q|Dv6*`^nAE4b!PR+%y>6&M(h>OEOP*
zC<k{mBRO;|-@)C^%%N8X1TzAK*=9w+Oq2t(o*fOR_g#TfMWm1s@I1@c1t4P=5o8n5
zGMb1fG>upX)}+S26+Zz003ZNKL_t)v9<h#SB3htTcquIQ-fe@W9k;<s8@5Z@l!~0m
za@|#mfFxt90Nd$(?5yC|&e2Mocjtze6&Ilj-39r!$6j;6*Bm@}xVv>J0w%Y*H;C@-
zjf-OqiwLM7dJP*J^o8oc(JLO(-v7GW#s`i^?UrQq0LuEIcgRwj@#)#~V@gIsf#mh#
zN;M(IMS8(eLr}oXLZyq1J1i)@`hRIuD`a%gGZe^GbVok*q1unmtO@#5s1?oOt+T*M
z6Ebbp^P#J*I_3yvbb?jR2=xsdKEF;R>y_4N5S-=+SQ;Khn@!IO?960Lt84kgAE}c^
z@2k_FgvGo7GK~y{fs=*m=C}RXp~qbA^&aKEASb{}{>Bu_0<sFrv`8P&L*h_*l&8Lh
zlnMZWD4WlsMwp1wa2Ol2D}2L2dEjyj^gh96eRAd$ThY>gq$Ds9bioZ?D<;$S5^tuT
z{`74h{rjUgeh$sr7@Ab(YWrH=245<M(;%Q6T@;myTv=u4m@4#=_z6PsN~#4>l?u&a
z@Gyr-3Q<uM8Gwi!2mm?S&YK)fj;W(@G+9kB2XZKrPUT`dA9G2U5}db0=>jEZI`-TW
z>rXpApT#0*>AcYE*`uTLaKa~%E8A|McC%M^0l?}-se4~|a~0i71`tJdMuX^9-(0xu
z%{pKAj@T-X5~s1?a=Z0%8)!BEex8G_%&n(gd|L-bTjx&6m=aYPTVfr(*|v*0!p$;O
z3#2S&wV?j`OMj9J9n?fLh(>*huz}Xx*A-J~is-~Fb;bR#-+>N;wjH{%p@68Zn<Q%Z
z<XuL%JJ;ZD=P%TbN<8Fdk~o1XiFGvBj@BRZz>6NZ;Cq`U1tSHM4SC)&kDSJWUaZe1
zlBN{^zCc00#OkGAaqNn(y8V)Cj@OggeU#O(4x8O~*qpv;VZHQHLn@-1QBYUP-Qf!K
zhEXxlL8bc)3V@<-r!=b2jB!juDutUq?MrvYfo|=S?|)a_97&U9_6b=Q{h||xP(%xi
z$soCR-@yZW7baY7Gs%d?2UA2V_J-E8)@KE$B7zVz5DWE`sdCA{BHc|{Ieq?9?52pR
z`h<gsei^nN%FJ*U8zv)g^B4HJkM6zqRjHb^bGSw!gCk-_Rix2M$B$WtoCs8e8&&d=
znDH;mc8R89a8Vi-dN9jio(E9#Jq87}>6AOk844*Kr|_lG=;)1~ZEv};x%Kl$Zn<$~
zeWhAook)AgqR$b%PMe70y)lo{H}b&|nM~PRGX^5%K<d2-lq$Enrn_fj9Z`i<g!NJr
zeNC`HD-T5Jn-$b~o7K8EZA`OIn{MjS1iH?<9Ic`gLW*rQlutgvb!Ww$zPFm^Z52CD
zIsTpMQM<=o0kF2`zKL*!4>{ZpXhSXFw4&n@g~!9Y00rxWImYuj$IjVl57d#8Gz-B2
z5*;GJfUwdEUUu!YE}~=dPz_at6&3Fo7-v)uuz(OU*-9-jRZNAoh*BI}SF}(^bWm5S
ziVT5KR<k&rLfF<ph%XgCi;}IITl}O=xx86By#hp~IG~m54vijv<;9oem3qCkRJ$o#
zDF<_=l+dSs(ARj#G`0H1$^P~}*X9R*)6L^cRyiU9*0G{k8M=AO<5peo(s3$DZt8{2
ztJT~8{=dE&3yUB}<As(2%&amqk50MWzT!}HxcalQz8VvPGT@Lp(QdtEVPV{Bk)QH8
zU^D=XBlpkV@Rn6nLV|)R4LrbE!{3HQW`9M+MLrBgnQ5c4Sxz$65Uw_jE8Ke9gsTZL
z+YIbX5|p#9BaiF2`JFf5@BX@4n&dWPa9AQ)(FO}p(a2;~s!~-2q=afTN-$JOG{7qM
z3_3^=kfL=D7abDhGMGHP%U#Zc6?1Xc8G3{YKGlgS_+Alxj?^|7K>?n#x(2JO=$yG3
ztJ|ks^&NRYD9I~OU?ze^@oU@QHZvy;SGV4Il}44hd#+O}<?NMN?P;8>HXBt|CsoA+
znxKc5M#6Iafyj|VE=5+?c2keWqljH~S=qhK>O68F4<Pf@Bp{tM_}^3F|DA*gw;LSk
z6w*69!}a%0{?y&!E>t+Zh<C!nqb)VG*}OBDLn2+up;pK;r(7&50x`3(yVD<|d*E6<
z%d}CnSrRLRK*3c>h*rv$Izt;VF`Fvq%4#7&?E8N-xUxuO6vYRijp%@BM5|~*EwL`G
zD|f^+yd$!Zr6^il?D?cS?FDCBH-3q?nXq4)dPf)ASnF&+A`p{Msksd8W3D;;@WbQ!
z*v%sr?YLHz2aOgiwIf1sDy*ltG0SeXh1>StYy5~O-m>rVX&OtYp`dlFz%aOJ=E1(1
z_8X;O8brt_r36$~8Bpc*{VVG_8W3GEBF&6qDd-Gti6?-M!d8!7J;F(rGQWZfry<gq
zXk|49!=;_MBmzuyf)S&&)%fT~CT7Lprc{}F%RtE8J-j%kq-1qf18~pbWhY^qm|ZDZ
zFM8>t+(iNsQyJkI>J`Gs*oaZXCPx+|DD!IVh^^gBZ$^XoD$T~DnwFGcmS9XqR>qW=
zlGVwQ8DR{hT9yi^1-&G3`Z`$`3dxHEDx%ABHS5#K01bLt!jKyc6qfroc?Ywi4XYWB
z@A>qlo6k%U=#z{JAoos90Fg?J24iz?bIdm<6{D@bNbNa9v+@P9kb591R+Wu%o>pm0
zs}e`!(YU1C%u*Mf_37{kg@+5CJv(xj8=-UWvNs-WR(9_K*`tfzE;7)|r=D8sO84a8
zf7dRK!p3gn#2QmCtav5^+dFUZ%$7gX8D}47pE^$^;4=eQXPyS+W^}bVSPrdoWryMj
z2OSYeGRvCz<m}Ss&IHU742l$o;uDJic0pfOY6ULuqz+aY+CWW9fdr(G86$$AnIt+9
zU?Xo8ozxLig_E5$m1nX+bhNC<>Nm0>i&<+wPd!oZ%>Cls5*J&)a4Tk(-5@KdD2%4S
zLOcDZ7gXQ=!24g;d|`ZS-IxT2Ws(dSg(x<`z29EQEtz1)S+5?rbadUL?ZRt5nf3$=
zSyxG2;=l~+xv9i}=jJ^TtSEA;q$CqUBTI0HB2!2kQ#;^Wg5-&pyJaq?p{P{6aw-7k
z#rAT@6`izLOfXQFj#m?Fq**Eung@%PlBKj|HMLY(I&p>FY^YLk5I?tp+GGO;#vFTL
z<5yMe0E|Sa1%yGiz|2@Q#V7_MoD~8_SJm5DWTYemQbKNq$zgrbJWC;j40I2<hexrm
zikvH>dyjrX>S3|<G}g4^tWsf-7YiDaDb1jfQ(jQ!kZpta`OO%rj@!&vZqBI}+)lwG
zo278?_g9f+wGhE7q9apAN3TZp*qdo$Lf^!?;Rg{>q`e}0=jvQjk1o{ZXal+R4hWC7
z)DtBUrumjY?v}Ccf_%i8LZv(Ose5vzvWgR%S2xMvo>CNaBZFnV7)!6U9HN*4aM8gW
zcOAp|i(<(hn8_#(&2tZ5?}(cNBcO{I!8&-QsLjeQ-Xi)~6cS3$KQhoNGT3=^Kr46S
zH0PYy2@W_Ia{yuYID<&Seo42obPai8gCt+9xi8kf<(dn>>A>Qsy@hOx#~n#A71c;r
zn3O06$dNoEX{{RF9#vfZkhKSY^XHcjMw0hcBMm)Xb6GTP=6-F;WPvo<fQ=F({G9B0
zhJO1YTQ;9L1LkOWCre@V5T~5*oe?z7!XIL$JPtq+lpF;=WGEFIN0<SrQg~2?TxQ@L
zC?&ku_(2iwUWj6aaHpVT>@^XD9>$&7jX1rs{8?61)Jq!%VD8xl<&g+aR)ytcmFQ6I
z$_ZAbnzX)ouwdR&A610hqYLD$spJvaqs#7I+LwvYuH)A3aSsGo+!|T9d7paPatT5Z
z9+0I{zzV^O6AKvPi7fNo<MiRxY*)=d3@y`CIIO5IyHvqiXhb&h6spNumcYTQVnfz3
zWFos9ofK3DWwHfa(Ix95g2+MuQM#RWw~1#3vr2(43g_Cy@HXel^W|eb{{9zy_0n{d
zn?P%fs<2B^?|o7<8A=(2Oo8mFTCMhd1`B&1{iM%d_GK%Y7%D2Iohr7o*17(OjRqva
zNT@gR>(A8)C_Jp<9lK_pd_+ziSh(%`@7f*viErMBkiDTKs4N%^MdT|YBBiA0NCuGx
z-{&D_vNQz2RlIrRiikp#FZEa!L#4ifFnA_)_w&wp?1NHK-j{?N9chSijRDBREwZt*
zNWm&cYaAqA*aPuWF!hK)1|oY0xO*3n%LCC%D$YbobvmcEi^cAyX@axbv)zMlXC?K@
zHQI(5#gjh3+ByUxNEf<L3w5v#ob?rpROxd&p)$HVA5JIu_e6C<U=)usFc2vq8jLPa
zU=$@%MGMrH3hBp&b$eK0!%MqXk<#cz+vSF=@Lr+1+^_z|io5sdOd<(qY-0lr5F-|%
z+oOEl0Y3Qw7ayD+t8=({EkSB*gNNRK*w{s|szV&pZ?)0U`#yNz_22UOg^Sm08PO@a
zo?pEq6LoV%Z%Zp0w{(2(-rlp!*pY*}Fv;j=4FXotJy7)aso13I;XO?|$e!%3h@xOR
zR1UO}5Y$|s#N8!Y4sDvf1r87)GQ=P|sm|^OGgXP%kisg`N(-sr0;8|`IRy7CDpe^*
z1B6E|(5hH2Zv0AaGA=yHsm0ESc=xz#ppts|;4``t;wkdoJAUeJ0<auHz!=u6Zl5w;
zthtPOY!vT<0cM~Ra_JuwI;rb5X^LVW%MkMfbI#r4bn+py;VL>iK~W52Cxs$`g;8N(
zB1~*Usi3Ri{Id%5@>!i+U{IONWMR&AgQ~K`usg8z_>zr2MNE<+!WcqS5filcw&n>}
zU;35HTwJ}SN(d?`f#Cq<h1S!1NfO2;*QrI9kv_g~<>I5hC9b~q)7>~n0vgDJV&b;?
zH9aooT#0{Eac~C8wkDJ;+3w9gQ-D=~Q&C{*D|$v!S$$Wf(Mpb)gTaBpiXxOEiu8%Q
zZ-59C20J~Xx2EB&zN@=cv?LfTdZE1^I2aOJZviH&%(K%B$s$?tYAQC519}1^xg!+O
zWx8juD2i#=yw9ko1{G7=Q!oF!9N+VuygWNZeir?7XZ@+WMHgW%q*O9c7E?Rz^PlCh
zOr;=5xh#x1q78IJ3l{2hSf4eX|AJjybw>hQueC=QqKE;xB7p`YteADBA~vmAYGn2o
z71<&O9mV!SK8VDkFyYA!-UGFJv(9LHr@6(_5cH!DK=+huuDai-U7oHcgUbpx-Fuo*
zvA`*gHUunbG11rR(cALAz5mC<FTCPGN4l|CBMHc4QPxa$LjEe|+%30{P{Ni^?WU0L
zz_zDv@tZ9@1z!i1n0i{ip?65%sPk)(#zYL3*X~8$eWoX0Hlp+LCNt+j-rXMfzOLN^
z!9G#$-pP`B(TQv_z?gdB_5M$Vdxp^?C>D+SzCEPx&d`aA4^MMp-aXD+@^W{aPcwtn
z?^#W~KLl}dC*~n}T~wlJ0d_)|WwDjIP!nvW2FS1u@IDJp+3qd5!+{KQ0<D}iNA(_a
zK5YAPzmB4}pX+NFDjbODvn=wWxnJ;>233e6dCplk?ruus^zY9Gk`)NW*kezuef{AJ
zzV$wb@2xd;9a0L0=tK6`3QxMflSX3_t2Lyxg$sV`L!bWps=4^;<KL)-ilfewBPT%0
zz1Vl}mAfhWX|oa4>Et1L=9kV5?djaM$LpkEkZ1daJlE$O#m0dpNrRcVL8$?9!{sOd
zEBx*ORQFH|G|uT*4JsR(&T-rJ%QHQBoi{il&5>=1h!6|UN~L=>vNj-TZ%5=3qtFmk
z)L=9d^e96+=UTaY>>l?VfYpi>DKNner26D_KS2tKaogxtHd=uU2GK-hSPL}4j%=k4
z%%GDYY*AI&J<fWW*^qG_G9<+a+JT~@5T#L&gZ}rxy&Afnyw{o^ltLhc0xX6sy#~Z!
zb~nFQ8Ke%$FSRk>d4D`NOMsFeEK=5#*U*yZ!|nPLuDI;_OZF}_x6#@*MbV6+GL;Oq
z^(HMzgcxATsE()Q_Z{Q^eBUQOGS$8-_8#mKt;)1a3RWpV+gNf=l++(I&3C%46Z2k0
zxGEx&ZNF-6QsAJrU*zX~b$b={nNBJ<kJ<p;xzj#kL&(Xr2|W%1@coYi!!J3BO~B?~
zM1kCJ>4Apbii$!Q$kS=8(*~p%q&&-nBN!2qWIa*c$X*|`&keg#gK(&NUmca?P5;G)
z1R&X5#h}!D)%$U6zM?@Nf8!RMEdQ{fR7dS#Xu*@h(e3k|B`GBgy2hfF795XKJ>9tN
zgB+TM{XqZFuy+HY*&y^4vy-sxd-i!I)Ay7)uk)=^sWZ&Jo$32`kGm7VS`UuRBn6X6
z#jV}ghnO;J=S4@*>xnCb-Uf&0gpTZh2Am3QprsWuRxZX{qBxTx-a0`~B6Pu%H4%Jq
zEcH6gH|-=tuVIX0&eKA(&2DT+UC(SFp<*7_FAp=#qTzRmg@VdW=;})l(b{&wJT|TW
z{S4_iO2|Y8%t#X!yR`>Y-Q%vk>>-N_T>FBt>nQd;S4DzJHNxovsY+BwWLvns+W(e+
zyyY#QzWtVJUz=jgI=NCxEd+S#@k%NS(>9P-O0$-$)0-j@GFp`N5IphGENRb~jGY7^
z&n6*}*lSxFX*p*pQliTfllQV*nwOPlznn(twlk)LRIrMAJ0TT8EYV^^7hgst0)+Qu
zaun=hr8Xrmg1Q?zl$@pK5D`VPv`DU7@7`pjXe__G7##+T^Oas~k6`DeE=xvA08@>E
ztO|jfG9X8c>rrVgl)-4TL=_}P5Me{%Or(HRr>2>Xm^kDrRT^FTiQG397t7ZTQK$&P
z0%>zrlVoqMOaoMAe;F#X?G+<6ho`sAkqyRO*eb>`BZG+aVwVPRW<aSqCg^ahHbmR{
z@HMd8+4p|TEG)Tw#%#OktJ61@KQW_sp33GYJu7Lut&839<zx4_%K+9?1{tW3s?wb%
zB*11}g)~E168eo&2w-XEXAvasU~QklVk@;kD>&$+qu*Wj(Wr<G4wG`2b34-6iqP`R
z+iz3A>odvy<kP8v*WK`0<Z03|Pqs&6*~RbhzAfaN0kR4v_-61rZw~3({$74bNp18`
zCbxZh`u)d{N^zvb3`JN~XW!SYK4=l&^-r$4tUH==V<`utQsLb=ER||d72W~PREZuu
zhRJ7q=?(Au)Q6^8U)U3ovQk=Dy7b=naRtIF8*(eNB;|>@D9(}?JcCPRpUB)~r8%on
z^&ZtKOFIcLBHSbdQmOze8I;_~#K~kbZCA#1wKiQ#)g;7u7hVXIiMg(<nXVl?u)kSv
zyvq>+E0__{o3v0N!m7d>1Zm;9>&&WZG(xJfXNd(TC3sz>k;y#|>R<#Spw1n{(quAi
znl}5i>n7s~lNBc-BMg?R)U?^4fU(dY$Q|x{-@U2gx?RwgirEYpL7D){1S!PCeM<{%
z+l)rl%F5b!GI1eGk{9<Fkd>v;s9sxJU0Pb4<_<K^ZB;QbC(0}l5UT8m$N;Lu#4Hsv
zX$!$4ARmwG;=wduGe~ABRns<4o5tm%@x)T<yZ$i96>n)c<;KQrvl^LB03thEo|ig#
z|IBXx&Q0N`(D?_25n?+Jmo4|gcHW-%KI*4oH_L4S)_Dr~JDt@I*CL)Q{lHy-b@v8X
zoy=5FR5*}`L{lF*03d+@npHWxgg6bLs@OSu-!N!Sc49|mFf_>j0AeBV+Qw?7IdIOC
zf*_T><~G?|3D!$d5A^L`igPCt=-slj<c{h2^HlYKE$`mIP0=qCyK~@VgBx>sKAX#`
z_M2`FCO8^leI$hH3OuB>C*1GwKf7>odF8gsEP73`0hqwl+X}OzWsV>@a<g>7J3hDe
zdmsLX^}PqzM{HQDsw5pabok!)zE`R3&Qq&+de6pbhy6iAW$u&Q;K_gp&)qYB^2eY2
zq{nofTXG=!E0IEsh>%93h4;VzgO7dOlm5s5e8Ux2U-_|5{NrPv@RZ5o9y6P<xl6OX
zKo5WN6QB5V&-%&rl{L?J<k$Z*-*AN4I(6$&b^O?o=l{ZUAM-CBU61g)zyFqJ{P<6%
zdPKr{b#tz)uDs-zp7)K9`UW5vAbXR=Y1ii5O(x^cvADeaj(5KEH(vX?x4r$(>v}Br
zhh6v3m;KtWT7@gG{-+Cj_bXUbJqP*wtzyf?%DLoa%us=c4`1->uYAQPKmF++{*h-K
zJARzKCnF%3S)$$h-uHU_@4kHHI6nH3zkkZV`i^?CU|`Tn7^@5k>YC~D;^bZLc^imM
zc*NH|`m>+;)F1xYpIoqiZ&k5vno235>b2wLkvs>EA7A~Gx7_ga&;P}`uHO6Jzgk~i
zSsGV~Na3^lSTrC~RcDUg`?r7h`)~Y%H@xvpqJe2hX4}cQ^D~0}{Al!$%y6!rLrStu
zJLyw?SUhzFjd#n)!ZW#+-5`CBJ*)v5+EiR~HL^z5h*Mxnn+BTDG}Hu|PzQ8mM{B_r
z*1}q`5t?8JmY%@|>VPifVsMT(O+@dYcZvz2%`XfYXKe*x8mwj6%QVHzN@j;__w1c_
zpI7kC-GU4wS5Teo?l>lQt5=T&iU*`5g%qVRe<tHelBlDDG*Lc$?4}=hz(wD*$CuWQ
z2CcV|?3=6*q!|rnFp=w3atErVo6??_e)zM$`I#fPE?>CrW2w%LE_>H?i%U!6g-JwM
zGTjO3!|f6cr4Ca;mtAxaZL?U#Qo@8$BgXVe#idbN9#;!>igwzquk2r*RB+F0qbl{v
z#asFohnn5*{Lb&a>z(ha6Bov#pM1uTPS;l0_swb3%IjI)e)U7X@+nVxbhqBF9M3=h
z+~<r(^+v;_p)~5{X1!9E*N!DLi#03dk-9x2yI{Fqtg%>y`Si=Lx%!2_@Z8tE`sLl~
z(Y=e~dtZE^+Ljp$lbTx;l!Waw3hXO<i8y><>Gi+;nnU}>U;UNW{_+c-@7<L08Rjb&
z{-MA9o8Nrx>npYoe$X|~{HY(Kw~2-QPDVt|ro3|O*4MuJ71QI>FWhwGX;1x;+itmK
zL@tf$5yQM)9#{MJE-o*Rmlj8h3-#hcJx&}~x?tbZ@uRngcg^bYy_2M7<)Q;iW5cM@
zIBmQpm7-hs>FWLNd#`8y#E;(aCvRR}s79&iu=6aJ@i@0Z)$V@zm~(wT+HD#763bw<
zGyxtWEub0%kRSudWRmqllMpN<5-y2sLk<KOU=}+u6B!J!IH(mi?@+-%OAtO^57#VR
zFqoOm3p>qid$#csD;b2-<iKua*`C)N$(^-58K`t~o2TvQ3)*>{bSmZ9dwfBVCk`2B
z64Ef^*1B1rq)+nNsJwnvmB064Uv_1_bxBj9rbd+zW<%Si^%QN;M8G14mX|+xJbvRN
zpZ(DKs9xHWyDk%sipZ&|$MtwTnH)NNc(rXpaVKRQPZ)>dUTu&(C)3K&qrdUmUmr~t
z9Y)1?v{2P!P)0KwefWd_09q(7j4LDLz8!^{0V66VJ^Q)O|HD6cy*fPQ$&Y*e>wo_P
zAO1TRVM*%S8x0!OcI>vBpY=08e&n`kO7^UueOB&TfJQp{eF_WBOG+s%EH1wKHLsCU
z?%a%{$tYD8f`t2Can%)9-1njj4}aA|u6xlh{eM6DBR^trLszGf=dK<tZk;k)G=J1<
z_L`!u%wqZr&w2i#{R{2d+Sv5f4}H)#J@Wb+{^GC1B#_CBCPk{MpZ&R?eb~dk;)=^J
z`}S{p{9nKK-GB5aZ%r6SPf&Gve!<T__lnE!Wy#)t!`t3=!&^tGTFqTvU$2)(pZN4=
z|MabYQID5swK36<h)PbP%l_fN`{>f*(#p}>7`kBp-Z%g8TR-ygPtSuDNnP9R*}M1f
z;ft=m^8WRBao@hlZ~xY79`o35tLnwhG007w;nT%!g(G*&gq=o<49~%|o&PGHalBG*
z(KOWGH&do|WPF|R3D4`s#;hfrC$`X>c8oo{_<V}5-J(~_^MyRWXaQDJ%6X&|F0=>}
ztDYJPA}sozqfo!th|z_2V88;_ft}z&6jvO`VFF<$qBtTD+qJz69Y&h@lkNQcs-)uw
zWxAmyWrHX%$JE}gD~32(0I^LiMP}G=Yu84B@(j2A=Xkk46?od|OXk{}wW-*;ZN9G;
zi`Ncr&9Ot9i*1!ozFR^lodW1;dmJEb1NW%_<)~_=1XQ}^YYx=kb-#Nbn%*)}M^!K(
zwJw4TK^7(tj0vmcP~=EQCi~uY<N6yvamyF%0*%$Vf=PWc*1GV+7har3wT3*|`S0S?
zAXdlu@|*xufE}zec-ySK_(i`wUfS<UuxjQ2Ln$F8jsXMRQto+v*jkJhKvW{Eu0Qgz
zPygD>U;Vw``R!fgAO7JV{I-Af-3$9JY;rFZHA2*C#=!S~&v#vWzbjVOrZ?Vn(|`Yi
zH&>&{VAb3k;DM~FstvYCqlL-O{o;RIT-qlQ#q3T|$lxh)b@ljve#Ngn;`-|!`N&7^
z*|X%?OXP{r#_4ez2@DL)ZplpU3I4E$e#O^*%|qL@RWp!STUmMLPyNK(zUf<2J#K`E
zkU<f~G+tc#mydb;4S)Ja`}Qn9^QV8}9q;(dV=EaL8*OoHmtJ)7qrd4JmzEYj_Nh<(
z#83b9!qUFTx!>Yiy7`t{f8m#2RE?IU6yZfp!$eCYZM3u)Y0`)}G27@*|MFe0dhLG;
z8=pYG2=hoD|K|I?^BK>0+9j7B`i}2>@@xOgn~M1%lWAK@k4_Sm;>2mwXZB9WS(d>(
zd4KDPkN5oeZ__Q?uK+U#guZRzlz?q>D3j*8SxTIwao|@f=3o`?_->M$#C9~WWcmXA
zT-Y5na)cAQjWlb;ok#z3+1C?!WpNgeR`cnNVx-#l5bqW(Pq##v!A4jQHQ>59Wm*T<
z!6|Glwv;m1001BWNkl<ZxGqkSrbtuR6lvA55?Bqchc!$MtU+qQ7RbiVER&fj=I7&l
z@6hH6CqiZ_k*QE;&9;5fOlGrZk0gw;BJ{-Gtf6#Emv7qvMeUfJ28`%^kq6k(*N6s*
z)RVu?8eM5?QB*^CI)mgoPcm*BZ{s|-L30#tp5Q=v;=i9vg@$vJUpn!FcaxXxe6as-
z>j5$V8G?chrY6PCgsi}2lXb_I{K(_?*!Ms1-WPT&Ng*0R3oG^p5RAcK5=LrGO;BAL
z-8A0+vJZdZwIBKXZ8o;jcQz<dNy>%}y6ireUw!}kudJ^P8sO(SvaufpNV8jszNt89
ztg0%29I>#tXJKiNjV4i#b3MwVNsJdUUR0`)7P^uWH#18+1>*o+^k6kv`jwZy?CA01
z<Hd!q`RePw{mD=Ct}!xMN;E_yxhem|GoCKb5&nZe^t9!@`!W~>{?Y`bMA9TE<Q^g>
zi_6tyiR0y{mpIu|E$$yLUr;aYSG{!T!polXycaAjPwLU+v5$R1-;W8z3}0fVyuhu?
zeE(8iVSVMubAI-x+qJdjrKRUQ`+4oOsVh5t_~6r?_SCjrmpi2>DhMfo)zb35XZ`GR
z>Uy*=8U6P+y}_*9=N#Siw_o>~0|)l5PyGje@aaqYF6csm%4wr|OeK$MVb8wt!rsZk
zp5^8Jd-m*KUf#d7ynk`=z{0|Qsa{|2%qj^voT)-RwtB?PFB^@=i+eO$dg&`(^*0~<
zV0ibq$3M>9&59G{mcZ19!;L)}XL#E%BTJnaWoL70^D+OU9ap0henj#lpXz@~8d((n
zY%a}wlGo;QCpP~`*x0+1q&OQ3n_nqT<HeIgn$jJ*@!EQITe5I{<cZDgNL#*|I|u1)
zUqxK{#FwO*uSEanhWx%__jP)&$_vAh#Xd_OvY~~Hu*9Tr13(K&OvUgf3@&E$ox@@9
zP(ZY_QCrzaByU4IKT||9%<heru3j^fup&{w88YBWD&RcHzG5d-e|n4B+372v<ZO9v
zR?JQNxpF6F9a7q%?{KG0+V<7MxqrNevgS{s$JFaW)>W#irfugIgJcM@-H+z~yy(J*
zAFQh5N0bs(6<Pd{fiNHouvD}YCGV&v#-HK%6@UA8AM=Cl;)RS{n%UMpizJ!GqwIe9
zl~*n9-}~kN^xDqzo!p_Zbv^4@R901^f;QIHRt_AxaIHOVaHB-@V9GtBn<-o<wr}E?
z)k!=AiB<hW|Nh_q*Vp~}+S=;Ve(0&c^M?OXFD|w@SHyT+$8`OLFL=Rpy|t=(^B?~4
zr#^clM-y2Rt?;g_bP$jsm{}2#@shR@!MgYy6pKe8<=~As-W<Yoy}9gOmw)V|e?Mc?
zal09`MZ}AWoHLn!@ZWy#fjx@`z2hD4eAR1z>l2^)%qw5{@^*dgJD&37m%i*3)9lGo
zX=scHSlxEI;cb8Q%2)ozQ@{UT*VWpO{pi!5^PFEy)#w+0@p+@Vy8ZSe&wkzuKlYEG
zNsCLgk>rBWERdW$a_q>V{UhrlyaQk<sY=O4x7~i^;6)b$la<!yx(K#rEJ}8&@tmxZ
zmGY&`YIkQ!eHbE7(T02)vB^);VWd+>iL?6==F+aG8G`0R*_L&Ib9+(E_gI}p_Ufdr
zJu|<#4U!^HNG99n%iC$0(N=-J(>!V7q<Tl(es$P&B0Aj?p;(#$tvCmJaW3xz7D|I*
z!Sn%xC?N>YgyJwr5#IYas<({dW<;g)qFA+29hke}TRL4%AFu>Z^NlBa6we$r-nrx@
z^>#>oTAX)a+`lLfZCCjv1RcKgl8f(kFE@z2e|ZX}oENcn|Mu8@(B2&GRRwh81Tp1O
zQUi_fgql_ZZP(D%E${in!k%{=?cyPi*mKMkGAbq8cj$t!H0@eM)O9_o>+yK<b>HyF
z)^jKl()r9=G2BVUPTOt~Fb`#S0ik%%ga64ZUis>}9u1p|3=?4WX!#qz@!M{?>1YvX
zN?<B<Z{b8OCH5nvi2RSA{N!K1@4a9CWe+%b!Tz86i68%k7yW8wFa)Bz?|m=7{_C#K
zU0!YT3t#+_3}X?zfb|Uo<$nM`m03g>;ayiRTX?oq5v=M_SxVaJnsR&9mG`MD?A^ck
zm+ySX#TOpzi$r3~mqoZu5v<JFQI$rBXZ(jBYS$aWp8a#rz2xFcKk&C7{Mg4ncFi?c
zk0ZVGB`^Mee&A`!NNMaMKzEZO)r&9wk1u=3LmzU*)fYeI+n)5+x7={)#g}}|SASKi
zs`tMC1FwI>8yEK<Ze*YZBA5zWPl(4q>0dni$A8+^)~h7YL~E%W%56OSQQx{}{{^1A
zUh-6t=tLfv6!QfpS~M3QI&kHc_m%wE@wKX|{hWrNos>XhwvKCiF1z|t#MZrTK|kB7
zA<mm^o-;-NQ(a!1X^21R@~2_`U~}?m_Nm!lHuk;e)+gc2Z|-h=@Js-f*gMcc);~RD
z50b=?QKc`rkSstt09X|9oMQHF8?rGxvEz^D<xcMeh;+8Pn0HLUcfPOejIM*Hvewpl
z8MU3;S#*+erkzm==pF^GcDN5EC%<R^zN;VjW%s-GfrTCgAjvAT3hjZ_<Ku4HxdPs{
zYtslZ9ba9|T{c=>RiniPhAcu<1)EyRb$xXjU&G1qV=G36L~`%Gy&_;7Rdroeqk6P|
z-@bBI#&f)5l;$_Z0J*fdRM&N22Ro}GAufePGcc`B+e3#Bt*)#kGNOwxqlv6W<3WR|
z=yxWwR1CEOY4a|oh*dcemTYBh^=bd^>2JT`t!C+okNcPZ@mGJPYrDEitH+PN;^n_D
zs#+L7>t~*G+iEMT3k`YZ6^xmjx*|adQ4tGuYF3XOx&7F9GBzXSLh(e$bzk|Fzx<LH
zAH8j*Y2)4Rdgr%(%cCoE5*bQG8mb7m&dC=<&ll}0Wb3P|FMrj4YMKniOMmrO|MvZV
zBdgZdR{r((eD^#4*V`l7>%QUvmtT7DA3t|9&A?IgSSJFiCgXqe{Xg)(-u@@vHZOX?
z&w1{$=P%s4_SAp(^o8YpokJ9j#@d)NBNzfElcl}O<HaRYZX{-LY8GKWL2lPfdlA{-
z$zo(NVN7##e02?qf<`Gps_W79Uw8fUp8GR(HFogDFZtzEjlFZi#B;OX<4JSe8psbj
z76G>WRCE8nZ5hPQGFt02^gCw+k~_q?Iw{efJHZ!jw;pXd?ag46bHrKB+LccD(K)}l
zcc@nI#g5miA*IpFOV2<;3_Hv~k%bxR(xevwy^>F!ImB<bl;8P7ch)^BcdlCb>HIcr
zCK;ZWf#Mkr6wh|t@Ad~zmBSCP8jTJeJ{-LWIV5BWz{-Kct1@kvs|Y{^)`QkSx540H
z0|7V)9PHEob03qmc_EqgZJgu6Yrkyt-aMr+RM&Mi8lAk`XgnI#bqyc~j;yTy?i>D~
zv=@4GW)w_Nsu#LIJ(_qRdoR<yVHUt%OEEx04EYLWp-PjLX@1qOzwUef@9&;Ws^9xB
zzwy||JZ^oxed6ODv$Qmp@k9Uc@i)EskJ4mWBqL@ESKsmiNKquBl7gXby7sJRKks|K
z=gCFQxavjE0b*rkU0_w!&w1|8czAf1tQX(#!agdJWkWx5v1{qqHhFEh{%arh(1(77
zdqd#muXx4VZuqnN-Tx{WMip-P!p)<)CiI_Q_REj@)+ZXr-fQZI5J4y9VUK&vx4-EP
zzdfmu#%UV$_x<1xEbKjae05qX2S71gPojVvfg5i;@<0CQ&r@!4o|;USGU=hNZ6^zh
zfXt8xNlD(V9ewZnK9EM^JxfrA1q^+DXl=Tls!CS9`OR<n%Xhr1p6nN@LN%Jn3!lIF
zb;j|TCk<9-?Miu)56*!Y-B|#@P6+hd%gJvk0`3e|drP9bWmuliJL-$Q)>zH$;HlW!
zhuKG&IW=qbWu}?L;%?sX<QtVco|oFq$lmq%t1uQl1|OE<k=HYz$zJ)pEcXQfc*#o@
z!uW}r;3e-8!@q=7__<qGqjO(epIO4F?>?18X3yo4pcA&20<3qsoJ=MjA@U2i-u|rT
zJ-=-uN=nOmVqdaxH%&Q&G)k!|mc67T*C4;vTk!R4U4qOZFv0MWU-?hp{LSBd=_QBn
zed$FHyY9h%{hs$c_vfCqvcBF0zwh5Zb-cLbgTKVw#N!Z|0Kg@Zbz%aPr|o*=HYYhe
z1JQXzvdQAo@zwPoe)@lS``iC~QddO_Il}uesA1qY45wzJ5~i50tv>(fpY2_{xVZG)
z-~C<R^*!HvpDXTrd~FH|-P(b@d)ysuck!VEk9y=I{_HQ_$$B){Vpw@z1pC~LxBS}6
zUh)6_(D#l<)oWh;dw>5AAFs!YB70W+(2>)ppv?aK&)@mJ|NUVzX3r5p$dUokG}8kI
zFKU`KnvrHqm03j`yY;qx2M-=^o#8c$pQEyO9^Np$>3{z5kN)Iy7xo_PBn`EwUDe?`
z1lsN}=;WD%e(o+B_bh<5^`>l~_&(-p=*H)XfMWM{?jB$4$EJMzoRSSU!=hQkRFAfH
z5LP&`J?&0hKniT=(T<q~VP;!SX0s)aK(uY!c3sJaxI?N^oghYZfI={u0@Y|TZI0KY
zMdJvPAq?)}6-s-|&@xP9FUEOhFpwdRM%6Q)`7^J3&8ybej=t<yUUI|RZs^+SXf*z<
z|Mt7L9X$#g$IjzfgcxS_Pa(bat$*Hho^uWbqLZSkM{8~Kp7*`)-S2rHQ<cVJ&skuV
zQrl$`CItn^U^e)5MntI^Ccv0~^v8bq;DP;Jv;KD<`@~<o`~44i@WX!TrLRb&Au3;!
zH}}8a{lET^Uq7zu7r)>I54ry9T2iDHM;clLgBHQJzx^-&!_$9I)F1uHpIWLtBqXGw
zjo;@<jY9Y+*}`Zfc(_os3Blr&QIAK{c1oHh6B)4VHeT5K@>l-G!NZ4;yF^#lJmTSB
z_uvOV2pucKBfsGr)|%L}ce#`Is!zKieD}CBBhZ)3(^l;SsyFFE4Z=v;%~b6kU$Ov8
zD4KwMVUMSL|EV>rHZ)A`((D1rWM;{Xwu4$&-`&``KntrpC{__BKs3OMN<sjD8!2~r
z+pewBn{K58Ws()zCd{h(`1*9TxTl&ddX!{dP;%G1-u0e0zUdDh@ih;*;J|_FzxLq)
zyY<MiUwYAtXh}Oa-4>D<ts;t$A4Zd<_x{ZX{@1(T!>V>dCK|i8jqD2xOV!d|_lTSg
zf~6ctscKh_$*K^HbfGG+FCr8$TUeZU&ZIx-36B9h2fqC~{x6LdU;3)o7OFmliqjhI
zUGt(Bz4#lx{!xtfho1U<FZ@rhN%aIlSQ=`ML{wb|2~Ez0n<1nk!BiBT%4N9+y=zu(
zT|aW8jh6zcfBvGg+$g$K)r$uYSxRdX2uI4SGwa`Z<C{GYo(-O;UwPGUKJ#aO>R&zO
zaVy7<|K1z_`(qyaxapDAG+u_16#=l_z`lFjDc~x;lyYs=rU*69LFLBwItC4%vmT4{
zFOax<>>hVgfH=*laJPNnb;8_)=n-ApooEa?XY{G{u8|d!hGH|CU>1?*v{5VqM7E?H
zp53p$`l|Q5>#s5#;VIk@6)9R~Qa$>;H~rzWfBpsIh2`)d7=oyJviOTHc;Pqy@tcnv
zT|r6<3rj!!^dAdBNGIvLl?0lZ<xmcFjsUt)8Z8vN=+enpR})ptVr~p#qIqSFsup$A
zb|3zm_p>rVj35$_ppeu>bm0&C+Uw2mn%BK<X<=-Ze&_#Z@7-c%+p_bZ?;CTis`@W`
zpFXGC9mg>Q2?beP?Ib8Nd5U<*0}?!t2tfoqSO^Ib6mc<%5D!QoD|w1|KnhYMViYUH
zVCNznNDLy165Fv*z}UfYx7}`c+sJ)8XYc)As%ot{J|5;;RjcZ+s=w}kRsHkRQTN`v
zs@7%BF~|Jom}7q9C;sBFicWKD>JpNOEXJmCVE@^V{F$Hq!+*HMw|?l~{5SsU|NMV^
z^|yZeemoALFwy|jVkn}kjuOq|Fv*Tdsr==nI<nV-<bUV~f8dw@&;PB~wPVmJT~X24
zzbgORKlh`5{zw1&I@VFBov>moMj<M~=qM}DLh)bx$e;fB3t#vHf8h5HZr}XGU;Qip
z(!cUY?}oKkHEgT%IT;zdxX@P;!CJaWk<v#NIkE{`n*4U5<Z%}>rCu{OoSR=_Bk6#z
zv&DO{lhM5Q$9Rs7T#7?zwG*woloDK?LOWGeakhmg3fW2Fu-CsT`h)A+p8vMN0z&Xf
zJ*=jcoHU>U-9ey#bzR<&QSPxS0Kfx{3?7Pc^pMiX)ztPQ;UbIjJ0I@;^q={!|Ktz<
z@Z)g&*MItN|BaviTW>%9e2kNW>sscqq7aInl|2SjQ8cTgypf)^HpeVU7chhnjH-3>
z_Tvf=Y;au`G%`u61|TG}sbc(ae^)a8-tYf`-~R*O?-9T8^{@R`Kk}!F-W5Y>WNaJM
zL9^hn&pzD!H-Gle{d+(3Zvp(_|MWllw}0s0EwA2qI%?b~B9jdL!QgQ;1Zcq`(gD@<
zw2f?kg`o1PUs(T2j-F6<EVGs<qE{4mcXv@hi8!_}7>w$Qf!<_@rw!TOV?FwJ{{8>p
z$A0Y3fB!%GPhJ(}kN?C^{E>g{j}1S)uj^O@(zv3;P4>yp&T$zT3kcRSUELMNl+rc$
zMAdEe1jbEN;4-=$u|oU!TwY<BAsw?RR)kR}!kEopo6Yg$RDD)_=8RX4Y|q{`T3!%o
zf|LCAH@~U6rsg}PJxp$LH`<T?k3aFHU-{Dg{it_+<7OV~bm*#664Z&h?1jJccmCcl
z{lYKxdjVcaQ4(E*Xe5Iyh{gZ)fBzD|wz{)PaE2;6+4~EB@h5-ZKmP|m`N9|elRx>N
zzxmu3YHza6X-nnXL|7>PpI`h3?>~G9p$KJPq8Y&ujZPYv?v$#d3SP%3*FX4`U;S%;
z{eQoE_nq6Dt6st3!-M2dL$Dwq*myiD2G{@czxqf1r@!*o1p8nA#^1cUe&a$??GF~v
zDo?n3<yEloXaBn&`{a`^-akHE-G21l-}Bw??y49QQzcBM`2PL-pZv=|HLB`weCxBK
z?0F>QDFq$?&C0=>pZ?oF|M5*Zyt{)O3@Puu^{6q{F^a$N4}T5ipvT^i{)L~4?!WMh
z|FA!}9@jB6^`=9TV`WkHd&M99*Z<gm{2%^_k3ad?Bmejx{}cb^kNm0C;>>s=wfg#k
zECS%}=kA9yUci#xeBU3+t&s8BS?ofBg(UWfiuyhO%s>76{@}mx`+x8U&pRL3+l+Oz
zlE7dvdL4iAfA~wk@UwsK{@b6HPl^Vj*_m_5<+Z$~^(^#dWhzZ$j2(q(r-s3bz`^kT
z;d;=E^~exY#72|Dk`_LF_r7<1ZK3p3g-3)GEM;~_f@XIA@DR$L1rsLnF^dUSy0W>K
zDR5)_aR1ov_Z@(RC@KW=u23Td83cKZbx{OWqw8K7>k$cem(#qUQIJbTzZX5GVnO$J
zccCm93b_P&Q%NN~9z;n_s5HASipSxj6(L5|=+i<nvmh@tgggY+LfSKRqzAN#Sh9O%
z(x6|A$72ZY5kA!rkfIqGf=3la5qiD*`v)V-GJuRRwYecxhHZ2}A~5#a%d+hC`VWtz
zQ1<FtMq{qui@DJ4WCVClJ<ixNf_1zZj8FfVk#S@mwW5sDQycYWHr6Gz0H*pr0*%4K
z*T44F_uu~P?)^QViGW!sdQh(|RO@g(QGle-cLDNpFc`^Elv2^C9!x?d&fd-2baGHB
z0f<O{B@kf{jaK%rT&|WPJR6~mL=&y4)w{Y%Cv`kMdyL?$Fyq7t76o8d3`P;a0Hm8}
zh#lR=C?+|MaV7R|9Fr!TEmWaa+6I#BVN@gZs_3Mp3X>w?ijWXUtLg}2t9_Hmlcy>v
zDfNxyxQapm!C(m8lSo2Sf<iT{9>=2STe>_T2B<v-In^B^P=>-ldmPqeh*dNT$n0uv
zA(D}CP6UhXu7u^GoN;pC^1rjG9Mz~AocZd2bEU}%1lrI4%+LORU;j<G0>j+wGTRc2
zlNnopBKh=-6oUhvcC(VyK{}i`v%x|JPO|9RoX+GQh(@&`NkjxaS8W_qH7u%0MNrE@
z+C9Ogo5QKFwWkVnV8EpQ#GIr!`JAz&@LJ-M&G|~Xz>oyV3CJ5Q*+_%Lz=rlrtxHYe
zv84VyqlU)L<lme<Adt9U3d1@Ggc(Kf?jj-`O-O8$Cc!Mr7;fwyGBQq#U}a>Sx})U6
zcvtYI<g?CsCTe!YlD^VZ!HWid<;%bN@b1HRzVS`E+jEUGrBTn<hixjbH$kffKcJE-
zKA&E5@+aFU0glTb_?h>blb7U%wzFVCIm7&>mzb3g^p+$&eP%xMAWxEC+4<?>q$<w7
zAjxgsEh8giBZ77Kc|)_aR>p<nWV>0<)y0{gj;sxZ=={4xY^PSp5Fi9Ae*W+N+^_u7
zFV~O5eo^dqbA-=L-dxv6F4bk^BR?5u=Rz|!BUs$4P1w>4@<3LYGZ0U4<~T{cUM;s+
zt!4p9o#d=1#FPf^?nMY*M;K`Q>A(3me(hJk{QljigI*6=NG0PCo<Cy`o+{%!36?Jz
z6<ZxhU6DaNH5u-injiJ(tRMM)=gqNB|B;@nLOV(4c0W@gw~07~r9*tA*RdXtKmOe3
z{+FNnsjq(dSHJS5FO{McZLS>9BFen1m6rX?m*-sCR4rnI4s>eSc{iW=qUG8C;FM}w
zQk7a`J>|#u*N2}D)*U08HElNDOCeZKXP2}X*>5NFP&4mQ4N;3?9eF66)vT~a?$Dxc
zZ}fF{URus=G#()$)@XS}@AY~fBY?uf<7o7k|I&|t_1C`g8(;oPkOfk5ZSC?oQv_n}
zms+wBsI4Yjt~=(KhvtSuLz{7H;VG$Fy#arwJo4yo#OFL!reJ4Au;#nhpV>9p#$>pJ
z^`9WDJ;=U}W#?e-8NoI*zXg5WQBCdU5<i`t7M@(=tmE`KKdOoD)PkvNQ(CX4!WHC#
zq`IbL;FrGi%Rl#bf95;i_~zHY^6Net7m_`9JuV*+&$b|!Pfps>mpsp*1St>AeXLiP
z&E@1=$gug(H=zYON&m^&$o58Ww6B+Xc7W&Y{BtE(m{xh-4^8e~=PZ1lmcM>iRVJ??
zj@TQ!xA(@KriPsW6ln$&pv*)-@}`Pk!(>cPoUAP{cTUU9QRxi+Y=nmsWlwb;dp5_O
ziyLKrkR{sWE(6TWgb&~O?B{>x=YI3+U;E9ke(f8-^;^AAgy@iLqU`>HGx`2P3wd-N
ztrNZD61CnjUCsXF1l<kSUO#h7<6L(F+QI%aPMBcLElRLkGWlFE?8GfYcwX=5+2^<2
z9^jJl_SH&B?Y5rW-4$EA@Y}3uWk`CJ!9t7?fE6Kx09PGr05F;vK_f}JyCao`nYmTc
zf%2**5JC_HGZ&(J+Qn-_W6keUK`Jw|5b7Awmf<tAN$C<r5A8q37}G^U2<f*m#?g3O
z6h&Rtzwr0}{%?KtYs0&{ul&lFKK;hG&0`N#9g~#hq;<JuMV=3myk-`q4dXY@?rrT5
zzkGrBoeL1G_Ga401jjvnC*!0E*7|IEor~y9EMpQA-hByj{NJ8_80zJkMB7<H6Jw&q
zy8i4t-?{tn;qKvKJRaAh@%zs{tLl1O*B)caA5XW5P)#`JH>phMS?Gt5>hJchudd&`
zm64#kf7f??mjQve>i2GM-z1UrSjS2ZAiAR^LenDau6|j5c>jJh9)o<izyId9zIFfb
z5UVQIaS|MRe7OJGuYdL3H@;Pm#<8mVR?Ml^pQ%CSEx@C-v(}sAeT^WNpFB&LdtYv1
zc*?P*jP(iDz6Qg2865XIJ}<tx)>#pr%v`u#S~=<d8(;plFaOg2dw+i)JyumUdKjXP
zwPJL4_mITO+sjMx*_URL6gP$tNP?t=Q1)68b6wrs1hbMTilQtFcdzSOE*jm~s-2?^
zbqPQ)Gf>jw<0ENRHLmMg!e}^ryuYtTW3THv*0HJ$D2vjhvM8!iRTM$b<(HheL2`|W
zFyqMn@G?R#+|8S1JIt6G!_D{oi_3U|L>%^@(=J^9lGh1o3T2idJWRuG=4=T7qgZ=7
zNJzp6p$s8_Gn?p>-+0QgUUaVzU<3)mqkFAMU#AU6$w|<rYTl9-E36AN3+;YklIdbw
zStaFi*&^r9j&?&vM#g1$wi6lAQjRQ7u_A&+GwZa~A;J)ISzg-wx46iS0+Rba$NA!;
z?r2T-Ov7&EhFnS;bNv){>gYXjq675g)kKI~x*%|+`fr5=6`1IkmX-+H+$MuWHX`g#
zUq?!TF}a?m<}Q5GbLZ~c8Pc||Ys*)6c^1i7Y?d!Fwo=;VDeyM4tQ6THSY%kwF&)}!
z@_PD`ai$YG=}jV)z_uE2hu<`Xd)vahtCn%yJXr~lnjEc3K{#7@*0!xxtW~3iYs+dT
z&C&B6ar-tTUrwP`NRwx0HL*zF^$<(;ZzuW;$vI6Vo3c{>Rs<_IK}N<3C(|e~kZRMQ
zW)>Z4BaO3Z<Ez4tDTcK83+dkuI$beS1k7~QqQC4}spc|CMQ34=8|t$AH+OC(SQ#06
zpMXh2nEWNSBD7N%v?%H%EZ8EP{9<z0aM8T9aMzn_1QNF3SQ+eY_2rF?Y)Bcoe>1_#
z$T*&Vnd2|Mh+J*$i<Z|#=j=UKC>m}`44&$)Fh?LVGBPqU!OF-uD#PNjel^R1*3=*1
zRy8xa9E)4Av<vLt%rP@EGBUx+$hi1<|3F{v(y~eROx_&ZvK=!rGBPs3%E-v*!ZNSO
z$jHbzj-SoQ$jHdZ$jHdZ1S=yWBO@atBO?>6jEszojEszoOt3OCGBPqU9i<Ws001BW
zNkl<ZGBPqU!OF<U$jHdZ$arZK$hEHzfF0YksjqqdU8C;ntpBUSy!fie$fIB%cDsi@
z+WArQsmN@x&yV-5Z+9||f@d|ZUopYTwXY9j{W}isZW-Y7^?kOLOCot>=P0v0G4I80
zcZ9F~0LvcLGsnsndoVI&<cYZDjqIFxP`u0(sH}r^C~mR);6C>u(Ws1X<&O>&!n)L^
zJ}J9Bj?H%-RU2Nxmb_@Tg3GelLoCux$-AD>xPGnlpP692y!GdH$jJS*!=rAoK418g
z9Q?`_n_DSkpV)nWP)GSmMn=begqi;`UYh~z{8i;?C?g}|z}PN=rOc9_bKu!oAF^Ss
zQ{h;IxJG-Qcro8YJl+=E^DOLkCjKM|P&a9B^5^sihad@pKvM0`pt)Tn?sXlQon%Hv
zCRiJ9=01(Cr@wBLpL!V#fXhRGI{6v>^e53Jla>eod~x=mqrCD-U2wam*z;pZ>hhxI
zNCZivOX-g-3{YV$uaexos%rvrLU4&dB3^4hb{f}u#!44^24$L+k@2bs)<v#yUtlGD
z_z5@@ECLP^5@Z{iB+u}DU*wu+V7Hty9Lh*D5*Dm1gBglYkPIQvC>IQMtO3Lr1r=U+
z6+OyphYJ8)kN~E0XNhb{T7Hz3lOr69TF;*2UjCYlFe4)qtPMtB-W2OLg|fFgN>D_d
zHh;Py$QLqz^J>G(BHxsfng=zw>46Mo(d(B*5oin{lx1mV07Q3p05MkXl2DDRYE+Ge
zV~?uFV>%&vRImUbeVODEj>R<sQC#UXPF5Kwr}<}Oyd=TOSbvdCU8sCzccFh=x-i*{
z&f;z7Lgu(Xt4qTQBxrzHuu$|0D?;zO-|H7wH#faOuP6*e5sFZRvTQ<G(W5KIx{5K@
z<5<_R8rOI4@9Qd7qp}{=s@)^JcDXN%V0FjxoKBmh*-sa*yV^mssp#&}beEJJ&R!no
zsoOvFlb=-kWMqPMym7ecN5>hEyK~2bw$IAdKUYr%8#%r`zR}zSyx#^ndDppTA;X0e
zhM5GAZbp!y7kd4o81$}guC8te{p-Qi^=;8FLa<&hfL0EA!9oZDM67GT>+v+bRa9I}
z*EI?Rm*DQuxCD21cXxMp_u$&NCb+v>2oT&MxVtwF!B0Qm`=1{BrZ2j7RgKk4=A2cF
zXNh&mDB;Y`0M!Y0aAfY<^xyTzFOuP#in9XwOQ{CHs+;H$^S0hxj1{!Q7;eV!z*J(V
z62B@tdvh=MfETWT^q1#T@5g`FNX1pzdil)#<ALr0dzLem$Mut+9cV-+Fqxd2XI9&d
z{mZ8dhIQ8j7p9i#9MV$p4JIsD@3&`XRd{LP>($lk=gPmX=XU&5j11Fzi)d@MuUK_3
zj@wmc;k`u`eUN_=4B2ti4c~l#Tm|YtTib@421%q+-aj^zNTrLTSm`>unEHbDg`X6+
z#V)wIPdo`si&>jqLjviHz4=Ug95U?DYc`;1WEh(+LA}1(+^2~szx;!V?{B7i;TB%D
z<2iIpd#js*7yJC&-CrLcUoNK>FBeCCd{&&mFvv61TwwPat)6G9evPq$LZ<#F@<n3N
z(=bU;t1*}z52d>Q!Q_pn%ikN-{9&bhGXW%xQ*i=PnqOBOjE~c8IQ-g+T#$*NB?XR8
zO7@oQP%Q&u4IhfWuaAB%{+_RMxk*BwuAf!H9jDvBdO?N{aY0GnVJPYP{k1wInmtZt
zO+B7YEaw>HWwi{zf>_tjuFrqhD}=~34N*@?fVd(e)R9FSWCXJU`TyVjbxguE<Hr`^
zZ6MbPpBZo7I}3Ha|3f0}d;WL%kb7RFZLn>mE1N?O0U=r@42jMrOGb;P1q%<GYSW80
zUWAv{Tm8`>eD*LAwGM}b6P5rP6y)@acC+kE2YcTC^SaDHBlO{FZf$L6Snc+AZqn@l
z5E5zd{n)Y7mcbKjuiGptm8q<Gi|jHR1V)Yo<LoYMmrSU-;Cw;4WZ(6#r}4d)s^CCQ
zGPL;pYLXq+C08s-I(nLX3kwT}*xAp$tFhYTloZ#T2DDfs+WOe`AHn{f{triY?WDms
zsYyb<?(dH;N5#2rDteHxw5&835vB1rC0knse65vRqGobfxhA+%e!V22U3Fpj5KlVG
zp7D)!_D@HMqm?xH`1rYG(*FexC3K((a;fe&gT7vp9{hm&n{{wwin(0nt)Ax%$5qtA
z5*Qs*&l*z~#i3v-9r;=bJfOg3$uG5HO?hzVcYHtXLw$dJtkUe1XjZx8{hJ^>2AVA3
z<xCfZR^3*5imOIgdip3hq$!~xTajah7X@#E&C2uP=<M=%dn@Se=+V7hD+jwDF)W%j
zXElNkjkwlR6m}uaP%#!lVaQHa1n?J0kUcDU*%SM`qT<FyBY^?<P!WlNzfSUvA+4@v
zCO5^^A#6zVgG~AlI~z0VtA-<o$m;=0<<E8*%G#D$hI%JBZfEDMp!=i8%gY@wFn`5P
zmIgB_C1F_B=HTw_DHBGlR{T7(E=<FX3lF|IX9HPasWBFdl$2y--|ioa6%6|A@tJw8
zPA!IyZKua>1QL0H(Ed!b>2MjeeXF{PkZ5X(t1ae`Lg~e3XU=72BRYl6Foh2Oc+m6X
z{)}O7=dVD2|JO$=m(6c-<_&b*a`>8YR>IS4bVA<xSd3WF^Y3SN8Yof4x$VwX^uzzQ
z?CVE72UXkbdev77)Dz7vN0lGe3?#S4_>lYEerFMKQ|_}_#|9=ixP30PL63^7KE52T
zx3_CAhl9HvydD*Eho6h8!m?6nH9nseKp_ETMlDJo>fyN4lSUo}-y5D>G=<`;R9pDE
z_%m=qjm+!#Vi4HPC&<IKdB}eWDft4zJlW#vz_z_mVBM*0Og=Y>i20Wk8SFKkoa%+2
z#*Sf^mkZ%>=C=yT(~&mz<&!JJ5FyiW{JdTt!I!N*@GR}y-SgCqq~mX<x5wTl`%1R3
zMG2saHq@lT=A@*gG`gLw-tloqxCHud_MJV!^|q7tTK<H=E@f5mPy_jIgD`Alf0JWf
zJotHjd#v*dKmT~Re6ZnByWf3>zs^uB!=2$(#Lw2Ya*%20!g^d3TU}veM)OMBZ5sRz
zpF)l$S$|@Ts?&55)nu%bg0+UKP1+#n0)KA!Q0)I%X#6NoV1qM0&k8=uEF6<|d|5!o
zJ`f+DNuv{x?mtaz%<s<?yK))rB{e)$r|^WYfT0pmL>sFTS$!UKRdr$f;HO=R4IuXc
z*7Hf^0zeW_E=aVoduLt2uSZ9_gM%lHUBSV|8Ipok>lgL1)EPz<aL-MG=_x5UjQ#UQ
zaMzMkq8IR*dA*}1Qp4G^oa{McVX)foMGZ~J??&G?r59Lz$P!^hD_zLLO-{hqM^8pK
z!8g+O+~NhEVRh8~$RlbAn48spG{(o5rqb~hZQh{qil8?-_<eTY^7pIuN}@i=b0VSO
z@3M9o?bM7jPF7`sa)~AQEM0i3&|V|ifp{(G6vd%_@kd-t{35*H5J+4dXHoMx7y=wk
zD8{vpk#vE-SO)@mqf%*;D&nl2D<|C2OX8VK@@s#WfA+p;@<Q5wr1m2B``s|)?XWv5
zG{~@}R<PrHTj7Z5;&8VwlRM&MNYWcqh6oJs0Bj*_y1GvFWwXRgE$bW5RyYS+m06qS
zBo>2yu<1{*A_FHC^Bak|DkOa(U@-L)vd4-F&w)oDF9b_OZSDbci6n&^?};;N<jgaX
z`b($XBT(K%l+}vfS8ZL_UNoE(8G^{Nl(Mi$<lw$XGVT@Dk`e+GicSCp|6ZfM?W-sM
z@ap~(A+18M<(y5w=-*>8yzTA}jpyDQfcsGz44VmNwq<@?oVH2wUKIGHyv~{|lF17m
zqUv>D_jdhb(56iQSJ=d0NiesYh`>144x+!lW2}Gs;&*NSOmuWHT7OH`3@a-uGBFla
zX{9g#VSnwP#@M2OwU8+L8IMErts5wT!JLHVwJ63OMqF%UojWi8izamw?Q?F!NJkFA
zyrC5%scAOmFV)=-5`2Npoc8RjCziROh^`ezreiU9GF_FlNBvtDl#T;nH#9;;HKMdI
zYgYaW`I=p^)|6qgzPa#!+5dhP!)eSySTkL29%M8;c}HHqSW3}cWyyVGKEEtZq{&<{
zOtT4@K&H)qMFaQ;`~NON)>TS-nDYkAJt`UHMRCHq`~KER&{H#c<HF1<WE)z7<4qVi
zL#05re-cUiYjD`Qq(>D}Rkx|R+}hm-U8@R=2PcVh=J9S%3g5xLd`aR)>`Bw8)!KlT
zdu6dLSIk?8im<*WBE&$5B*~l@tiU~>D^IY4;rp5b&z33TjI)7mZm4avTxFj$cV3m@
z&uz%u-5`$N?+!=6+<n;k79LJ5T5G<-8{vNoEx(i<%jQM=b#3F$rPtK`#pvRG8rk^)
z5OAZDuCyN%aROrPDo1u#P66Opsh?JQJ#OCUm_8j}Xq{3bLz=~>FIO<sSJOsGD{pfL
z=Wje!6h}`~Q`^Z-xI2amtp>?+*~-85?_M|_{bE2_Pm^7Og_f5lVr#Y<KmyT{nB$F8
zPpwv-G`BZjSgYcnh$*$s(wzOG6QNk&%;Mr3^YL&rt<z&oj@L9ysH%!3u`Dqtnmlm<
zFnKC0n$!44=Mtlx3w*aKh-H?&CjeE9sJ5a(mP<!*Hzzrh)M(H^6>=7#yXzM>JC|D;
z4}Kus_Ds_5pJnXI1#@=S_uxu5ZfZSnwHtMP@LZ=oi(xh~dsMo$sPRs`TvDX|PBaI<
zEdRL+2N$#Rr@YyLe>M^qsR7O29#-+l$-XOR9XM$PpU#ppXMpAC;1^rJ%6I>c=}Y3h
z?M9DnB6EudBpcr}uQ~S<AnEouT(&7H&F~uyfj9ni*x$IB_gvBB?hIZUwSLLW`!Uq+
z9EF+fiNI7ZS@Iwt-VXCPPqtp!<?L}@7Sz!j|3&ZkSCmd%=^6sAOoI<}Z0bDC${4Dn
zR>3aCx&{NK`&u3=qz_PE9)e?<<Cr=x{XEdRm~2V(_*iodPFK}S)tSdZx0rDyPuS_T
zlzvRFWeZ5AEm&6#p8EcONv)>gh|#^pn#VW?&6F_RUBid(Ajf42@kkl~51JPnyacKJ
zoBiwEkKNr5(|<hitZjY<4mg|0_P^>C#U2fC+;n%)y1tq(jUu#X%iBJBA?JFJ-Od=%
z=8F?{5qNEh-DxZ)T3<CMH4fpglt$4-On7*9P1bY`B#}99au8eR4N@sbSD$S$v6rO%
zS_kpE{34hv+V(kD`q$Ff?qWD|$RXe@NL&XZ*IxV`%GRyNC-`mmJis^j@gAXTNnJBt
zTZm+N-&Irl!H0wSRT3T1o_Faj%v_vMhf0QN)NrnPZsnX$i#5?+Sr+7(Cq&&S+j%TG
z7&8;R&1tEcXFj~CbdWLFMwl_HMk7+!8`@lH{$r-qkB!rT<Xa9ggoD5>RG;fCf{4CQ
zUkA{^h4mR@Cg6Ba%+SX*;t6A&(|CllXKlXQKvG;W6)TUkXOh|RWTQFdE*WOvLE+$=
zxo$2~Wx5wo{|@tu8!v@a@r?}+7|M5YSts52de-$-i4}sanRxXrptS=bkQ|UHuj;BZ
z<ofRO#N$Ua!Z+MS%`{-Dk}EvaYCP56`1d)jTDRS$goD8ms6Q3Bk@f16fW7H{B7U*P
zMEKsRR`dF_g&#$s^G$-zsGim3kVZi3{925F$y_q`^x}mhh9ygcRSM-Qs(8H`^-5@?
zr<3Giyolv7A$0!N#1UWs&@YPDQzyOXqahf8C)5*+hgxl?;ZK#cWi#qT!g08o7&hqi
zUf-T&kU3O0vgp&sM7{F>OY?t#2M>Op@fK}vuUj~tw5Mj|?)%AEnQ#|rx+QPNS#Ia|
zSv&WOt6zYP+@EPGNrC@VP_9OvyptYQ&Q)uqTA_h<eHpG{1`(Z|{|`OU!H$gvfp8pr
zgadrE13J1G{4AYSaE4GQ^OV9Ra;WX#?A(glVwgDf?|?Clu}M!!;0M(k^@$WD+|x%Y
z7{AvMsTcDuFadV4HKDVw#M_zr<X{(Wae_^!0-z&<##GI)qz!|?K>m(h*kJM#h?fVX
zRddhsP<%<{K+P$V0H#Xy+Xwd$3T-8A1s@MuZwGy@wr>UhyBOTxY^W>hnR-1#>r`kr
z!d6mV;@K}rp#<Yu_%!UHie3l^2+>9fcK#Jx!CuDqNU%_}{-MK0w6;f%r$h(_=Qals
z__CEQ><DA<oo7{5Qm$`2U>w%v>0|dM=%34z4vKw!;6Po@ohdYNLygV**=Vp+#Q#d3
z=?p8yp=niZRn+39?bqwoaF{rfsed@ox{pYDl)>qb@U2>A8SN4=KM#}|s_Y~+iv9kn
zYzF!SJgr7`KRrENkq#&A;~C2J$aO}a*|$$Jc4nshR}c>CO2J$Giv!%jC+zRPqiLw(
zjYai0Ts(wjcW1uOL&<hYL)s(qmDvIzh}<MHmt)OIx00^5gnM4^2fLkvJ6`WWH%=M}
z^z|E5T;s^FP~*O!`b8o4KI{J?TZ${>LN@rwed64E^l$HLW~p>b-H0OiP|B}P8uzhA
zx_IgjA_{Sc!2CW>cp`Nw@qWlGyZT`;5U{&>J!t)OCG_g@3AzDoz7M{R+%!~4H`dt!
z@ZlO#!xv?&EX%;-|8E7ng(;F~@PEdmk~FcZ&eWqwNTXQ&uBtq=`?d#vPXr~oh*S!x
z#Hz|Rb2h7oH370Wc5CdDTBT4IuT6bELA#sfq@b-$;f(~6t)xiQ#S_<xtlJzKvm?bJ
zt};J|J^97tvHwMMFjYp_peU7TQnGB6KpE1le1*bt{W8Ug?IJF*xQ{1?RNDBnTMRv|
z3RY@#jVEJ=nePm57o<99%1NT-eMKUjw74G?rQG-MG5CsF+<kK$L^PsW0Gie~Y0xjz
zRfsV&6OzgT?-^ED>-XmDw}T?0MGMW`z$>St#v|uDM(=Da`?dZ$9Z3Wiu=-!K2H53S
zyL-9#0Dh)KG_JZ@!XV<HaAd?H<beWyKSkqPm-oTmgJgLy>SllQ`eX3=-P#+~dvI=l
z|9TMowV{q^4#95?I#0Rx)U9?y5p2IBWIBfE1jbjREru4&O-#Igg`iA(?;EzemHXpK
z^;LU{y(MD7sh}Sd_EFk{e8aBf+MHGUqa&!rs6W8R4{r!zAM5=jzum+2;^mc~!6Y-r
z7FAWHRM(jcCN6eVo%?}Hl*otcAde@|?rsnd0eDNU_BtN*s`5i7VyO4&Nl7P0M^~~;
z9CJh)fS8`vqWZ;HIjtkr-FXK?VhjSmE#D(5``b)^j3KQ?E`pBq%!+^1I}K%W6f9f_
zIr>jw>fEdtXylf3m$Pv)51){Ly}qet(%xp25ihOzp;J(xApG|SKg;0RZ{s^4&v^2P
zKj2(~APEe<Ew*YGR}qZN*}UyGqZW@;5iAyu+?=>th|~m@ktE(5pgQbIEWaC#7aecG
zUQG~Q4z%hG5BU_t<A)s*`f2EU|8p2-c#{l#-F2EwB_i=B0OYDkUtYV{5^Z%8%*1rZ
zTP7V($WvpgFP5p}!Sg4Qv?1t{C8Sjo_{VE%4$Zk>`3>3deC^!}nmvC&L@E?MdGMox
z@J20+Sx5rM+>WXdR;l{x7tmmD5eW&&xhl53FSg=69%gy2jTg794$^@3#t5xXP_$=h
zyGPYgRcl|_WZhSG`xD7P)nT)+R^08Mwpe!dse3Wquq~b#RstW)Pn+k9Tz=bD$u>cb
zK|3QmdWD%o{;YYFIIo9|2F^k}qEY7zz8LLI3F?upUi#YUlFbB~n)*9F2H3qWq++T#
zmi5T}v1!Ln92g?;B*ogA8XBB+he9NpnwpEA8Xk+lIHuyW#P4II)ES*aqmIg)Wu$sh
z%+qhCt4ZCY-4?dXw<mSx!WooPpJxM)Mn572xP3*PIAPVPriwYOg!sCd``0pym%TE)
zp@hO1e$?96FP-5DnNla;Px1@+N}pFy$no92mUWh_-@f|68v7CpEw5TVUZlFzQ@+J7
zbT6^2P3Wz0<HIng#ItrS5aA#sRFjK?y-ra=>;PFu_xImLrk0+ERp#-mOC-hWF52;`
z%!t4Mj2gSNx(wzh>Xh0R@6IBAH4L4mvoTZ}=Y<cgnI6w&q}Fz>+fnemMKfu3f8+Xo
zzjW$a((oL`HPAx7$)dtQUGc!h>t9>2znjeU$+up(MYuSf;r%Ax3j~t1Tdu51uI=F$
zD7qTYWz9%s{V<Ghy}Nj!oFanLXLQr00X`bw8f)16d^cuye?q|Z*5*tE4Da(nQ`$<E
z-GxVdpG_`=Pnv`97R51ln7Eidgs=f$_`d;=ZQ{2gl&pQEsg_2whLe06*h;XeC1#f)
zsN!Q~>wR$V8SQbI%mv*Tm9s=0EszkR)m#Q_lr>YY#b2eOke@){9+=kkWWue>qshoG
zokx8Yy3y$kMkKP7jH}(^>k;_2l4of%bML7=58Qy6J?A+Ti}}I|L=)kB8{4$*QB|kY
zQ)C@H?5!L8hf^Df4)P=-HpK^{W(Z4l?u5&)yVV4tJsWTf_`e>$d+xyqKi^#qRci6`
z5#m%TeU%M4-9Cu1szeF2y%EdHvt^Cpr%4Cpo3O6ygK>cW5iFTM=J+q@-+jfhHi(tg
zkgegT!osoa>ZQt{hcr#6DA{AbcMb7crTs4iNDY(QF7bWxJi$!aMG>5W6q*0J_X#og
zWy>T_q6>A;2JZYn+>nj=d$wSVtu0ETX9>+F`3)yHDWEd#MEDQ4<Pyz*{ExZ$AJx-b
z4aQ@Ni+RxVyW-8m$^oiAd?-z;9Nkw->&0CPpw%zt6gR&g{2OwUglTYnIrRO|2YFz0
z=Q4>)-0OQ1^BLc6VUo_}7nkU}{Pytc%^-!afmRvu>uc_py$_Ekf_FcKDjFwmt2|}Z
z+9mq)N?x~K<tOZ|h<rzd1A&A1$3S|0aFZ!6`nATr30#3X<>sqLk%p$e0LRgiGmdq@
z(?loU#L_1BQ~uz?ztffZY{W8BP$ie&=<+@$^Mm4@95<M)+Q+ND&+Ge-0!c<#l1s{R
z*9EWgaj@><o_+&ddJ>^Yl3X+Vu5{0PkJ_*)=Wr!wfU?XB{l>d`TLO*-QRF(4qBYid
zIGo}Q)XZ%DW2q+E*?N|Fgd^izxhXe#@LD97)jLcxIi88WR>D+Y^H!aPd3Ei<8AY|o
zSL6R`+y6cn_>x91)-}VORJ?~fW?=kTY8U~HamKM>^`KV!^{6}?8+x4P^X`Dg;Gdcw
zNK3bX{y&<{94Rb4*MxN8<?xnXbc5~NlSm<e>0fnO7(u8Vf1GmA5S1W(Ck`9kp^wgg
zLxLG3@N_fgxfsnAr%0WGR(->$`pIIfAmSG$2W&gJfB(cEUsUB~A26)XmbL!Bd4;9B
zk|dM)N1D4boGoF8P>HD7AO)o`)vHa^sBy$aD37W8TNptdK*>}TkIkj+PgyXSI}e(c
z{dWJ~+wlD%V3-T_{33@Y;W7Z(s#xoQsy}tm$##{gsZ*_s*Yt>|<OCQ)A~Ft^BpBA1
zBAq5Nb+SNZk~>=m2IY)$F$1N9ZbnA8ybo7n1qSxE_;__1ou~@f)Zw>S25*M3`p>z;
z=48%*!yCdVA#wMmU|fvrKcX$OEE&C57yM0!3UY0t^HdnD*d{a(QdClsm0$aF_Td4%
zyUsvBnF@|Rb2_jF8Hiw)g^S|wjI#+biZ&b3#W#7qSJt+;<eAqg;CaKRob`*VaKJt>
z@wDznOWbx!%7h)_Xe_w|VL>knQ0p^#N??+TtLr>l>t9)J?mHjI5c#~DxAL+uvasc=
zJMv3f`}5+>KO$=T#xvt#dUY<mXjO+dB+lTHGh@?xNE(+b)$!QdsKixk#+M-+apAO#
zKflHcQaOGEaP@&CDgq0^hU9pG05I|3L2=_|4+-NYnh=4%w<^FSm(7UA(w_!!awrw4
zMnj2w5!Lfvc|9biGh}s0I$G{}GY@>V?&jQRU0f`7=q_xbWZL&Y@~`c584_38a(c(r
z?LFD_pbtDd?!Ir75Ag0=eo1PvvY%93w-=fzD{#ThT^(AiFEGVb`xH-lspSs@X&+-Z
z36A3IHY+ylA=Lx+dapT^A2+!J8!WfC{VEiGt-ML3riMAPY35W+lFz|MOU8<iP0j;g
z!^>B2|4Oydde38}aA8z(sYv3VDzQ@w@88zV>=iK$E?YIy_|)T51cj)2MSHDS?ya7*
zzXtv**Y<yrk$$wz?Z6`GELSQa=5ibG{qh2hkWo-gQ@lD~j*m~Mn<=4#S#6^b6S4rw
ziWc%6;;$kBj$o-Huf&&~+QXr=?n4kuXj%z821j@n+jgPHbIoY3E04A>Ja;ZQfeeK{
z*Ifj7eQ;Bnr*=w*#MpR+!OJ>HWx+>dsO8b=LFCkU!Q^mLGy+T%;T4vkt3^VY#SlGG
zKoO#3iqw3f6ZW0)D2;w`Bi?tRoi-j)!}w@5gNOGAH$NIVyZwgiCKcS0Il`3K$q6LB
zpp;0^q%@Unn2Xn_RcYOQ9;tGu6=3X5?J{G?dZra5;;UVTN<7KFgt-yV#BVYN7(b?N
zI!FzlV$^_5evrM|oy%7vgi}oqnN1W8DK#(DA$Eg@PW~1I+gYw5KX4$odJ8+Q&L|Jt
zHL<2q|ELtkJ%H+~H8ENPrk=sPYrMR{zw*EIv~<iZ{$VKFMg1~a&;wXvsil%K5n_CY
zY18w+CwJ1In@f_@KU5>6L)bXwzD~8772y0I*AFgRJCLQmkExo*N{xx8py_XV$|avD
zvJ#CWCuX&*i{fPmnT721hjpih<l&qoPe7C!62c{O;h(y3Ji#lJFqZaMSN&Im{1<|T
zpTk1bPi20jd`GJw{QtE8%rr3cTzo%D$i)=+eWbEd)%aL!e#Y3aHQGS+@Z#EVL>XYf
z6F|cj_e4&}hPM;OK}6tDib97M3mSpTfd4nHuDD4RuOcw5lZr2$ek&`rg-ngiv_S-V
z7MgOWgc5tc5Rj~-f;Bk_X&!%#2g8yT8apjf2Zgqt=ckPAnbvChUts&MrtUyfhy}Df
zACvv9h{mvD`vT8k0gGc2Qv58fS9NwFyHH4XsUQoL-;g#(C4$b8npR{Y*HoGa_$3*_
zHI+ES!-Nq8ltlP%+x`<*5Y}<h^)Ap>p#wzwMbtcsp`}%d8$?)2wj1bVPGoC2EPwMO
zV@VK<L3sCv0LFi|MG#F9ll`fgb&0*OD{B6<i_5mMu*k#dzYSFM8~3Hd74UC0utH(a
ziUZYruIqknt$`28!3axup;@WWmz8ZH<`_pemHkD2Nnf@(cr<RCJInJ-Y;y~b#v-dw
zikxebj?Su?1y*tKLpY~(H4XJK&J}n;Fxid)m35XGw{xD?6;#`%y4ADRM7h3e59~iV
z4EiqhoJguRa*rfe#~3s`tWV<UXbyL8_T{q1J38@Rg#+-j*;evd@D%|BM;2ye$ZXau
zoc!Toy0H#ZO3`Q*QnGF`DIBmYDNQFFIxM`Vi5fL5vPsmYj1=gN4tO-b8&^)(p7-;K
z#V^?!E0w*ymZJ1udt2&8eP9~2jJ{#U33AsM9@U97a>Mp&{-oG95QDKbcG|=G+I2ne
zAfln7A7coxWkI86r<9~j;0TZD7lS~`g2|rPi-?HHQwYaUi1@-xeF%%0&zAKi6y&0a
zDAz2`7?XG6PG1vj6@=kHF{fOCzOLhBEHnI<4S?>UKp!LQX(=yWHMw=wioY2YXy2AQ
z$Z-*aR@19AfRAgxClB>y#=v@8iWMbQ&W$ca?paMkPAwCN{AJ~YXEfdhN<$H#pvG^G
z_!Vy_!HSNNn9$*{9U540PgbU2A5=BXL%UkQ<iHqx>EyiEopH~rc7u-?7GCHMd6lKe
zh9t;2Yax<n^*AN;$36W^`ivkr{u0HSIF8F`JJ4B4dw!_zfiBELJvn&K$z<8ZKx77U
z2`mH1U-5aK6Tw)bTsm1cO%*iRz!-wH+~>A{+ZvoqcPK_m6`Gig8cM?Dky}L6BXKIu
z(MEx5H@0F^aw>AjTmnZapqE++LHDdO>-NcHt8*>Qr&J|_IyW#tGVTJL*oC9le2Hj-
zSvgzPlyQxM*`BM@Jo*NA8bX-l-M%_zA^3O=c>m*dG={ZtRJj;ILms0a!|}y@T&vs!
z8XJ<D05Bz>C%0>7(FEb01tS3uEXT{htmO#krUVQuIwc`~)n-30XOH%s79<+6TjNbJ
zW|u>k8$p{?fs)FW788{_Op48*<9rP-*gznLlyHO=;4_RCQFO1|e56w2Gv;QnH~WKx
z?6&l_DX|(h^xN;-`O+%tww39){F%@B1qfUz^CTqlaBOg$TIVY+?Tb?A{Q0ZQ^a`74
zDSIIE`u8N6W7yaxqSlvLBZ`G=`qMDg!aJD*z5oilvWk5@T8fX5wqHhVYck*Q<1Ru3
zog`ner)un*eQI5e=UJYTkzyf{*9ors)>L5tKkM>9EE@v=60#9O&L<>{P6m=K?0VK~
z)}lM9h@S#$tN_i_sSwAW6@`TclQ;7K;>7WEoI33}PkoOftk~oGLu6#Ux^c&RMFrQ0
zgHyo2q5F4r=G>8$7>_@N&h5I&?d6q98*rp{amoHK)AmUwy$74i9leQ7io<2_CfrYP
zC45+dQ_-n`lt{20Whu#HEDi-r)<;4ql?EQO7ptEcqDsJnm^u-0rGCD&&Fb}m2pM%`
z4RU;Q(R7gzI3H0|x*C|31Cy|>$tY|EF-63qSv;Zz`0BB&+Z#1HYK}rS(Vd7XhfXn_
z+~9iQXq;hp4_p1kXPG00%ji~TZo$YRb?@K0HXQrE0S?EiG+a?WRL<ChIsD2qhpBd6
zdVi<+6v@IPs8$&iSAhVZwHJ0=wG#QS(Ihmi-^9Z72|46N6BQ~G_v}`wC8%tXv(0Ay
z7Kbg1p3EW9{l+{mk|1mGSX*Bu$3A98hyEKu34z!GRaL@T!$zNus?0yJ#fEQ(2?^V~
zLDscmZgchrh#Qmxw@>AH-xM8I&-R>p^$FHNOjB3Q&C^WR9G0uX$`w_#)VT5rV3m2a
z%#x#L%$KXV`D13vvD;zbJ!ss|s?X!9vF4|7Z&G>T!#%dgDAQ!Cu)+Eic3l}k3HqU)
z(ZLplz-g1A{N&w;pypP>j8*7bMz1jyyM%`&?T3QOR_m_uN>bQ%EFeD=ns%Ihod;PL
zfKb^EwB4^aq;UVvWzv=C5{aES6d`x+Ax#Jw-lz^UBwDw8j>!5csY7(dxVF3?xrM3$
zpbl<rLYm<r$l^RXxco&FZ>%!&&`yqoWLxxjcJQG#7Yn_{Z9#CM?FE@qsMl(qwn5?G
zzUD(@>5&Bj@S$|~S$4#}?rbhrakKdxWVCz<E|>`4OBg21E=X+C*23g%7+@!rzo=uk
zlty;d4jRZ0d5?KBubCDsRbLvugDhS_tFmuA#DY(F?)N+QL-29pv=!9k<BQ+=E*6{=
z8{^|W0IikA3mHC2T?n$y{lySEC^#Apu*M3oR{e%n<XTN80Axryz@cmcFqwRSIM!Br
zd#yv#JytR9(hErZ!~X<r%P@H?+)VVF>XQ!Yfne3QbQJ^`ZBZ;6F1XZE9s;JC)l?g+
zT90rBMEa?CWHB4S0#perqa$Hl8tbBo-k-*=0`B!HH-`VNR!s{Uo%x@C@uS1CX9oH!
zq1ULNr!ywM+fk_56G-d{Ucf7~RV7yb%flBKkbz?&<C8I`C&;4b;J3Y{+s{O*<KSL6
z#jwPnb1xTgL<iPpMVC{iFMQYFniFR>%l(qe@_;2jEEKR~G!Lgi2ki@i$YD5q3aO&A
zHd0#V?<-e09*GDC;qk=|Znq`UIW<(uJ^tkD?djv)n364cW;c8kPn)OR#hY(|)BS6N
zrlYcu=K~yyUaK{Q2m}YVq-a=EWGPbKc>0I3PXx#jVhXmWWhS!bX~1~NcurF^sw^=K
z$EOl0-R|<y47IZ6?6q$0#Rzv{(m&Z_7;!L`5`{XmaM6K(1>*!OP_bMHpe!(nVHA-}
z+I%k?oH#*Jr*fA^Y>G<Z{R)j^1#Eb~(F`giI3xVFhTN=PZx(A@AA{7Hm=1%wnEc<Y
z*W*;!x%>XDu0Dy9=u9aMCrZ<?gMk`70Ft0H4+WQPV+;Yh0h|2lD0Q@=8b5H<MtzZ&
zYCw5D9|6KM-ik~1K+VEEZx&L7)wWfg^&NTZg1jguw7)3aU3Vti=F$_|H`iVo<|it4
z8OE99H<UnM8@auT)9*@5{m-VOF>a7Q>LkZX^y7ZdrrJ>Cv3S?(KvboPm8m?@=NwoY
z%7rWEOegs)bmFums;f9PQhDD~eSWmeIXrG_3*7OM_Fm{J>KEsu^4)=yHW6zDF_xZN
z^oJ(eH3#P*b1MBQnZ|2*W^37(P6-^GXttKlu|ohfc10&3#gF*ObNFHyF(>3IQ>jo;
z2%`6ozit`GK>iizF_8u)-7N7`Y26S+z@Zgek%nQ`Q|}r1;|`UE2&5hRLC2a1&XeAL
zD>a-9wtyHjpH2r}Av|F!lpxhfD{sj2z0L5s;d77Phy}m@r<rbS{tWZCrDu&?!2n9P
zrfZnTi5##HR2j*Iv9T~<?L|^6Vn!z}C+qJ)`PB3430s!#d<BI}vCLnSEEyR!mRW>h
z_>f^hJ~5E*i;WROj0t3fI<q&KT8<3x2=9<w&<B{{RU9^A0-jzEsQ*<3l|Doa`Lx7j
zBB{d$$@!*db}B_tPg`+OEYc%hbgQ^~=O~)G$W771&a<+UO)q#is6jK5xoF6!Bx&i*
z+wp;K+{l*ntx3l<u(qc=BVpo!Yo+@X*)MSLC|#PN?U^c-QH*}3#;QHh>MI6wRJLhO
z&OYnF3A#rL857lxhyud&sjC_&W0`JKj+r)$%}2kmj<+#57Fu4JL8gEXlk9{VuZJZ)
z`nwtAw_O-B6GY>}%|+~Zq`!~aTff(EZd?3UGTJ<5)s_T$rMrsaLCi>7M8zj0REKKi
z{l!TchJOCP)K(p$o$8kGp8#iqownX1JEs}1wtB3%m&L?)i2)cpJ}*~(O-DM9lN)En
zxY?OAe00Uvhj-vRBx41h=yD1A^Tuty5f`1g)EwTsI=`1pQ!Hl^9(uJ;(}&wXiI1nS
zwG~|uPO;||P`Ai7g{}~N<CwMY7a2g96F4Oa1;I->tDPh0gmiMBp|Xx|eo>HHEE@ca
ztcEcyv3mdKF}4ene5P$!CRPqz1R&v)j2lg5CY!DXnPYMLh)hE@3)H#bK%e+=o~u>X
zh7ek6*M<epUF_>2j`l^sXFf4%t_&2KZx-T%5iA%1r(^hcv1LK!An*KW?{7u#-4MR@
zy6@N4Z}#PO!_r2RlN+XwA;0(XGNvJB-H{qDh4^kA3fnj?npC}Bq?Hg|N?9HM**<M|
zMqc^65TE`2vftSUI>f=BnRF*~>Jq3tTe4{5Hv8emUX_vEiBwprmgNMz-Rs4fqV1TN
zG}EUqH$>M_pH^X;B~F#?SWR?5Ey?fN7S;}Dp%;OKkB|*L6Qxqi@7M73qURr`uJ{u(
zs8de19nY=wB91jGQ7)2xi(V9CL2IBnc)G58aXJ^jUsKx|;Mzy&slSWhiAQsqcdYE!
zRO>n)2T9^mpeI#-8B?jaV2Hzcbg<34+@og)VIOo);iL#x(2c6lF#YGJ_a&2JJ(oFa
zP63vli9+)aD+hL&0!BVACpE7se=c-Xv}FHSZCP0pV$jzzVi8@@Bs2d#g`dN!98e^=
z`H0T9`NV9zbYe$aS|#?`ntQrIz_-{aQvMPAV-T4F$xq-(CvIdB`h<<<tF>~qk2m*z
zr*}T{DJOe=IW0AS9lBCla!9T<%4nO8OvrugQDi?<FZcB^Rev(`m7b>eD7##}ZJjzI
zaL3oQ00hBtEgRoLUZWhqm}{1U#OG>y#ZCG=FSmDJJRNSk<a3nxbr0F<IFn3gCYF=L
z%yeZ82twSj`CyROuE5vle1@V+VG8SVzo5rPRFM2)DpdwJEelr+z1HEyJ1}EetRzcJ
zDU(8}UVX6tdhtaeXNTes^(KStuyf_=gBZ$IA?k5@3Kdov2JK<s)4Wbq*_hg6I%{p!
zBKmID#FIf3FNb~rmvEP?3W-U-dC0>Ks4-HP0YNx-E}0&n>kTJ<o)n#LNMrTlqb}Up
zsRjDDG(J8v87r1hvU-iqpR1)h231PBuP)FSTd*9|JnfKo2VLr#?@HT6vC<rJDXouS
zOFMSNsNLOSQ06E)uE@_%SilUYx9_ATJw8Cxa|NU?8L_8nvd7@+8>Go~>eLFgt1GZw
z%69Z0Dj_-WE4QkxVh(Vivti^mn}+qPeeVZc6xi{3`~3jc)0()6*`K>>oi>$VGGNNU
z&?nQiZ(4ap5DItO745r=V*QvV1<bGIM<7t)mlCjzi`a)-CCVy7?!Oe6GB5n~di=S`
z7|-SI_=S5hLDH3Gz7-`PB`FXcu6zHLq@@$*QPtbyH8tXXO#04!^_F3V@HcpMaz>wN
z!?wY(WtTV~^n+O}VlMr~7+G|$jmMJHvKTexTieV0Db1OUPYR%Oa0^+1iN>Q(sqM5c
zlg=s)l+{dGtxfB6?9v!`=2chcB{?N0M}KtO!xR+sE}`&xdDUd7!lW>2<#5vEuJQt)
zo}UTq7W!gK{M9B@?3}`7=JRX2u^OVFk~cj}!(6OGOx)%X&C%CsH3`EM$91R$YGcZ5
zZ*IzK8mZi89Gh%=SvjN`T5YdV&*K;NeZn(a^nabqw4W4rvV+y(=IfmfL(;Y&A!^n+
z!1m2p?(M1Cehf_t=~4VJ9VX-LY9+V5YA?o$-`#jKDBjVB&JnlFB%B-Jz7n8Rq|Q13
zkt4z(S5moWklJSHa86LRvo?wF6=?9O%HCGcFd23xf~AIrtklLy!#T+0ll5ATArlFo
zH3x;3^Yciru-x#rS-bh0ap4tMa$C}wTP<+c%(^ca)Uvl=#cNRw|0iW+CNyiS>{n#|
zXM_8NmVaOyrtZPMnvq>yJuXvL4(31mUrotjYINj*MYxD^@gTY{x{bWJE0JQr-<nlH
z;-h-9PYNZ8j_X)4J1K4higReTvb2vjng#&6MKO*f_={{rFc_%RT8i4u;4t;(m{~YR
zvu{?&evpm&DbU207@CSWLqr=kw7Hbiwhm$B`ovCrP`$2B^O!f|g{jTBA=?qhQIqmx
zZrryWu1jM6Kn6j}jT?_vd0zKx2!%fVu<SHjj7L$!Ceh?vSn*oC$oN5jK1L{7epU%T
zu}^SY>S+-`^o(<okwrrEXDQsp+dytwlyyllbvL%bvUjaZr2Esn)boRV{H!?c7lX?T
z_V@9XI~O7JFi#56n$7j7b8Kt@^-UP!5a6$xcXujByV0d4moK)p10`y#1JhSIv(l89
zr*w9b^CdE6eBld~xeBk585BB~rAL!=6P`p%J+fU`Xl4YXDDGC`8K_k$9K2*HfX`LC
z6^eNYcV)8*fC-l%$*;(AHkIn>dqyIp9Qr-40jpGT{3-h0ZmmW^6op^OnC3>476yQ?
z82xs~6`IC8*V#3gtD&2{DBc@KLD?e(`?3?inqQCrnT{(digp?~v1{2hF>S9AB&9Vq
zR=*Su5F~P#Y*XWq01Ki6N4HiBmjf-v*)x1Z(;C1u)G-PjxeyFOS5?U56ds=l@uE^Z
z>_s9TM?|p+O5~DG8^s{$SC+Jc8KMv!N}Ay5Y5mk(Rsjs4H(WvvWxBORp25trWsj6|
z!z@I>*91?iWMY~!Fi}9)$zzH6EdYgG|It<|Q#?<bLGgAR6G!Nc<0+t%v)o%*-09)G
zIW;u9im!Z3&yGU>(w755W!&k<n-#Txz7_ijqZKcavT@n&#oOs0WEl#K7OX!Mj9qZE
z)`=*@K1`xzcDr&t0#wJHjV%3Hj|dB?Su2I2R!1b>tO=kB)h|C-%45*Gx^-njS8N{&
zR-cb*n8;_~>+zB3`ZpqOEzpZDBUkuRm$%@T$Q}542hYlMA5U@ES1k|&GK!pz<ClC3
zz8HE<F&oR=aT_w!1f_WD1V8albotDycMBZs(I||7zK^ji=G{`$5iILz-kq8Yyb9!U
zZGwb_|4jPj9d2$gH-tp5lnjj}q~252cHZ<gCY^nR+QNO6vkeX{fGS8UH`|H8$w$o0
z<7j^H?!d87Y+T*18ye?j_J^)gp~sS;;v$^JHe?m))ybs@1)fY@3UNJzcl;h-e=W#k
z+qZaV`nYe)iM?bqD)5x^PiheiED1CWen9kkio4kC72pi9WLPizI9YR^>z!^gCXU{~
zg(G0s4>pZ^+NkJ6{hRm=+++L%bUqZp^=oZIW~DLC+hzvDzLKikF(<iXt=+x;dnqG0
zjH?Z1GX*Oi-6=HI4$%wq_Ozz#ebY&aF(Nfzz@3#1{<}U)R?L=!I3YT!{Sk3{%haT%
z<XabxrAn@xBqH-)ktvoE6gX`H18vekgP!+_o?or~nyOfk$qE3eK~~jx>5fm9pn#ny
z?=Jt()qjo0u4v}68D%?R*__9wxpr=Lc4Y#!d2VJz_T3@dDUScp#CKc<?Y?OX<$$B;
zm2V}&%U^qRt2`tlfu8#3$$veYE+jUwxY=W-{aBPcKh1N@Jt{C^^H+4LJXZj1{PqLg
zv5~NFJ+(=xRqQbw%xDDp@We03-FCI=us_>WctLS{yT!`)hJDTd4(@hSzuo(5YdWi7
zm$Hw}7W>u`C{S_Z+sAoUoCgV#1Uyc?I)6T1=k~pWKAc=Wx6C{x?>9{q772NK>#J=Q
z&Y)l=x1=U{D8c$7S5~ZV-2JO;HB#JMhpypRfZw4mjQ*#wfgTe)GtO0t)gBGq`$x(p
zz|4(>JR(YD;wzy~{(pko_S>)BaN7@?TKCd8B!5y=s7ldI;5%6nfkbAswI-}8F*-q@
zyZ5VSY1k)H*zK3dpu6gQ=a0wt*DK_HhQg8uHQ%X{@cNd1+X58u@%jIwtCuC>Q*U+M
zr`ZWMa}7Hwn*|`*nzO{zOE4W0m28;p&k<zLn;87ZNz>0bV5EZK!FO3KMs2?*ZGRMh
z>U`cA6B+g4QwW6Y)0Ss*cl(EQPnJgiNl}AwtA}EMh8o(r{P{^8@HTYY-RFJ%Q2%c^
zsQ2S?`^`)67uT;F9jFYsFS)u}Gho^A|H+g+-5AlsBy$Gso9E2|kYkfM>Wr8JZdsW5
zVd1K=R&JVN03w%ZH9<k%)qfGp(*c5)?m#pK>&3qJ>oHu?&zRt|{i_ed-6KWIAv`V|
zyD`x&XjsleHkiyTAB<Vradvu5bPRmRhU=tXE}ns}M{#}4pZdlOL5H})z5d37!fxM2
z$z)kn(yVJ!;^QeP?}L_w|0lgG9o3v5nMB)2K|E4{#V(tzO6$}kUg^y%b2>m-LzEXO
zk!&<$ElWU?f~UOxbiR`B2JqIMg96bz@7cZ}LyK_8M3>2=Hd*+6zJKhInvlv%W6+`V
zK|^9d!{SYvbahv;?HL9~PhOmX&OH4p3u5Gne(Kt59mGWwI(IsgNpGqb(oW>2Pwxmg
zWfiARxhq-qWEwF2#@JJB_rIR#a}0jpeiHh)soM0nyg{4%*=;~|ET6_x)s5YYfvwBJ
z-gsb^qNR3Qxo0TfL_TbKg|HPYEc9yPtaCIdKI2r%;~f9{7dC<pHg*!yVz{QN>P-Wh
z$Q%qD+tic+aD$WECBGWpS)VDabn$648M^bN2v@e|RNi%i-dbsZuN@MEunUd8Bj<H}
z@ILtCL*Q-XbN)g|&_n<t6Dou(9lEXvoPCtf$Z4;v6t<40WC37BrX~D0FPMVvwY$kd
zR;9whzG+&Jb@R7BV-++t1R(mmxKp~+AKq{)K5EWeoaT9io>pVq$D42dNn$b7HIXSK
zxI&MconmKivh(7AT$w)K08E3~IDE@E_^L4-s#4@K{X+&kT4ZHXg7({@vMz=%#Ya&<
z&N#29!}`yWg}x7}^<LaP^qu0rUm_@4hN?NLgrCJ>X3MM+(PENwHj7b(ck3G$TB^SZ
z`R6bAr;SOn^FnMsR#kH6^_Bm*JL_2~IPLu2zCY*qa>M*ro_lhDUEs9mF0H#huCBoE
zu+myNTC_e;Rj@{oV0(!7nWH(wq&NL4ns^pshQb!VUlDj*gJlt+SVv?h&H(Z(pL6Bh
z_Di+M7e|55o=fS6Cd9)irsR=Zw&jry(|mcvT2zn4<@nrZjH80jFook+HhRC%zQGM%
z*L$jUI2}D~S2!zO^GML%kc=%^=7FLp-2f2<zR`94YHoOY^Zu5$<t_;?iRRhc{g(-y
zu}{u;&fX0qzZA8myBm}w@=)a@*8mDu(ZRBw#;0Z{{ISXLT}fD9O=dYabW?h}DR#XD
zIiC|2!E4*{aQTv3zk1906_$tb%h7mCzu9D>O|m>)oNI|Gm-oqj4rZJ^v`xM+@#pK`
zUawIVwjV?p{g9?H9TGaffwZvE(25jGUD4<N`Uo#e|HUAFLEA4{4}56<?EGA;_ZE8<
zGeFEPrFO~xFkBAQ4Ep1fW9;uNn=nGp@jTYNSpNa)4PUM=2)4X0=M^okcAyC6&Z8=?
zyJKF~LpbL2+vsrWL25qu#dg{<yiJP6tz&g*_rvz7DRLxgm4>+h?{M|bsQJS|@J|mm
z(YfD|Yi70VkoYCx*D$tJfkB{o%!%6zSz00xS^ZaALX)mQ3gVFBIx6=|Z7j{m!8kG+
zJ5TZ#$7Ga-Q0ji^?{nt6dIc6v$Js!URFOI}|LZa1oBH5Yu1)zH2$$26TmDwB#pQVC
zM1cF$t7KZ_5%P)GyR>lsXG_xO)2Cn1bs){vH@e`S;ptLtgo&+NuA4;Brw#>MfmngE
z{#{7|4?-NcKJx*BHPX-J?u}+Ag@tn~@AP5|N#d#YBOI4Bds_Nas<j!iP(+U07b5j0
zAkPknr}A!Eed;;UkbG#Jwaa(-_Se91vY1B%Bo|AK%@@W&w;MD^wgk@{&;F}1<a*&Z
z@9NL{?Sg>&;{Ke$No-N2htLJTnRUE2PoS1i3$n%5_O@>A^?Q3<p8iZ|OSgB}-!TpC
zq1tYf{KE3C%pdqyk>l4>0&#r4dR3{9kV&lA*iSYqSO+*K;~WE-W@E5BSxzzVM@>RC
zFd&z<o@8qtt(2s&sRfz^fvh+Nm!T}YCdN6US?n+yKIfE73)jU<(vLmog118&50Z|I
z9%3oa^wi2ulQak0famHy|HsSa?SO}83X~LcO-$cjhMS21NKelyAC3+Ce6<bE#%OO$
z^FZ+_Y(vm#J*>Lw4VN2Z4jJm4LFFh9LO%y>TzrWDA^y)fZz^6}yg+RMZ&5nBT*_`Y
zI{h?r+YBb;XjxN}QI6=_3EYOb%&9*v_osc%!p~`q{BG3A-fNG?_h%}9RZr*pw-z3q
zgWeBzqIRzzFfJx}WP=Tfz49%O`|rHy>Dyp#oZ9SuL5|ShsXs}wGIUo}tWbo(SkCS$
zAw`mfBFiu$YTnBreP_kiMi-$=&0CJY{S(7T-UJA7uko88KboX+H1UX_avVy|3+IWg
zGR_hUyn#+LzuEFXJ?;y*y?=-Ck+BlaXZ5n?{lnO#M<ggqeew`R+V^=exchpgW@JMT
zIM`(5NjKE|dwB=lzt(1~>Z>U^)ZOzTizaq62tabFL4$x_m7Eo!!HRt=m!eZipfhlX
zH_;OVh<r^|6{EnIw2a|msYAmUL^KVdVuK8?!P+oQaFfmLg@7QWla&zFKrnO;jGH<e
zOnSKZW^psh8zNb@DW~0^YFOf|Z(<nHPy7=;2BdQ-!25DK<NfhAvip#ne%0dEQ@0K_
z577pCdXm5BYT9qo{#|JXSSUiVjiWZDmWjZ$)Rp7}tmxa=$}%1MoRWFKu&g$lm`n>`
z!puyjp>!aYwHu`Ya?%VVa0=ZjQ+IjQ`aq$Z|CA<p@#3=nH_T3Qcr(ry8Y9d0nK~9N
zsnteC6WGn0mwn|I(s$?|y?i<-$~8E~+8P>RnyRkYIIW^<-ZhL1jeBc&#k(6aKM}E=
zt^zH05u6mD80GZl@_6S<4qU`aHi#o+OQ2F<inAv~Yhz5t!kS>44>C+-72stJ*vg35
zvPPl1%4YYc>NhOfd|n)$`=wz?Ai||uf6ciMVfK8IFgCy^e{B?gJ6QNY{Xtx^sNPw}
ze5$Les*0dB)O`xV<7_+*qW(M9q~4^F6zYan1$Cnz$X}kzJ=P{(hFok4VW@BoZJ%!F
zONYwR#ZHEiU>pA%y$I4REZJtffRU#-oFM`kIX;YP1wud6eQJjeA(BvI@UToj=)Sn)
ziK7wU%@*R%YwdTgQBTIyQizW4Lkrgbb|?cqUD6h{&8sUapsS1afQr6CzDOL69l|_Z
zHg_q(Q^ACs4~}}6YE>5Y@|`$Tb1@nbbLjBy2gp)*C#o!6klA&t*b^}0mB3`qBL_Ol
zjw}mVqC9c<pO)Aoi+}o+?fSO=(95(2ew^&rts5d%?};uNMnHYr*P-OFwQz0yY<WNV
zw$E)$Qu^1;p`khGaIseZzwMA5>It+-a{^3?P_n-J2aWZZB4J33(xHP^85J%Ws@-OA
z+-f>u62D*=a?pyyPRIZy+5BK<>G{cJal*wdxD--&F;g}<${O{*%CL+<19q^geb^)W
zTRs7xKI;KfDFRD!uIe9KcP@VI#n!>--9q1zU@HbAVG+Uql>cnvrtYq)iEcg~D;`H&
zJee)$yJ{T)mJA})E(kbmf|l;))_l?F^Q|O4C$g#5r3*dG|3)zq!W#xcSEglWH35Ab
zg2-c(hx@x1zD(#>ck(%jj@)g8>ZOMEnfG@S>T-kmw93y}kHvn?zGcqd5QBuOq9Tl%
z*jSXm<C740C|`?V;v8)h`zPUHhfNxLnj+v0p*95L+<YFPvv-EcI=j17nP;mR?B#iv
zXh9k;%nML?WQHISE?8S$J$Mm3o@Gov6yP8P&u&TeAK-}ols@u~uE;jSA4XW)3s0*%
zPeF)Ai~|*0gZvlb`);WtyCZDubQ4XDyj3<CU<$ejJb9C?*t!m34Y_T@sEzqKU&bWH
zSU#|+o4*N;)Io;Vk_z$*Y!rWU`05=1Ubj(`MN~`f4S*(<Jbe<Px(fNE*8dX&>ws4G
zCk60u@?b@Spct{d%%E3)U#R4Pf6ff!fR@(;;yRgC?B!$<rc0>BvF!O_XoG>Cp1!}z
z$6qy14N@vHQn6(TEq9h<=|Pcn5<YGTI+9un3Jal_+;@CjcTCXw;DQcDxj@S{JsnC+
z?f(n67D(wz$XUsZ$%hhEWZi+bhEz`$K+!=b${#4T3r+%tFqSU}j)^}Bpp|CNE{tuT
z%O@2l7;aUNibTo_DFZ&KpNi{0;X%>&vEKnqa8@T)MMWi86%`l-Bh5?}tcey|woPc8
z&~>42t!rZ!EEp{?1je>$klkpcxm?j5F1VoN!;ptn8iq79)?}q+S`B$+7?S8B09O{|
z@+l*W8`&Pt%?rMP%&9g##7%nQ?=tNZX`(wy&YY9Q3#C!<Y|<tGFf$0BHP8s?xQWa<
z#kj38ZJMyZ-_c%6ZZfyLJ$H*x@|4m5#A3UXuB-DhhB*~l-pXiI=h@>p&7#&l+ycQ;
zJ;+pSwcBF)KV}MT)3(+{#>Se)+TCt9qUl1{Slh;~jZLr^5TXS%G?JhzixQNThMaTA
z9(`zrl!irGuJRDLT!saQCDJl+ZoV?bo1~5Ghhu7uZ}wwMTi2C;>TzMc0FBWloqhHl
z&JtshxDt)W{BsWImPB%!I_GfhHgHVL(z??7B>#S^3t)&I0!b@vYPRNZGTIfyw(Ws1
zX;O@W6b=%)U?|G8;ITZI-ry$MyKTmgWU`SY-MuobHzHWFP)DI+8{v}}_oyRk#t;x2
zwtds>#@#mdUFaLeKJIj(Z9*Gjl&c91#SpA`F$|JHz%UFu5vyUy$}0>hrpCHOUW6eq
z8yvxG=_?qKR!PH{r(<@}X21)l53fGCPU}i=-V`@H`>t99Mp^VpS<22ENnxFPt!?LP
zO6tX#r4ynaZ_Z`1AFDEOJMPz*g*JI(O#ooi=y56tpm>2Es>aE53r5Jwt{w#hz(T!M
zZ$z-Fx3*$Sk5HqZLNqgkCd7tqYu!$>+lOwq-D}x)v2U&GV%LVYjco`~QezEiaG4n(
zxsw#ocC9;G%MM@VVaUUfS555N(1lfu7MFQpIdA|2=*&6!)IQ~Y{WPZ<s%+$8@9xQZ
zYUFp(Xz(--ATAopTN~9O<<&Bgrmf--Me7vwY^#++vj^+c@4q0leY-*Gy6IHBD+H^e
zVjB-nB_%nS8LWwIKx{(S$DP*t-FBz5uD8CAyIs?_q3vTEV`Gf+qTL-3Mi)krbr&Jh
z-5r9^gkkWMd|0MsU?eOKAzCoAz+l4>X#<dQcBSIysC&ZJn1<ahoxR1Zpq!8rOA0;U
z+candY&B>Y2-!J<P*G7)30B2h@28mD6$Ao9WN1U*$G)|0C-!~l_nN((X19xd6WVC8
z4Q)U)1{sV-hs*@0U{kn8fCm6_$z(A!$(z8~gr*5iu)rYzGzE7D<nB(7j9D2Q8{}3z
zoM~+5XUgMh;W;6+2Fu$dhCsP37dm*IrJXaEHHYnL26{zBC0G^j#9qo^v0-ej>#S|q
z?1X+N?(DbwJI!t%ce>a|i_x0K8WTwqL2-&8#aW0bgy8a0sqdvPp%Xxe)+iA4oaKUK
zV#-5?$DCxo$}5A7a!PgYskj8~t5=7^vW>gJJ;AoaEmYJiWJd>nbV#5%$CfWhN2``!
zQBet2#an?AA2eD(4AwT*w4vK=cKXooHoI+T`?%A`z71Vq3=9Dw(0nW`TkBjq7W;uf
zpq1h=8ci0>lbgeB<X|F=G>R)*WhIZDk|$3-W^q+<#)`}A)@^ZM%SGH#Lt7O!tTnlf
z2Ro@iB--!3TO1wsqfEnE&EVvmy&zUt4ZotI60C~10+h@wAOwcin$FtZ+CFqUai@>{
zUbo+eu8%u`fiQyw8l7fzda2=B59rMT-v)}Aphy>@F?%*ECCLVu0D{?*D1cdc$O#+-
zo1I}573aa-4i9<oIy_S^9ZqE$56#RaxaC!=6bzliXvfYfomOY4W?oToJFq$g728O#
zNYbLkXfYzRq1$P8`nc0Kec$Xfp=&}<1VaprM$_yjICK0KAkCYI)^w8yGFTwYoOA}n
zHun2FPx@x3k9}iJL~N}w27-26qb_WakJE`SthewTMOZE4i*M6v(HMKkAVbj`aZdW_
z_hcQ#><Lh2=nh`-%g>L}(4SiN%kiS}s)~wRN4&SGj>}|WRZF#QI<Pk;F<bb93JU^h
zvKV4S>|(#u^j+vWYx}U%SZ4^q0%e>;4a{upk8%#{fh6Vfv&U>+myOz$fWZZi$k`8;
z3o{1BHZ)CWl2TSKJ)x;ml6Y2=QG{u3NPPYlsts`&NSd`7PKA@oq?o7A{Pt51)`@e$
z*q&$bcQbC5QuyZU!=Jnk{gcKOPy*9%m;*r3WaE7dhN;k|Oa^NA`8VO<hdt$XGBRC#
zF}d+TZCd%q@2N(+<+G{YphrWn%uH);gbQ9%Z^`vNJ#V!3JuDGCv*#Ir(m^oB7(<8_
z1(xin7`kY!!H5R35Q4#GZ;{OBZYjr~KPx_L?DRoMGBcH)1_rmh96}S?rWqD)Ap~Zc
z84?3RW(FzvnVLeLN`dEv_v_SXnAt=IwQ+Ffca>Mpn^s)`Hw@!Rt2_JP-P?Nj`m4qB
zulx5uj0`3<<U(*N;GWtNmR<m(Ry`5u9G2blKVw+-T$>Xojcv|X+~^6r()>L;-#NDD
zUY{>U>g+72xOBn1&-wmNZO5m~^)?CCJ>RoRnYW6ZZQFN^p$ds)v}g!{v5m0{T^qVC
zbWLd5&~`;wfq|p6x8_6fSu5fdF3ey?3ovH1u@QDM@+vP^z6xBJg%E=B*o8#`H(4^T
z`K4zbUDt5m@XB?*^-%ZmZL;t?88?}GcX-hM`AdBCBYf~tmz6-#DH_Oo>=IM*2?0>v
ze*c|bJjXD!r3U0qPjP2??I{ly&SXheT*Wx=d5e5UZqS_`!)$x*R-JDZCyYUerLS}7
zo7ncv&M4Pz(P##Pi$y<_Mp}vW-OP#z1Tx6F&~~AVjFGXiwzW1`<haF5+YIk$gCtPr
zz~eVvMEbL@zU24M+qCM&hD~!wPP#MuIlH#2l#Ary$(Ntoch6gSGd=!*OMSKR%6Q(D
zQLRbt?=rN7*E6|sXbi>>8N1j=YunJaZ5OR+V-rI#(t-h+!Wz24yqY;vNd#t5g+L4z
zqQ$@vEjAX7M%c7Rdfg!^F0|m_-YpJyzxdpjhkMaFQy?Vx6uG;P>llw4XpnZEf8Bib
z1@o{kHC3^_qT=3A3D!Hi5%~69)x>qkBG6#8rtM>Fj0TXRtwk&3Qzsni29)tc#El?n
zFtZRWwxR7~*H{y+2^LEgA;CwLlTi23hq7S;VOVwF{3(3-d0HGrV+WA)q`Ol;L<yA(
zbOADjVe#zu|Ki_04>@;G1Pr*(NM%JuC0G@Ymn)qET$G*4?X^aUpfNy29g!3RW3WKb
zER?Ov{aAV7w!Xaxzz3Kiz!4dv1(O*=3=K%a?jgeR#yrWYkL|(e)vQ^I{^j@WZ~p1<
z&wmW7WlIkR<FUkt?$BUdpci(vIE=sh=hg534Z~^&2pa1O*Z-;3Qc+O}R>f&Xg}K_<
zHlbuhPIYJVKQ=9?+j;9r(r7H1RdY6M5v`h()<FY6vooc9Hzp+nyi_k*2!t7fSqRpc
zg}`7IOyk#??xF#T&P>d@^F3mkB?M^y#W%aZ|D7GYYz(~>`x*nyn)K8#{(YNY4~S$`
ze){U$r(gV@hp%@$?|3d=v~>fU-(VLu$>B}S_{~oX4}M&!sJJ<*lKbOhS7v9OC}*on
zrtBh8a<fs&e9fV?t$kle5M~z4Xl54ZGFk{Bh7f2b*hQI%yxB5J5^^(|GlXb4l+-J;
zXbj3IF-pQjpEjr44YQV=%+EYn@%WHE(}U-ypMUnlllM}H&6D?G7#t4xbk3P_-o;zV
ze3xKl{?L5rUp?Rd`~P$J^;f%|cBR&6?&<sz+lz@5&!;TwS&2OVbMBPfT!jVJsA$Eb
zAy~R>9_p={3A$jN;aU$bUFD<1jYF^|M1KAV(MB;H$&Z=A>9<hhT5AFrc>EwC&03k{
zm=tpMx9Oa<RaahlFJ4l4=9SYJYSaRCfg}Yocosyc{D%3}qYH0siRX=z(2Ewlmr<2U
z=NuPGq2j0^3YKPuB^ygvPyf0Fx5G(Wy1M5;7aJ(HZZ17y$GOgmo}IZDW%2=l`q!`g
zU;b$kWAoFWxBcF0i^(~L3eV*9>1vbZ)YVLpa+S$K$kM8L`R)F1{(ku5AG)-B589zh
zcKx}>kDHyh1n~6T<ZXQXwYC6WbCy+9Y&*fS3pdn@*HB)8ziih&Q8rnY3Ts~Qi+K66
zVdorHi=NXNvQ!pfGdg^f(Sf4`$WAUCwkEn+oL9#_p|y0SQR1(7Y}_z*;M4i{R~PbQ
z-Dn^6O{ZtaB#$UK$-ppXv6Cg6EJG$5%jK7rg2&?LrZ>tU&XBuj<slD4N=Z2*XDGun
zG60cYuEYe0y4^@Crwvn3p>8a@@btGXjN?2mJYvsWG1K#Z!3pmwwfo|E{>T6KIwkwr
zFZTD|3$!D%EJ)NS25Np2b_IZf+c??EL_w##ckq4u!)N;P_gWn88>8q%mIIWZbLBVe
zmnb@~a)##hZ~Cpjn2+7?Djp%hx<O^s1$&q#4-Bti${HJtZ0jj}&FAF2$t35oieyQU
z*fi=ke!>R&Wpa*5RHGKB*?O~!(tShpH4g~qTgCBq9Ot}~EUWvmwv*@MYdU*>FL(;)
zb>8EJzAc{SZDTjIahca#PRKCnn9pyRek3sp49&j3o1RX`VHxEi%u0kZ)67cZjG1BX
zXJeG+V#e#)tuAp#Og=orI$7rEb-dy))SC{+T~n*A-{W+?A4Zp4{@J+`Jnz2v)_?Pl
zM=9|azkL76vmNr4xN<pZa>5)i$$2B1BcjNN(7R!||MJ_N-~7YTXTKemM^B+W!AM9x
zc2%--T<E%zAL%T4T3-^5XYZRPAn>kiucG2U36|eL!*ulLY?_Z#`Y(08wZgY~kn99K
zy4iwVnAveOkC#mT(w}bh$P|V#327Emq;bqdnt@Y@VEy>a>7Gz<31*b&?vo<$_*!Lx
z!RZ_BZ*i&2S=~Chz@B<`gR}0u?aNOu%%uV0M7%gtE}JSMXBqVqyMb<JIVa^_0)Xz0
z5`mp#FDJgb1QRt5xH$eyfpqF}6Y)zOejLA}+yx4Lob`2`tz>I=6K(rGcfr~<pI@$e
zG9`e9dhhki_`Bb}PJ{pTFZSO13k%%~a#3!vGzx`WlLJa3Q553M(5@Cw{`k55;j`6e
z|H5JUQLx_KivOC&rgyzn?9@f+loy|y&D&T*aTOJaH{lEy1+wR`)b%D9xBP&?H+?&=
z^J4c=yq}}{tfT}{^3pF%nAQEAMa6tRUY{UX27x}l%UvYQO5lmdM2@o~ksI#s#m>m{
zp1oL5@zlGxegd8cOG94eoE0?W!DG&z6dECeVV#TIj@^*6d&1=eXz*2X`N*+I7>jbm
z>`FZ4z|y5TU>8_|&YfkvLFx#%csf0bJh59ET?tfxg7W_1tML1OU9Oh=@u%I#KmMTG
zJ+P32xibN-QQ7UP98his&?41(?tl29`QqR3yMG>Dez%*Jd-7IB($`W1cq_9+7gA-d
zA0sO&-f@EU21mTxTSniR!_L{>^2M2SqREsBFPdH{6mA4$Bdw(89LsIms2nx5dfec|
z;w<QZscoM~o5EsFGmX;EQ@g8+lFD?|TYR38T*yCMazT(w0J3}bte`@ABnPehdn#|g
z1%fpSU(ki@o&ZmtQ%=ia<#Jbcl;o@In#k7tz0`>xWtTc0E|~_xaT7Tl`vI#*;2zo4
zMh6uyON2X@QWKzigJiE?wZHwxmtTFk{Mmo#KKb;6C-3KOZ)xFxF+mARfX$1605YvR
z&ejgEk!YbNExN@)_uX^**MC0v=8s{yc<O0SY6zCOa+0kRZywU-MK7qrKNS^kPOz>=
zBi?b6HAk1`7UlC09qW=$%c{oz&5I%>n3Z1lGBc7HCCpbIA3wv0wM?dIF%@KEYAcNp
z%`#v<#^~l=_nQCKSVPA*^F3Vbwd2O|SwHt@_iR4+kd;Jb<*e*3Hv#Z5_+emC{CXp5
z#gSC9(7FuIO38Dfbj69~kVAq`iRhdT^dm)vF3+$(w}f<kxHOhhj<G`B%p3L2c@T8F
zLi=M(f0LnJ+nZRXDCKm}?AfcANB{7D5B~JU@X4p$$DcfT|HG!;Sz0(Em!-Tz${<SF
z3TFqV=x#(bHp;zx|L_NU`F;4qzb*ds#qi?!uHk*DJ5HEfvjG)f@1%9Q!9)x?s}N$B
z5Xw#In%ewCMa5%te>@z)x)77NrLMJ>o#Gi=dk=1KdFw=K{g0CFbE;YWoMSa6p#vC+
z6aXuVn>J=*iAF$k1DPrDx=1jTPk=i@2&24#oU+2$iaF&hGjq>a>nlFduY0;3r<$2-
zWHX*Ur<}5K$|+e&o;|or?g}>MrfIC^(@pE3${^F3p)7b-&YqH|tdx)(p5<A}$E|tB
z1hM(;^SE7V^H&*6+N6*KjQ3iq{;TU+(OodMn|+1kQ`s&+x(Dh>^8V{T9ew-!p#Saa
zr$37yeB3;F8up*=S+i^!XK*t@S*~0f95NW1VaXWwzkfL#yo#@0;OjpvU%ucE-^XF~
z6u#>UCBzMkSplab%{;-?d1}^eOs3>T<n=58tqqAQ9`6Ej>kDnXyZLalPd*(l+cI`_
zyNmezX{Q2(^B<-B$414_@x@jgH-wpiKBvb9T9I;?61JuUiDZRoskmSOI(^c63L%t~
zubi`)x%)KunswCgca+CHDSIA}2G2*sGH?;CS*BG$L_}jDD@R62u&J8Q{l*+ikci}-
zJSC-79+qjj7?y(%$%l+ANRrVUjwznXGp2r<V|Aj|zwTNOfZG~%u2+Bxph<*!AwoN^
zSBrmoebn_szw00UW&iY9_vDGEeAMrDO@pS1#rA^5ql4jxSLx_5z4$JD|J|@S=vPOb
zrw;1CRz4?Xj^6HxADz%_nVr2n9qYTOK;w!-vCXS@Ma8{M`MdRCZQGCB!V5d~QM2m$
zx>S|fl*o#iZxy$df|(gW&<vww0|bPrjjNftONEt}5=H@Tl5%z!Ng_K+tj(CSk8wtu
zBW@3K7s_^$<t9(cD__Ob^l=z`wen@FCVEJoEHERJ2HDy^rW@Rdl9ZNH%APWO<-_2^
zDz65ulG32$6ESu7Np18Vb4_k7LAm0=SCHegS}{KNDD6W}7lRI8Ex!F~MO(C;@9gaZ
zLU7|S9=d$t8Bp`;<pAw_j>cUmj_n2gtmf@zi?Net_3o_R6&3f7+A3#@9At2V6(#7>
zXRl<V(=3#($3^fe+F00KvVKSaZjoc~YTS?ALSYUHF#z)HASok*mo##PlpRK&on4xp
zXPQ>ahoV_<xgdv2?w+$JSIXrd57|sYv?4}tysC)1iU8QO8H^ebE>FsX($R1<_+qg-
zTn&rl!;ptnT9p`OiK2pDvaar@(~u?+3{{TxRxvHjJ|m72ca(afm!2#Su{@Zvt|lk<
zae>Mx|3<BQn&+b3iw$$`U<#0M*}81VC6m2WDVtYAtf;62>k%Jt=Y_7QwM*;i(*jCL
zmMjzzOwu@(2aT#YHok|HOkRX4O+Gf7F{1>O>??_duuUpklMvLyB&u?1<|8Z8UvhXx
z&d4dJ!BWGl0Cx`|UUFK${EV&jPblrMQ_h9tx;*6pEY<Tmb|vv)tfJy=o9ZY1#8bW{
zkF9J{dOvNtYk5(}5Ah1F&J$Bw6kx2TSW$6D`2R3KJ5uOCe!Bnw002ovPDHLkV1let
B3bp_M

diff --git a/lib/Jaris/changes.txt b/lib/Jaris/changes.txt
deleted file mode 100644
index 5495104ad..000000000
--- a/lib/Jaris/changes.txt
+++ /dev/null
@@ -1,118 +0,0 @@
-Jaris FLV Player v2.0.15 beta - 27/08/2011
-
-	* New player controls
-	* New flashvar controltype (0=old, 1=new) to indicate the which controls to use
-	* New flashvar controlsize for new controls only
-	* New flashvar seekcolor for new controls only
-	* New flashvar buffertime to change the default 10 seconds buffer time for local/pseudo streaming
-	* Bugfix on loader bar
-	* All this changes thanks to Istvan Petres from http://jcore.net
-
-Jaris FLV Player v2.0.14 beta - 20/05/2011
-
-	* Removed some trace calls on youtube playback.
-
-Jaris FLV Player v2.0.13 beta - 6/03/2011
-
-	* Implemented loop class
-	* Added loop functionality by passing loop=true or loop=1 as parameter
-	* Fixed reported bug "slider will show wrong position" on pseudostreaming seek (Thanks to Adam)
-	
-Jaris FLV Player v2.0.12 beta - 06/11/2010
-
-	* Java Script Api to listen for events and control the player.
-	* More player events added to use on JSApi.
-	* All this changes thanks to Sascha Kluger from http://projekktor.com
-	
-Jaris FLV Player v2.0.11 beta - 03/10/2010
-
-	* Removed togglePlay of onFullscreen event since it seems that new flash versions doesnt emits 
-	  the space keydown anymore that affected playback on fullcreen switching.
-	* Added class to store user settings as volume and aspect ratio to load them next time player is load.
-	
-Jaris FLV Player v2.0.10 beta - 29/09/2010
-
-	* Added flashvar aspectratio option to initially tell on wich aspect ratio to play the video
-
-Jaris FLV Player v2.0.9 beta - 26/05/2010
-
-	* Improved poster to keep aspect ratio and display back when playback finishes
-
-Jaris FLV Player v2.0.8 beta - 14/05/2010
-
-	* Fixed bug on formatTime function calculating hours as minutes
-
-Jaris FLV Player v2.0.7 beta - 03/19/2010
-
-	* Fixed youtube security bug
-
-Jaris FLV Player v2.0.6 beta - 03/13/2010
-
-	* Added: display current aspect ratio label on aspect ratio toggle
-	* Improved readability of text
-	* only attach netstream to video object if input type is video
-	* remove poster from player code
-
-Jaris FLV Player v2.0.5 beta - 03/12/2010
-
-	* Improved aspect ratio toogle when video aspect ratio is already on the aspect ratios list
-	* Fixed context menu aspect ratio rotation
-
-Jaris FLV Player v2.0.4 beta - 03/11/2010
-
-	* Fixed a drawing issue where seek bar after fullscreen stayed long
-	* Documented other parts of the code
-
-Jaris FLV Player v2.0.3 beta - 03/10/2010
-
-	* Support for rtmp streaming
-	* support for youtube
-	* better support for http streaming like lighttpd
-	* Fixed calculation of width on original aspect ratio larger than stage
-	* And many hours of improvements
-
-Jaris FLV Player v2.0.2 beta - 03/09/2010
-
-	* Implement EventDispatcher on Player class instead of using custom event mechanism
-	* Fixed not getting initial stage widht and height on IE when using swfobjects
-	* Some more improvements to controls on short heights
-	* Other improvements and code refactoring
-	* added id3 info to player events
-	
-Jaris FLV Player v2.0.1 beta - 03/08/2010
-
-	* Toggle Quality on Context Menu
-	* Introduction of type parameter
-	* Initial mp3 support
-	* Loader fixes
-	* Controls fixes
-	* Other refinements and fixes
-	* Duration parameter to indicate how much total time takes input media
-	
-Jaris FLV Player v2.0.0 beta - 03/05/2010
-
-	* Moved from swishmax 2 to haxe and flashdevelop
-	* New GUI completely written in haxe (AS3)
-	* Hide controls on fullscreen
-	* Recalculate aspect ratio on fullscreen.
-    * Redraw controls on fullscreen and normal switching.
-	* Initial pseudo streaming support
-	* Compiled to flash 10
-	* Now uses as3 libraries
-	* Optional Hardware scaling
-	* Video smoothing enabled by default
-	* Added custom context menu
-	* Other refinements and fixes
-	
-Jaris FLV Player v1.0 - 05/21/2008
-
-    * Calculates video aspect ratio on player load.
-    * Support Flash 9 Stage.displayState (Fullscreen mode).
-    * Support for preview image of the video.
-    * Display buffering message.
-    * Internal volume control.
-    * Back and forward control.
-    * Display the actual playing time and total time.
-    * Support for logo image on the fly.
-    * Flag to autostart the video on player load.
-
diff --git a/lib/Jaris/documentation.txt b/lib/Jaris/documentation.txt
deleted file mode 100644
index dfa8f53fe..000000000
--- a/lib/Jaris/documentation.txt
+++ /dev/null
@@ -1,157 +0,0 @@
-==================
-How To!
-==================
-
-The above example is one of the ways to embed the player to your html files. Just copy and paste. 
-
----------------------------------------Code------------------------------------------
-<object
-  classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-  codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=10,0,45,2"
-  width="640" height="360"
->
-	<param name="allowFullscreen" value="true">
-	<param name="allowScriptAccess" value="always">
-	<param name="movie" value="JarisFLVPlayer.swf">
-	<param name="bgcolor" value="#000000">
-	<param name="quality" value="high">
-	<param name="scale" value="noscale">
-	<param name="wmode" value="opaque">
-	<param name="flashvars" value="source=jaris-intro.mp4&type=video&streamtype=file&poster=poster.png&autostart=false&logo=logo.png&logoposition=top left&logoalpha=30&logowidth=130&logolink=http://jaris.sourceforge.net&hardwarescaling=false&darkcolor=000000&brightcolor=4c4c4c&controlcolor=FFFFFF&hovercolor=67A8C1">
-	<param name="seamlesstabbing" value="false">
-	<embed
-	  type="application/x-shockwave-flash"
-	  pluginspage="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"
-	  width="640" height="360"
-	  src="JarisFLVPlayer.swf"
-	  allowfullscreen="true" 
-	  allowscriptaccess="always"
-	  bgcolor="#000000"
-	  quality="high"
-	  scale="noscale"
-	  wmode="opaque"
-	  flashvars="source=jaris-intro.mp4&type=video&streamtype=file&poster=poster.png&autostart=false&logo=logo.png&logoposition=top left&logoalpha=30&logowidth=130&logolink=http://jaris.sourceforge.net&hardwarescaling=false&darkcolor=000000&brightcolor=4c4c4c&controlcolor=FFFFFF&hovercolor=67A8C1"
-	  seamlesstabbing="false"
-	>
-	  <noembed>
-	  </noembed>
-	</embed>
-</object>
---------------------------------------End-Code---------------------------------------
-
-==================
-Flash Variables
-==================
-
-Here is the list of variables that you can pass to the player.
-
-    * source:
-      This is the actual path of the media that is going to be played.
-	  
-	* type:
-      The type of file to play, allowable values are: audio, video.
-	  
-    * streamtype:
-      The stream type of the file, allowable values are: file, http, rmtp, youtube.
-	  
-	* server:
-	  Used in coordination with rtmp stream servers
-	  
-	* duration:
-      Total times in seconds for input media or formatted string in the format hh:mm:ss
-    
-	* poster:
-      Screenshot of the video that is displayed before playing in png, jpg or gif format.
-    
-	* autostart:
-      A true or false value that indicates to the player if it should auto play the video on load.
-    
-	* logo:
-      The path to the image of your logo.
-    
-	* logoposition:
-      The position of the logo in the player, permitted values are: top left, top right, bottom left and bottom right
-    
-	* logoalpha:
-      The transparency percent. values permitted 0 to 100, while more higher the vale less transparency is applied.
-    
-	* logowidth:
-      The width in pixels of the logo.
-    
-	* logolink:
-      A link to a webpage when the logo is clicked.
-    
-	* hardwarescaling:
-      Enable or disable hardware scaling on fullscreen mode, values: false or true
-    
-	* logoalpha:
-      The transparency percent. values permitted 1 to 100
-	  
-	* controls:
-	  To disable the displaying of controls, values: false to hide otherwise defaults to show
-	  
-	* controltype
-	  Choose which controls to displa. 0 = old controls, 1 = new controls
-	  
-	* controlsize
-	  Changes the height of the new controllers, the default value is 40
-	  
-	* seekcolor
-	  Change the seekbar color (new controls only)
-    
-	* darkcolor:
-      The darker color of player controls in html hexadecimal format
-    
-	* brightcolor:
-      The bright color of player controls in html hexadecimal format
-    
-	* controlcolor:
-      The face color of controls in html hexadecimal format
-    
-	* hovercolor:
-      On mouse hover color for controls in html hexadecimal format
-	  
-	* aspectratio:
-      To override original aspect ratio on first time player load. Allowable values: 1:1, 3:2, 4:3, 5:4, 14:9, 14:10, 16:9, 16:10
-	  
-	* jsapi:
-	  Expose events to javascript functions and enable controlling the player from the outside. Set to any value to enable.
-	  
-	* loop:
-	  As the variable says this keeps looping the video. Set to any value to enable.
-	  
-	* buffertime
-	  To change the default 10 seconds buffer time for local/pseudo streaming
-
-==================	  
-Keyboard Shortcuts
-==================
-
-Here is the list of keyboard shortcuts to control Jaris Player.
-
-    * SPACE
-      Play or pause video.
-	  
-    * TAB
-      Switch between different aspect ratios.
-    
-	* UP
-      Raise volume
-    
-	* DOWN
-      Lower volume
-    
-	* LEFT
-      Rewind
-    
-	* RIGHT
-      Forward
-    
-	* M
-      Mute or unmute volume.
-    
-	* F
-      Swtich to fullscreen mode.
-	
-	* X
-      Stops and close current stream
\ No newline at end of file
diff --git a/lib/Jaris/license.txt b/lib/Jaris/license.txt
deleted file mode 100644
index f55f0f68c..000000000
--- a/lib/Jaris/license.txt
+++ /dev/null
@@ -1,789 +0,0 @@
-					  GNU GENERAL PUBLIC LICENSE
-					  
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-
-				  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/lib/Jaris/readme.txt b/lib/Jaris/readme.txt
deleted file mode 100644
index bd797e320..000000000
--- a/lib/Jaris/readme.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-==================
-Jaris FLV Player
-==================
-A flash flv player made using haxe and flash develop that can be embedded into any website
-for free or commercial use. 
-
-Web Page: http://jaris.sourceforge.net/
-Project Page: https://sourceforge.net/projects/jaris/
-
-==================
-Be Free!
-==================
-
-Searching for an flv player that could be used freely in all aspects and open source was 
-a hard job. So I just decided to work on a basic player that had the most important 
-features found in others players.
-
-Thats the story of how Jaris was born.
-
-==================
-Features
-==================
-
-
-    * Aspect ratio switcher
-    * Fullscreen support
-    * Http pseudostreaming support
-    * Poster image
-    * Volume control
-    * Seek control
-    * Display time
-    * Use your own logo
-    * Add a link to your logo
-    * Change position of logo
-    * Hide controls on fullscreen
-    * Custom control colors
-    * Hardware scaling
-    * Keyboard shortcuts
-	* Mp3 support
-
-
-==================
-License
-==================
-
-Jaris is licensed under GPL and LGPL, meaning that you could use it commercially. 
-What we ask for is that any improvements made to the player should be taken back to jaris flv website 
-so that any one could enjoy the new improvements or features also. In this way everyone could 
-help to maintain an up to date tool that adapts to todays multimedia demands. 
-Using sourceforge.net you could send a patch http://sourceforge.net/projects/jaris/.
-
-Enjoy a totally free player ;-)
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/Main.hx b/lib/Jaris/src/jaris/Main.hx
deleted file mode 100644
index 525ab87ea..000000000
--- a/lib/Jaris/src/jaris/Main.hx
+++ /dev/null
@@ -1,204 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-
-package jaris;
-
-import flash.display.MovieClip;
-import flash.display.Stage;
-import flash.display.StageAlign;
-import flash.display.StageScaleMode;
-import flash.Lib;
-import flash.system.Capabilities;
-import jaris.display.Logo;
-import jaris.display.Menu;
-import jaris.display.Poster;
-import jaris.player.controls.Controls;
-import jaris.player.newcontrols.NewControls;
-import jaris.player.JsApi;
-import jaris.player.InputType;
-import jaris.player.Player;
-import jaris.player.StreamType;
-import jaris.player.AspectRatio;
-import jaris.player.UserSettings;
-import jaris.player.Loop;
-
-/**
- * Main jaris player starting point
- */
-class Main 
-{
-	static var stage:Stage;
-	static var movieClip:MovieClip;
-	
-	static function main():Void
-	{
-		//Initialize stage and main movie clip
-		stage = Lib.current.stage;
-		movieClip = Lib.current;
-		
-		stage.scaleMode = StageScaleMode.NO_SCALE;
-		stage.align = StageAlign.TOP_LEFT;
-		
-		//Retrieve user settings
-		var userSettings:UserSettings = new UserSettings();
-		
-		//Reads flash vars
-		var parameters:Dynamic<String> = flash.Lib.current.loaderInfo.parameters;
-		
-		//Initialize and draw player object
-		var player:Player = new Player();
-		if (Capabilities.playerType == "PlugIn" || Capabilities.playerType == "ActiveX")
-		{
-			var autoStart:Bool = parameters.autostart == "true" || parameters.autostart == "" || parameters.autostart == null? true: false;
-			var type:String = parameters.type != "" && parameters.type != null? parameters.type : InputType.VIDEO;
-			var streamType:String = parameters.streamtype != "" && parameters.streamtype != null? parameters.streamtype : StreamType.FILE;
-			var server:String = parameters.server != "" && parameters.server != null? parameters.server : "";
-			var aspectRatio:String = parameters.aspectratio != "" && parameters.aspectratio != null? parameters.aspectratio : "";
-			var bufferTime:Float = parameters.buffertime != "" && parameters.buffertime != null? Std.parseFloat(parameters.buffertime) : 0;
-			
-			if (aspectRatio != "" && !userSettings.isSet("aspectratio"))
-			{
-				switch(aspectRatio)
-				{
-					case "1:1":
-						player.setAspectRatio(AspectRatio._1_1);
-					case "3:2":
-						player.setAspectRatio(AspectRatio._3_2);
-					case "4:3":
-						player.setAspectRatio(AspectRatio._4_3);
-					case "5:4":
-						player.setAspectRatio(AspectRatio._5_4);
-					case "14:9":
-						player.setAspectRatio(AspectRatio._14_9);
-					case "14:10":
-						player.setAspectRatio(AspectRatio._14_10);
-					case "16:9":
-						player.setAspectRatio(AspectRatio._16_9);
-					case "16:10":
-						player.setAspectRatio(AspectRatio._16_10);
-				}
-			}
-			else if(userSettings.isSet("aspectratio"))
-			{
-				player.setAspectRatio(userSettings.getAspectRatio());
-			}
-			
-			player.setType(type);
-			player.setStreamType(streamType);
-			player.setServer(server);
-			player.setVolume(userSettings.getVolume());
-			player.setBufferTime(bufferTime);
-			
-			if (autoStart)
-			{
-				player.load(parameters.source, type, streamType, server);
-			}
-			else
-			{
-				player.setSource(parameters.source);
-			}
-			
-			player.setHardwareScaling(parameters.hardwarescaling=="true"?true:false);
-		}
-		else
-		{
-			//For development purposes
-			if(userSettings.isSet("aspectratio"))
-			{
-				player.setAspectRatio(userSettings.getAspectRatio());
-			}
-			
-			player.setVolume(userSettings.getVolume());
-			
-			player.load("http://jaris.sourceforge.net/files/jaris-intro.flv", InputType.VIDEO, StreamType.FILE);
-			//player.load("http://jaris.sourceforge.net/files/audio.mp3", InputType.AUDIO, StreamType.FILE);
-		}
-		
-		//Draw preview image
-		if (parameters.poster != null)
-		{
-			var poster:String = parameters.poster;
-			var posterImage = new Poster(poster);
-			posterImage.setPlayer(player);
-			movieClip.addChild(posterImage);
-		}
-		
-		//Modify Context Menu
-		var menu:Menu = new Menu(player);
-		
-		//Draw logo
-		if (parameters.logo!=null)
-		{
-			var logoSource:String = parameters.logo != null ? parameters.logo : "logo.png";
-			var logoPosition:String = parameters.logoposition != null ? parameters.logoposition : "top left";
-			var logoAlpha:Float = parameters.logoalpha != null ? Std.parseFloat(parameters.logoalpha) / 100 : 0.3;
-			var logoWidth:Float = parameters.logowidth != null ? Std.parseFloat(parameters.logowidth) : 130;
-			var logoLink:String = parameters.logolink != null ? parameters.logolink : "http://jaris.sourceforge.net";
-			
-			var logo:Logo = new Logo(logoSource, logoPosition, logoAlpha, logoWidth);
-			logo.setLink(logoLink);
-			movieClip.addChild(logo);
-		}
-	
-		//Draw Controls
-		if (parameters.controls != "false")
-		{
-			var duration:String = parameters.duration != "" && parameters.duration != null? parameters.duration : "0";
-			var controlType:Int = parameters.controltype != "" && parameters.controltype != null? Std.parseInt(parameters.controltype) : 0;
-			var controlSize:Int = parameters.controlsize != "" && parameters.controlsize != null? Std.parseInt(parameters.controlsize) : 0;
-			
-			var controlColors:Array <String> = ["", "", "", "", ""];
-			controlColors[0] = parameters.darkcolor != null ? parameters.darkcolor : "";
-			controlColors[1] = parameters.brightcolor != null ? parameters.brightcolor : "";
-			controlColors[2] = parameters.controlcolor != null ? parameters.controlcolor : "";
-			controlColors[3] = parameters.hovercolor != null ? parameters.hovercolor : "";
-			controlColors[4] = parameters.seekcolor != null ? parameters.seekcolor : "";
-			
-			if (controlType == 1) {
-				var controls:NewControls = new NewControls(player);
-				controls.setDurationLabel(duration);
-				controls.setControlColors(controlColors);
-				controls.setControlSize(controlSize);
-				movieClip.addChild(controls);
-			} else {
-				var controls:Controls = new Controls(player);
-				controls.setDurationLabel(duration);
-				controls.setControlColors(controlColors);
-				movieClip.addChild(controls);
-			}
-		}
-		
-		//Loop the video
-		if (parameters.loop != null)
-		{
-			var loop:Loop = new Loop(player);
-		}
-
-		//Expose events to javascript functions and enable controlling the player from the outside
-		if (parameters.jsapi != null)
-		{
-			var jsAPI:JsApi = new JsApi(player);
-			movieClip.addChild(jsAPI);
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/Version.hx b/lib/Jaris/src/jaris/Version.hx
deleted file mode 100644
index b3b852da9..000000000
--- a/lib/Jaris/src/jaris/Version.hx
+++ /dev/null
@@ -1,35 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris;
-
-/**
- * Actual jaris flv player version and date
- */
-class Version 
-{
-	public static var NUMBER:String = "2.0.15";
-	public static var STATUS:String = "beta";
-	public static var DATE:String = "27";
-	public static var MONTH:String = "08";
-	public static var YEAR:String = "2011";
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/animation/Animation.hx b/lib/Jaris/src/jaris/animation/Animation.hx
deleted file mode 100644
index 91cf60bd7..000000000
--- a/lib/Jaris/src/jaris/animation/Animation.hx
+++ /dev/null
@@ -1,77 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.animation;
-
-/**
- * Gives quick access usage to jaris animations
- */
-class Animation
-{
-
-	/**
-	 * Quick access to fade in effect
-	 * @param	object the object to animate
-	 * @param	seconds the duration of the animation
-	 */
-	public static function fadeIn(object:Dynamic, seconds:Float):Void
-	{
-		var animation:AnimationsBase = new AnimationsBase();
-		animation.fadeIn(object, seconds);
-	}
-	
-	/**
-	 * Quick access to fade out effect
-	 * @param	object the object to animate
-	 * @param	seconds the duration of the animation
-	 */
-	public static function fadeOut(object:Dynamic, seconds:Float):Void
-	{
-		var animation:AnimationsBase = new AnimationsBase();
-		animation.fadeOut(object, seconds);
-	}
-	
-	/**
-	 * Quick access to slide in effect
-	 * @param	object the object to animate
-	 * @param	position could be top, left, bottom or right
-	 * @param	seconds the duration of the animation
-	 */
-	public static function slideIn(object:Dynamic, position:String, seconds:Float):Void
-	{
-		var animation:AnimationsBase = new AnimationsBase();
-		animation.slideIn(object, position, seconds);
-	}
-	
-	/**
-	 * Quick access to slide out effect
-	 * @param	object the object to animate
-	 * @param	position could be top, left, bottom or right
-	 * @param	seconds the duration of the animation
-	 */
-	public static function slideOut(object:Dynamic, position:String, seconds:Float):Void
-	{
-		var animation:AnimationsBase = new AnimationsBase();
-		animation.slideOut(object, position, seconds);
-	}
-	
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/animation/AnimationsBase.hx b/lib/Jaris/src/jaris/animation/AnimationsBase.hx
deleted file mode 100644
index 8f0aebc57..000000000
--- a/lib/Jaris/src/jaris/animation/AnimationsBase.hx
+++ /dev/null
@@ -1,306 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.animation;
-
-import flash.display.MovieClip;
-import flash.display.Stage;
-import flash.events.TimerEvent;
-import flash.Lib;
-import flash.utils.Timer;
-
-/**
- * Jaris main animations
- */
-class AnimationsBase
-{
-	private var _fadeInTimer:Timer;
-	private var _fadeOutTimer:Timer;
-	
-	private var _slideInTimer:Timer;
-	private var _slideInOrigX:Float;
-	private var _slideInOrigY:Float;
-	private var _slideInPosition:String;
-	private var _slideInIncrements:Float;
-	
-	private var _slideOutTimer:Timer;
-	private var _slideOutOrigX:Float;
-	private var _slideOutOrigY:Float;
-	private var _slideOutPosition:String;
-	private var _slideOutIncrements:Float;
-	
-	private var _stage:Stage;
-	private var _movieClip:MovieClip;
-	
-	
-	private var _currentObject:Dynamic;
-	
-	public function new()
-	{
-		_stage = Lib.current.stage;
-		_movieClip = Lib.current;
-	}
-	
-	/**
-	 * Moves an object until is shown
-	 * @param	event
-	 */
-	private function slideInTimer(event:TimerEvent):Void
-	{
-		var last:Bool = false;
-		switch(_slideInPosition)
-		{
-			case "top":
-				if (_currentObject.y >= _slideInOrigY) { last = true; }
-				_currentObject.y += _slideInIncrements;
-				
-			case "left":
-				if (_currentObject.x >= _slideInOrigX) { last = true; }
-				_currentObject.x += _slideInIncrements;
-				
-			case "bottom":
-				if (_currentObject.y <= _slideInOrigY) { last = true; }
-				_currentObject.y -= _slideInIncrements;
-				
-			case "right":
-				if (_currentObject.x <= _slideInOrigX) { last = true; }
-				_currentObject.x -= _slideInIncrements;
-		}
-		
-		if (last)
-		{
-			_currentObject.x = _slideInOrigX;
-			_currentObject.y = _slideInOrigY;
-			_slideInTimer.stop();
-		}
-	}
-	
-	/**
-	 * Moves an object until is hidden
-	 * @param	event
-	 */
-	private function slideOutTimer(event:TimerEvent):Void
-	{
-		if (((_currentObject.x + _currentObject.width)  < 0) || (_currentObject.y + _currentObject.height < 0))
-		{
-			_currentObject.visible = false;
-			_currentObject.x = _slideOutOrigX;
-			_currentObject.y = _slideOutOrigY;
-			
-			_slideOutTimer.stop();
-		}
-		else if (((_currentObject.x)  > _stage.stageWidth) || (_currentObject.y > _stage.stageHeight))
-		{
-			_currentObject.visible = false;
-			_currentObject.x = _slideOutOrigX;
-			_currentObject.y = _slideOutOrigY;
-			
-			_slideOutTimer.stop();
-		}
-		else
-		{
-			switch(_slideOutPosition)
-			{
-				case "top":
-					_currentObject.y -= _slideOutIncrements;
-					
-				case "left":
-					_currentObject.x -= _slideOutIncrements;
-					
-				case "bottom":
-					_currentObject.y += _slideOutIncrements;
-					
-				case "right":
-					_currentObject.x += _slideOutIncrements;
-			}
-		}
-	}
-	
-	/**
-	 * Lower object transparency until not visible
-	 * @param	event
-	 */
-	private function fadeOutTimer(event:TimerEvent):Void
-	{
-		if (_currentObject.alpha > 0)
-		{
-			_currentObject.alpha -= 1 / 10;
-		}
-		else
-		{
-			_currentObject.visible = false;
-			_fadeOutTimer.stop();
-		}
-	}
-	
-	/**
-	 * Highers object transparency until visible
-	 * @param	event
-	 */
-	private function fadeInTimer(event:TimerEvent):Void
-	{
-		if (_currentObject.alpha < 1)
-		{
-			_currentObject.alpha += 1 / 10;
-		}
-		else
-		{
-			_fadeInTimer.stop();
-		}
-	}
-	
-	/**
-	 * Effect that moves an object into stage
-	 * @param	object the element to move
-	 * @param	slidePosition could be top, left bottom or right
-	 * @param	speed the time in seconds for duration of the animation
-	 */
-	public function slideIn(object:Dynamic, slidePosition:String, speed:Float=1000):Void
-	{
-		if (object.visible)
-		{
-			object.visible = false;
-		}
-		
-		_slideInOrigX = object.x;
-		_slideInOrigY = object.y;
-		_slideInPosition = slidePosition;
-		
-		var increments:Float = 0;
-		
-		switch(slidePosition)
-		{
-			case "top":
-				object.y = 0 - object.height;
-				increments = object.height + _slideInOrigY;
-				
-			case "left":
-				object.x = 0 - object.width;
-				increments = object.width + _slideInOrigX;
-				
-			case "bottom":
-				object.y = _stage.stageHeight;
-				increments = _stage.stageHeight - _slideInOrigY;
-				
-			case "right":
-				object.x = _stage.stageWidth;
-				increments = _stage.stageWidth - _slideInOrigX;
-		}
-		
-		_slideInIncrements = increments / (speed / 100);
-		
-		_currentObject = object;
-		_currentObject.visible = true;
-		_currentObject.alpha = 1;
-		
-		_slideInTimer = new Timer(speed / 100);
-		_slideInTimer.addEventListener(TimerEvent.TIMER, slideInTimer);
-		_slideInTimer.start();
-	}
-	
-	/**
-	 * Effect that moves an object out of stage
-	 * @param	object the element to move
-	 * @param	slidePosition could be top, left bottom or right
-	 * @param	speed the time in seconds for duration of the animation
-	 */
-	public function slideOut(object:Dynamic, slidePosition:String, speed:Float=1000):Void
-	{
-		if (!object.visible)
-		{
-			object.visible = true;
-		}
-		
-		_slideOutOrigX = object.x;
-		_slideOutOrigY = object.y;
-		_slideOutPosition = slidePosition;
-		
-		var increments:Float = 0;
-		
-		switch(slidePosition)
-		{
-			case "top":
-				increments = object.height + _slideOutOrigY;
-				
-			case "left":
-				increments = object.width + _slideOutOrigX;
-				
-			case "bottom":
-				increments = _stage.stageHeight - _slideOutOrigY;
-				
-			case "right":
-				increments = _stage.stageWidth - _slideOutOrigX;
-		}
-		
-		_slideOutIncrements = increments / (speed / 100);
-		
-		_currentObject = object;
-		_currentObject.visible = true;
-		_currentObject.alpha = 1;
-		
-		_slideOutTimer = new Timer(speed / 100);
-		_slideOutTimer.addEventListener(TimerEvent.TIMER, slideOutTimer);
-		_slideOutTimer.start();
-	}
-	
-	/**
-	 * Effect that dissapears an object from stage
-	 * @param	object the element to dissapear
-	 * @param	speed the time in seconds for the duration of the animation
-	 */
-	public function fadeOut(object:Dynamic, speed:Float=500):Void
-	{
-		if (!object.visible)
-		{
-			object.visible = true;
-		}
-		
-		object.alpha = 1;
-		_currentObject = object;
-		
-		_fadeOutTimer = new Timer(speed / 10);
-		_fadeOutTimer.addEventListener(TimerEvent.TIMER, fadeOutTimer);
-		_fadeOutTimer.start();
-	}
-	
-	/**
-	 * Effect that shows a hidden object an in stage
-	 * @param	object the element to show
-	 * @param	speed the time in seconds for the duration of the animation
-	 */
-	public function fadeIn(object:Dynamic, speed:Float=500):Void
-	{
-		if (object.visible)
-		{
-			object.visible = false;
-		}
-		
-		object.alpha = 0;
-		_currentObject = object;
-		_currentObject.visible = true;
-		
-		_fadeInTimer = new Timer(speed / 10);
-		_fadeInTimer.addEventListener(TimerEvent.TIMER, fadeInTimer);
-		_fadeInTimer.start();
-	}
-	
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/display/Loader.hx b/lib/Jaris/src/jaris/display/Loader.hx
deleted file mode 100644
index 3a309b4d3..000000000
--- a/lib/Jaris/src/jaris/display/Loader.hx
+++ /dev/null
@@ -1,181 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.display;
-
-import flash.display.MovieClip;
-import flash.display.Sprite;
-import flash.display.Stage;
-import flash.events.Event;
-import flash.Lib;
-
-/**
- * Draws a loading bar
- */
-class Loader extends Sprite 
-{
-	private var _stage:Stage;
-	private var _movieClip:MovieClip;
-	private var _background:Sprite;
-	private var _loaderTrack:Sprite;
-	private var _loaderThumb:Sprite;
-	private var _visible:Bool;
-	private var _brightColor:UInt;
-	private var _controlColor:UInt;
-	private var _forward:Bool;
-
-	public function new() 
-	{
-		super();
-		
-		_stage = Lib.current.stage;
-		_movieClip = Lib.current;
-		
-		_background = new Sprite();
-		addChild(_background);
-		
-		_loaderTrack = new Sprite();
-		addChild(_loaderTrack);
-		
-		_loaderThumb = new Sprite();
-		addChild(_loaderThumb);
-		
-		_brightColor = 0x4c4c4c;
-		_controlColor = 0xFFFFFF;
-		
-		_forward = true;
-		_visible = true;
-		
-		addEventListener(Event.ENTER_FRAME, onEnterFrame);
-		_stage.addEventListener(Event.RESIZE, onResize);
-		
-		drawLoader();
-	}
-	
-	/**
-	 * Animation of a thumb moving on the track
-	 * @param	event
-	 */
-	private function onEnterFrame(event:Event):Void
-	{
-		if (_visible)
-		{
-			if (_forward)
-			{
-				if ((_loaderThumb.x + _loaderThumb.width) >= (_loaderTrack.x + _loaderTrack.width))
-				{
-					_forward = false;
-				}
-				else
-				{
-					_loaderThumb.x += 10;
-				}
-			}
-			else
-			{
-				if (_loaderThumb.x  <= _loaderTrack.x)
-				{
-					_forward = true;
-				}
-				else
-				{
-					_loaderThumb.x -= 10;
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Redraws the loader to match new stage size
-	 * @param	event
-	 */
-	private function onResize(event:Event):Void
-	{
-		drawLoader();
-	}
-	
-	/**
-	 * Draw loader graphics
-	 */
-	private function drawLoader():Void
-	{
-		//Clear graphics
-		_background.graphics.clear();
-		_loaderTrack.graphics.clear();
-		_loaderThumb.graphics.clear();
-		
-		//Draw background
-		var backgroundWidth:Float = (65 / 100) * _stage.stageWidth;
-		var backgroundHeight:Float = 30;
-		_background.x = (_stage.stageWidth / 2) - (backgroundWidth / 2);
-		_background.y = (_stage.stageHeight / 2) - (backgroundHeight / 2);
-		_background.graphics.lineStyle();
-		_background.graphics.beginFill(_brightColor, 0.5);
-		_background.graphics.drawRoundRect(0, 0, backgroundWidth, backgroundHeight, 6, 6);
-		_background.graphics.endFill();
-		
-		//Draw track
-		var trackWidth:Float = (50 / 100) * _stage.stageWidth;
-		var trackHeight:Float = 15;
-		_loaderTrack.x = (_stage.stageWidth / 2) - (trackWidth / 2);
-		_loaderTrack.y = (_stage.stageHeight / 2) - (trackHeight / 2);
-		_loaderTrack.graphics.lineStyle(2, _controlColor);
-		_loaderTrack.graphics.drawRect(0, 0, trackWidth, trackHeight);
-		
-		//Draw thumb
-		_loaderThumb.x = _loaderTrack.x;
-		_loaderThumb.y = _loaderTrack.y;
-		_loaderThumb.graphics.lineStyle();
-		_loaderThumb.graphics.beginFill(_controlColor, 1);
-		_loaderThumb.graphics.drawRect(0, 0, trackHeight, trackHeight);
-	}
-	
-	/**
-	 * Stops drawing the loader
-	 */
-	public function hide():Void
-	{
-		this.visible = false;
-		_visible = false;
-	}
-	
-	/**
-	 * Starts drawing the loader
-	 */
-	public function show():Void
-	{
-		this.visible = true;
-		_visible = true;
-	}
-	
-	/**
-	 * Set loader colors
-	 * @param	colors
-	 */
-	public function setColors(colors:Array<String>):Void
-	{
-		_brightColor = colors[0].length > 0? Std.parseInt("0x" + colors[0]) : 0x4c4c4c;
-		_controlColor = colors[1].length > 0? Std.parseInt("0x" + colors[1]) : 0xFFFFFF;
-		
-		drawLoader();
-	}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/display/Logo.hx b/lib/Jaris/src/jaris/display/Logo.hx
deleted file mode 100644
index 48e66c54a..000000000
--- a/lib/Jaris/src/jaris/display/Logo.hx
+++ /dev/null
@@ -1,185 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.display;
-
-import flash.display.Loader;
-import flash.display.MovieClip;
-import flash.display.Sprite;
-import flash.display.Stage;
-import flash.events.Event;
-import flash.events.IOErrorEvent;
-import flash.events.MouseEvent;
-import flash.Lib;
-import flash.net.URLRequest;
-
-/**
- * To display an image in jpg, png or gif format as logo
- */
-class Logo extends Sprite
-{
-	private var _stage:Stage;
-	private var _movieClip:MovieClip;
-	private var _loader:Loader;
-	private var _position:String;
-	private var _alpha:Float;
-	private var _source:String;
-	private var _width:Float;
-	private var _link:String;
-	private var _loading:Bool;
-	
-	public function new(source:String, position:String, alpha:Float, width:Float=0.0) 
-	{
-		super();
-		
-		_stage = Lib.current.stage;
-		_movieClip = Lib.current;
-		_loader = new Loader();
-		_position = position;
-		_alpha = alpha;
-		_source = source;
-		_width = width;
-		_loading = true;
-		
-		this.tabEnabled = false;
-		
-		_loader.contentLoaderInfo.addEventListener(Event.COMPLETE, onLoaderComplete);
-		_loader.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR, onNotLoaded);
-        _loader.load(new URLRequest(source));
-	}
-	
-	/**
-	 * Triggers when the logo image could not be loaded
-	 * @param	event
-	 */
-	private function onNotLoaded(event:IOErrorEvent):Void
-	{
-		//Image not loaded
-	}
-	
-	/**
-	 * Triggers when the logo image finished loading.
-	 * @param	event
-	 */
-	private function onLoaderComplete(event:Event):Void
-	{
-		addChild(_loader);
-		
-		setWidth(_width);
-		setPosition(_position);
-		setAlpha(_alpha);
-		_loading = false;
-		
-		_stage.addEventListener(Event.RESIZE, onStageResize);
-	}
-	
-	/**
-	 * Recalculate logo position on stage resize
-	 * @param	event
-	 */
-	private function onStageResize(event:Event):Void
-	{
-		setPosition(_position);
-	}
-	
-	/**
-	 * Opens the an url when the logo is clicked
-	 * @param	event
-	 */
-	private function onLogoClick(event:MouseEvent):Void
-	{
-		Lib.getURL(new URLRequest(_link), "_blank");
-	}
-	
-	/**
-	 * Position where logo will be showing
-	 * @param	position values could be top left, top right, bottom left, bottom right
-	 */
-	public function setPosition(position:String):Void
-	{
-		switch(position)
-		{
-			case "top left":
-				this.x = 25;
-				this.y = 25;
-			
-			case "top right":
-				this.x = _stage.stageWidth - this._width - 25;
-				this.y = 25;
-			
-			case "bottom left":
-				this.x = 25;
-				this.y = _stage.stageHeight - this.height - 25;
-			
-			case "bottom right":
-				this.x = _stage.stageWidth - this.width - 25;
-				this.y = _stage.stageHeight - this.height - 25;
-				
-			default: 
-				this.x = 25;
-				this.y = 25;
-		}
-	}
-	
-	/**
-	 * To set logo transparency
-	 * @param	alpha
-	 */
-	public function setAlpha(alpha:Float):Void
-	{
-		this.alpha = alpha;
-	}
-	
-	/**
-	 * Sets logo width and recalculates height keeping aspect ratio
-	 * @param	width
-	 */
-	public function setWidth(width:Float):Void
-	{
-		if (width > 0)
-		{
-			this.height = (this.height / this.width) * width;
-			this.width = width;
-		}
-	}
-	
-	/**
-	 * Link that opens when clicked the logo image is clicked
-	 * @param	link
-	 */
-	public function setLink(link:String):Void
-	{
-		_link = link;
-		this.buttonMode = true;
-		this.useHandCursor = true;
-		this.addEventListener(MouseEvent.CLICK, onLogoClick);
-	}
-	
-	/**
-	 * To check if the logo stills loading
-	 * @return true if loading false otherwise
-	 */
-	public function isLoading():Bool
-	{
-		return _loading;
-	}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/display/Menu.hx b/lib/Jaris/src/jaris/display/Menu.hx
deleted file mode 100644
index 39d0a849f..000000000
--- a/lib/Jaris/src/jaris/display/Menu.hx
+++ /dev/null
@@ -1,246 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.display;
-import flash.display.MovieClip;
-import flash.events.ContextMenuEvent;
-import flash.Lib;
-import flash.net.URLRequest;
-import flash.ui.ContextMenu;
-import flash.ui.ContextMenuItem;
-import jaris.player.Player;
-import jaris.player.AspectRatio;
-import jaris.Version;
-
-/**
- * Modify original context menu
- */
-class Menu 
-{
-	private var _movieClip:MovieClip;
-	public static var _player:Player;
-	
-	private var _contextMenu:ContextMenu;
-	private var _jarisVersionMenuItem:ContextMenuItem;
-	private var _playMenuItem:ContextMenuItem;
-	private var _fullscreenMenuItem:ContextMenuItem;
-	private var _aspectRatioMenuItem:ContextMenuItem;
-	private var _muteMenuItem:ContextMenuItem;
-	private var _volumeUpMenuItem:ContextMenuItem;
-	private var _volumeDownMenuItem:ContextMenuItem;
-	private var _qualityContextMenu:ContextMenuItem;
-	
-	public function new(player:Player) 
-	{
-		_movieClip = Lib.current;
-		_player = player;
-		
-		//Initialize context menu replacement
-		_contextMenu = new ContextMenu();
-		_contextMenu.hideBuiltInItems();
-		
-		_contextMenu.addEventListener(ContextMenuEvent.MENU_SELECT, onMenuOpen);
-		
-		//Initialize each menu item
-		_jarisVersionMenuItem = new ContextMenuItem("Jaris Player v" + Version.NUMBER + " " + Version.STATUS, true, true, true);
-		_jarisVersionMenuItem.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, onJarisVersion);
-		
-		_playMenuItem = new ContextMenuItem("Play (SPACE)", true, true, true);
-		_playMenuItem.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, onPlay);
-		
-		_fullscreenMenuItem = new ContextMenuItem("Fullscreen View (F)");
-		_fullscreenMenuItem.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, onFullscreen);
-		
-		_aspectRatioMenuItem = new ContextMenuItem("Aspect Ratio (original) (TAB)");
-		_aspectRatioMenuItem.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, onAspectRatio);
-		
-		_muteMenuItem = new ContextMenuItem("Mute (M)");
-		_muteMenuItem.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, onMute);
-		
-		_volumeUpMenuItem = new ContextMenuItem("Volume + (arrow UP)");
-		_volumeUpMenuItem.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, onVolumeUp);
-		
-		_volumeDownMenuItem = new ContextMenuItem("Volume - (arrow DOWN)");
-		_volumeDownMenuItem.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, onVolumeDown);
-		
-		_qualityContextMenu = new ContextMenuItem("Lower Quality", true, true, true);
-		_qualityContextMenu.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, onQuality);
-		
-		//add all context menu items to context menu object
-		_contextMenu.customItems.push(_jarisVersionMenuItem);
-		_contextMenu.customItems.push(_playMenuItem);
-		_contextMenu.customItems.push(_fullscreenMenuItem);
-		_contextMenu.customItems.push(_aspectRatioMenuItem);
-		_contextMenu.customItems.push(_muteMenuItem);
-		_contextMenu.customItems.push(_volumeUpMenuItem);
-		_contextMenu.customItems.push(_volumeDownMenuItem);
-		_contextMenu.customItems.push(_qualityContextMenu);
-		
-		//override default context menu
-		_movieClip.contextMenu = _contextMenu;
-	}
-	
-	/**
-	 * Update context menu item captions depending on player status before showing them
-	 * @param	event
-	 */
-	private function onMenuOpen(event:ContextMenuEvent):Void
-	{
-		if (_player.isPlaying())
-		{
-			_playMenuItem.caption = "Pause (SPACE)";
-		}
-		else
-		{
-			_playMenuItem.caption = "Play (SPACE)";
-		}
-		
-		if (_player.isFullscreen())
-		{
-			_fullscreenMenuItem.caption = "Normal View";
-		}
-		else
-		{
-			_fullscreenMenuItem.caption = "Fullscreen View (F)";
-		}
-		
-		if (_player.getMute())
-		{
-			_muteMenuItem.caption = _player.isFullscreen()?"Unmute":"Unmute (M)";
-		}
-		else
-		{
-			_muteMenuItem.caption = _player.isFullscreen()?"Mute":"Mute (M)";
-		}
-		
-		switch(_player.getAspectRatioString())
-		{
-			case "original":
-				_aspectRatioMenuItem.caption = "Aspect Ratio (1:1) (TAB)";
-				
-			case "1:1":
-				_aspectRatioMenuItem.caption = "Aspect Ratio (3:2) (TAB)";
-				
-			case "3:2":
-				_aspectRatioMenuItem.caption = "Aspect Ratio (4:3) (TAB)";
-				
-			case "4:3":
-				_aspectRatioMenuItem.caption = "Aspect Ratio (5:4) (TAB)";
-				
-			case "5:4":
-				_aspectRatioMenuItem.caption = "Aspect Ratio (14:9) (TAB)";
-				
-			case "14:9":
-				_aspectRatioMenuItem.caption = "Aspect Ratio (14:10) (TAB)";
-				
-			case "14:10":
-				_aspectRatioMenuItem.caption = "Aspect Ratio (16:9) (TAB)";
-				
-			case "16:9":
-				_aspectRatioMenuItem.caption = "Aspect Ratio (16:10) (TAB)";
-				
-			case "16:10":
-				_aspectRatioMenuItem.caption = "Aspect Ratio (original) (TAB)";
-		}
-		
-		if (_player.getQuality())
-		{
-			_qualityContextMenu.caption = "Lower Quality";
-		}
-		else
-		{
-			_qualityContextMenu.caption = "Higher Quality";
-		}
-	}
-	
-	/**
-	 * Open jaris player website
-	 * @param	event
-	 */
-	private function onJarisVersion(event:ContextMenuEvent)
-	{
-		Lib.getURL(new URLRequest("http://jaris.sourceforge.net"), "_blank");
-	}
-	
-	/**
-	 * Toggles playback
-	 * @param	event
-	 */
-	private function onPlay(event:ContextMenuEvent)
-	{
-		_player.togglePlay();
-	}
-	
-	/**
-	 * Toggles fullscreen
-	 * @param	event
-	 */
-	private function onFullscreen(event:ContextMenuEvent)
-	{
-		_player.toggleFullscreen();
-	}
-	
-	/**
-	 * Toggles aspect ratio
-	 * @param	event
-	 */
-	private function onAspectRatio(event:ContextMenuEvent)
-	{
-		_player.toggleAspectRatio();
-	}
-	
-	/**
-	 * Toggles mute
-	 * @param	event
-	 */
-	private function onMute(event:ContextMenuEvent)
-	{
-		_player.toggleMute();
-	}
-	
-	/**
-	 * Raise volume
-	 * @param	event
-	 */
-	private function onVolumeUp(event:ContextMenuEvent)
-	{
-		_player.volumeUp();
-	}
-	
-	/**
-	 * Lower volume
-	 * @param	event
-	 */
-	private function onVolumeDown(event:ContextMenuEvent)
-	{
-		_player.volumeDown();
-	}
-	
-	/**
-	 * Toggle video quality
-	 * @param	event
-	 */
-	private function onQuality(event:ContextMenuEvent)
-	{
-		_player.toggleQuality();
-	}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/display/Poster.hx b/lib/Jaris/src/jaris/display/Poster.hx
deleted file mode 100644
index 4c237468f..000000000
--- a/lib/Jaris/src/jaris/display/Poster.hx
+++ /dev/null
@@ -1,170 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.display;
-
-import flash.display.DisplayObject;
-import flash.display.Loader;
-import flash.display.MovieClip;
-import flash.display.Sprite;
-import flash.display.Stage;
-import flash.events.Event;
-import flash.events.IOErrorEvent;
-import flash.Lib;
-import flash.net.URLRequest;
-import jaris.events.PlayerEvents;
-import jaris.player.InputType;
-import jaris.player.Player;
-
-/**
- * To display an png, jpg or gif as preview of video content
- */
-class Poster extends Sprite
-{
-
-	private var _stage:Stage;
-	private var _movieClip:MovieClip;
-	private var _loader:Loader;
-	private var _source:String;
-	private var _width:Float;
-	private var _height:Float;
-	private var _loading:Bool;
-	private var _loaderStatus:jaris.display.Loader;
-	private var _player:Player;
-	
-	public function new(source:String)
-	{
-		super();
-		
-		_stage = Lib.current.stage;
-		_movieClip = Lib.current;
-		_loader = new Loader();
-		_source = source;
-		_loading = true;
-		
-		//Reads flash vars
-		var parameters:Dynamic<String> = flash.Lib.current.loaderInfo.parameters;
-		
-		//Draw Loader status
-		var loaderColors:Array <String> = ["", "", "", ""];
-		loaderColors[0] = parameters.brightcolor != null ? parameters.brightcolor : "";
-		loaderColors[1] = parameters.controlcolor != null ? parameters.controlcolor : "";
-		
-		_loaderStatus = new jaris.display.Loader();
-		_loaderStatus.show();
-		_loaderStatus.setColors(loaderColors);
-		addChild(_loaderStatus);
-		
-		_loader.contentLoaderInfo.addEventListener(Event.COMPLETE, onLoaderComplete);
-		_loader.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR, onNotLoaded);
-        _loader.load(new URLRequest(source));
-	}
-	
-	/**
-	 * Triggers when the poster image could not be loaded
-	 * @param	event
-	 */
-	private function onNotLoaded(event:IOErrorEvent):Void
-	{
-		_loaderStatus.hide();
-		removeChild(_loaderStatus);
-	}
-	
-	/**
-	 * Triggers when the poster image finalized loading
-	 * @param	event
-	 */
-	private function onLoaderComplete(event:Event):Void
-	{
-		_loaderStatus.hide();
-		removeChild(_loaderStatus);
-		
-		addChild(_loader);
-		
-		_width = this.width;
-		_height = this.height;
-		_loading = false;
-		
-		_stage.addEventListener(Event.RESIZE, onStageResize);
-		
-		resizeImage();
-	}
-	
-	/**
-	 * Triggers when the stage is resized to resize the poster image
-	 * @param	event
-	 */
-	private function onStageResize(event:Event):Void
-	{
-		resizeImage();
-	}
-	
-	private function onPlayerMediaInitialized(event:PlayerEvents)
-	{
-		if (_player.getType() == InputType.VIDEO)
-		{
-			this.visible = false;
-		}
-	}
-	
-	private function onPlayerPlay(event:PlayerEvents)
-	{
-		if (_player.getType() == InputType.VIDEO)
-		{
-			this.visible = false;
-		}
-	}
-	
-	private function onPlayBackFinished(event:PlayerEvents)
-	{
-		this.visible = true;
-	}
-	
-	/**
-	 * Resizes the poster image to take all the stage
-	 */
-	private function resizeImage():Void
-	{
-		this.height = _stage.stageHeight;
-		this.width = ((_width / _height) * this.height);
-		
-		this.x = (_stage.stageWidth / 2) - (this.width / 2);
-	}
-	
-	/**
-	 * To check if the poster image stills loading
-	 * @return true if stills loading false if loaded
-	 */
-	public function isLoading():Bool
-	{
-		return _loading;
-	}
-	
-	public function setPlayer(player:Player):Void
-	{
-		_player = player;
-		_player.addEventListener(PlayerEvents.MEDIA_INITIALIZED, onPlayerMediaInitialized);
-		_player.addEventListener(PlayerEvents.PLAYBACK_FINISHED, onPlayBackFinished);
-		_player.addEventListener(PlayerEvents.PLAY_PAUSE, onPlayerPlay);
-	}
-	
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/events/PlayerEvents.hx b/lib/Jaris/src/jaris/events/PlayerEvents.hx
deleted file mode 100644
index a2d1edf32..000000000
--- a/lib/Jaris/src/jaris/events/PlayerEvents.hx
+++ /dev/null
@@ -1,84 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.events;
-
-import flash.events.Event;
-import flash.media.ID3Info;
-import flash.media.Sound;
-import flash.net.NetStream;
-
-/**
- * Implements the player events
- */
-class PlayerEvents extends Event
-{
-	public static var ASPECT_RATIO = "onAspectRatio";
-	public static var MOUSE_SHOW = "onMouseShow";
-	public static var MOUSE_HIDE = "onMouseHide";
-	public static var FULLSCREEN = "onFullscreen";
-	public static var VOLUME_UP = "onVolumeUp";
-	public static var VOLUME_DOWN = "onVolumeDown";
-	public static var VOLUME_CHANGE= "onVolumeChange"; //Nuevo
-	public static var MUTE = "onMute";
-	public static var FORWARD = "onForward";
-	public static var REWIND = "onRewind";
-	public static var PLAY_PAUSE = "onPlayPause";
-	public static var SEEK = "onSeek";
-	public static var TIME = "onTimeUpdate";	
-	public static var PROGRESS = "onProgress";
-	public static var BUFFERING = "onBuffering";
-	public static var NOT_BUFFERING = "onNotBuffering";
-	public static var CONNECTION_FAILED = "onConnectionFailed";
-	public static var CONNECTION_SUCCESS = "onConnectionSuccess";
-	public static var MEDIA_INITIALIZED = "onDataInitialized";
-	public static var PLAYBACK_FINISHED = "onPlaybackFinished";
-	public static var STOP_CLOSE = "onStopAndClose";
-	public static var RESIZE = "onResize";
-	
-	public var name:String;
-	public var aspectRatio:Float;
-	public var duration:Float;
-	public var fullscreen:Bool;
-	public var mute:Bool;
-	public var volume:Float;
-	public var width:Float;
-	public var height:Float;
-	public var stream:NetStream;
-	public var sound:Sound;
-	public var time:Float;	
-	public var id3Info:ID3Info;
-	
-	public function new(type:String, bubbles:Bool=false, cancelable:Bool=false) 
-	{
-		super(type, bubbles, cancelable);
-		
-		fullscreen = false;
-		mute = false;
-		volume = 1.0;
-		duration = 0;
-		width = 0;
-		height = 0;
-		time = 0;
-		name = type;
-	}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/AspectRatio.hx b/lib/Jaris/src/jaris/player/AspectRatio.hx
deleted file mode 100644
index 3b4648bad..000000000
--- a/lib/Jaris/src/jaris/player/AspectRatio.hx
+++ /dev/null
@@ -1,49 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player;
-
-/**
- * Stores the player used aspect ratio constants
- */
-class AspectRatio 
-{
-	public static var _1_1:Float = 1 / 1;	
-	public static var _3_2:Float = 3 / 2;	
-	public static var _4_3:Float = 4 / 3;
-	public static var _5_4:Float = 5 / 4;
-	public static var _14_9:Float = 14 / 9;
-	public static var _14_10:Float = 14 / 10;
-	public static var _16_9:Float = 16 / 9;
-	public static var _16_10:Float = 16 / 10;
-	
-	/**
-	 * Calculates the ratio for a given width and height
-	 * @param	width
-	 * @param	height
-	 * @return aspect ratio
-	 */
-	public static function getAspectRatio(width:Float, height:Float):Float
-	{
-		return width / height;
-	}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/InputType.hx b/lib/Jaris/src/jaris/player/InputType.hx
deleted file mode 100644
index e22e502e3..000000000
--- a/lib/Jaris/src/jaris/player/InputType.hx
+++ /dev/null
@@ -1,32 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player;
-
-/**
- * Stores the identifiers for loaded media type
- */
-class InputType 
-{
-	public static var AUDIO = "audio";
-	public static var VIDEO = "video";
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/JsApi.hx b/lib/Jaris/src/jaris/player/JsApi.hx
deleted file mode 100644
index 59f725717..000000000
--- a/lib/Jaris/src/jaris/player/JsApi.hx
+++ /dev/null
@@ -1,232 +0,0 @@
-/**    
- * @author Sascha Kluger
- * @copyright 2010 Jefferson González, Sascha Kluger
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player;
-
-//{Libraries
-import flash.system.Capabilities;
-import flash.system.Security;
-import flash.external.ExternalInterface;
-import flash.display.GradientType;
-import flash.events.Event;
-import flash.events.TimerEvent;
-import flash.geom.Matrix;
-import flash.Lib;
-import flash.events.MouseEvent;
-import flash.display.MovieClip;
-import flash.net.NetStream;
-import flash.geom.Rectangle;
-import flash.net.ObjectEncoding;
-import flash.text.AntiAliasType;
-import flash.text.TextField;
-import flash.text.TextFieldAutoSize;
-import flash.text.TextFormat;
-import flash.utils.Timer;
-import jaris.animation.Animation;
-import jaris.display.Loader;
-import jaris.events.PlayerEvents;
-import jaris.player.controls.AspectRatioIcon;
-import jaris.player.controls.FullscreenIcon;
-import jaris.player.controls.PauseIcon;
-import jaris.player.controls.PlayIcon;
-import jaris.player.controls.VolumeIcon;
-import jaris.player.Player;
-import flash.display.Sprite;
-import flash.display.Stage;
-import jaris.utils.Utils;
-//}
-
-/**
- * Default controls for jaris player
- */
-class JsApi extends MovieClip {
-	
-	//{Member Variables
-	private var _stage:Stage;
-	private var _movieClip:MovieClip;
-	private var _player:Player;
-	private var _isBuffering:Bool;
-	private var _percentLoaded:Float;
-	private var _externalListeners:Hash<String>;
-	
-	//}
-	
-	
-	//{Constructor
-	public function new(player:Player)
-	{
-		super();
-		_externalListeners = new Hash<String>();
-
-		Security.allowDomain("*");
-		
-		//{Main variables
-		// _stage = Lib.current.stage;
-		// _movieClip = Lib.current;
-		_player = player;
-				
-		_player.addEventListener(PlayerEvents.MOUSE_HIDE, onPlayerEvent);
-		_player.addEventListener(PlayerEvents.MOUSE_SHOW, onPlayerEvent);
-		_player.addEventListener(PlayerEvents.MEDIA_INITIALIZED, onPlayerEvent);
-		_player.addEventListener(PlayerEvents.BUFFERING, onPlayerEvent);
-		_player.addEventListener(PlayerEvents.NOT_BUFFERING, onPlayerEvent);
-		_player.addEventListener(PlayerEvents.RESIZE, onPlayerEvent);
-		_player.addEventListener(PlayerEvents.PLAY_PAUSE, onPlayerEvent);
-		_player.addEventListener(PlayerEvents.PLAYBACK_FINISHED, onPlayerEvent);
-		_player.addEventListener(PlayerEvents.CONNECTION_FAILED, onPlayerEvent);
-		_player.addEventListener(PlayerEvents.ASPECT_RATIO, onPlayerEvent);
-		_player.addEventListener(PlayerEvents.VOLUME_UP, onPlayerEvent);
-		_player.addEventListener(PlayerEvents.VOLUME_DOWN, onPlayerEvent);		
-		_player.addEventListener(PlayerEvents.VOLUME_CHANGE, onPlayerEvent);				
-		_player.addEventListener(PlayerEvents.MUTE, onPlayerEvent);		
-		_player.addEventListener(PlayerEvents.TIME, onPlayerEvent);		
-		_player.addEventListener(PlayerEvents.PROGRESS, onPlayerEvent);				
-		_player.addEventListener(PlayerEvents.SEEK, onPlayerEvent);			
-		
-		ExternalInterface.addCallback("api_get", getAttribute);
-		ExternalInterface.addCallback("api_addlistener", addJsListener);			
-		ExternalInterface.addCallback("api_removelistener", removeJsListener);			
-		ExternalInterface.addCallback("api_play", setPlay);		
-		ExternalInterface.addCallback("api_pause", setPause);
-		ExternalInterface.addCallback("api_seek", setSeek);
-		ExternalInterface.addCallback("api_volume", setVolume);
-	
-
-	}
-		
-	public function getAttribute(attribute:String):Float {
-			
-			switch (attribute) {
-				case 'isBuffering': 
-					return (_isBuffering) ? 1 : 0;
-					
-				case 'isPlaying': 
-					return (_player.isPlaying()) ? 1 : 0;
-				
-				case 'time': 
-					return Math.round(_player.getCurrentTime() * 10) / 10; 
-					
-				case 'loaded': 
-					return _player.getBytesLoaded();
-				
-				case 'volume': 
-					return (_player.getMute()==true) ? 0 : _player.getVolume();
-			}
-			
-			return 0;
-
-
-	}	
-	
-	public function addJsListener(attribute:String, parameter:String):Void {		
-		_externalListeners.set(attribute.toLowerCase(), parameter);
-	}
-		
-	public function removeJsListener(attribute:String):Void {		
-		if (attribute == '*') 
-		{
-			_externalListeners = new Hash<String>();
-			return;
-		}
-		_externalListeners.remove(attribute.toLowerCase());
-	}	
-	
-	public function onPlayerEvent(event:PlayerEvents):Void
-	{
-		var jsFunction = '';
-		var data = {
-				duration:		event.duration,
-				fullscreen:		event.fullscreen,
-				mute:			event.mute,
-				volume:			event.volume,
-				position:		event.time,
-				type:			event.name,
-				loaded:			_player.getBytesLoaded(),
-				total:			_player.getBytesTotal()
-		};
-		
-		if (_externalListeners.exists(event.name.toLowerCase()))
-		{		
-			ExternalInterface.call(_externalListeners.get(event.name.toLowerCase()), data);
-		} 
-		
-		if (_externalListeners.exists('on*'))
-		{		
-			ExternalInterface.call(_externalListeners.get('on*'), data);
-		} 
-	
-	}
-	
-	
-	/**
-	 * Toggles pause or play
-	 */
-	private function setPlay():Void
-	{
-		if (_player.isPlaying()!=true) {
-			_player.togglePlay();
-		}
-	}	
-	
-	/**
-	 * Toggles play or pause
-	 */
-	private function setPause():Void
-	{
-		if (_player.isPlaying()==true) {
-			_player.togglePlay();
-		}
-	}	
-	
-	/**
-	 * Set Seek
-	 */
-	private function setSeek(pos:Float):Void
-	{
-		_player.seek(pos);	
-	}	
-	
-	/**
-	 * Set Volume
-	 */
-	private function setVolume(vol:Float):Void
-	{
-		if (vol <= 0 && _player.getMute()!=true) {
-			_player.toggleMute();
-			_player.setVolume(0);
-			return;
-		}
-		
-		if (_player.getMute() == true) {
-			_player.toggleMute();			
-		}
-		
-		if (vol >= 1) {
-			_player.setVolume(1);
-			return;
-		}
-		
-		_player.setVolume(vol);
-	}	
-		
-	
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/Loop.hx b/lib/Jaris/src/jaris/player/Loop.hx
deleted file mode 100644
index acd6dbd51..000000000
--- a/lib/Jaris/src/jaris/player/Loop.hx
+++ /dev/null
@@ -1,50 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player;
-
-//{Libraries
-import jaris.events.PlayerEvents;
-//}
-
-/**
- * Implements a loop mechanism on the player
- */
-class Loop 
-{
-	private var _player:Player;
-	
-	public function new(player:Player) 
-	{
-		_player = player;
-		_player.addEventListener(PlayerEvents.PLAYBACK_FINISHED, onPlayerStop);
-	}
-	
-	/**
-	 * Everytime the player stops, the playback is restarted
-	 * @param	event
-	 */
-	private function onPlayerStop(event:PlayerEvents):Void
-	{
-		_player.togglePlay();
-	}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/Player.hx b/lib/Jaris/src/jaris/player/Player.hx
deleted file mode 100644
index 144dd8dff..000000000
--- a/lib/Jaris/src/jaris/player/Player.hx
+++ /dev/null
@@ -1,1788 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player;
-
-import flash.display.Loader;
-import flash.display.MovieClip;
-import flash.display.Sprite;
-import flash.display.Stage;
-import flash.display.StageDisplayState;
-import flash.events.AsyncErrorEvent;
-import flash.events.Event;
-import flash.events.EventDispatcher;
-import flash.events.FullScreenEvent;
-import flash.events.IOErrorEvent;
-import flash.events.KeyboardEvent;
-import flash.events.MouseEvent;
-import flash.events.NetStatusEvent;
-import flash.events.ProgressEvent;
-import flash.events.TimerEvent;
-import flash.geom.Rectangle;
-import flash.Lib;
-import flash.media.ID3Info;
-import flash.media.Sound;
-import flash.media.SoundChannel;
-import flash.media.SoundTransform;
-import flash.media.Video;
-import flash.net.NetConnection;
-import flash.net.NetStream;
-import flash.net.URLRequest;
-import flash.system.Capabilities;
-import flash.system.Security;
-import flash.ui.Keyboard;
-import flash.ui.Mouse;
-import flash.utils.Timer;
-import jaris.events.PlayerEvents;
-import jaris.utils.Utils;
-import jaris.player.AspectRatio;
-import jaris.player.UserSettings;
-
-/**
- * Jaris main video player
- */
-class Player extends EventDispatcher
-{
-	//{Member variables
-	private var _stage:Stage;
-	private var _movieClip:MovieClip;
-	private var _connection:NetConnection;
-	private var _stream:NetStream;
-	private var _fullscreen:Bool;
-	private var _soundMuted:Bool;
-	private var _volume:Float;
-	private var _bufferTime:Float;
-	private var _mouseVisible:Bool;
-	private var _mediaLoaded:Bool;
-	private var _hideMouseTimer:Timer;
-	private var _checkAudioTimer:Timer;
-	private var _mediaSource:String;
-	private var _type:String;
-	private var _streamType:String;
-	private var _server:String; //For future use on rtmp
-	private var _sound:Sound;
-	private var _soundChannel:SoundChannel;
-	private var _id3Info:ID3Info;
-	private var _video:Video;
-	private var _videoWidth:Float;
-	private var _videoHeight:Float;
-	private var _videoMask:Sprite;
-	private var _videoQualityHigh:Bool;
-	private var _mediaDuration:Float;
-	private var _lastTime:Float;	
-	private var _lastProgress:Float;
-	private var _isPlaying:Bool;
-	private var _aspectRatio:Float;
-	private var _currentAspectRatio:String;
-	private var _originalAspectRatio:Float;
-	private var _mediaEndReached:Bool;
-	private var _seekPoints:Array<Float>;
-	private var _downloadCompleted:Bool;
-	private var _startTime:Float;
-	private var _firstLoad:Bool;
-	private var _stopped:Bool;
-	private var _useHardWareScaling:Bool;
-	private var _youtubeLoader:Loader;
-	private var _userSettings:UserSettings;
-	//}
-	
-	
-	//{Constructor
-	public function new() 
-	{
-		super();
-		
-		//{Main Variables Init
-		_stage = Lib.current.stage;
-		_movieClip = Lib.current;
-		_mouseVisible = true;
-		_soundMuted = false;
-		_volume = 1.0;
-		_bufferTime = 10;
-		_fullscreen = false;
-		_mediaLoaded = false;
-		_hideMouseTimer = new Timer(1500);
-		_checkAudioTimer = new Timer(100);
-		_seekPoints = new Array();
-		_downloadCompleted = false;
-		_startTime = 0;
-		_firstLoad = true;
-		_stopped = false;
-		_videoQualityHigh = false;
-		_isPlaying = false;
-		_streamType = StreamType.FILE;
-		_type = InputType.VIDEO;
-		_server = "";
-		_currentAspectRatio = "original";
-		_aspectRatio = 0;
-		_lastTime = 0;
-		_lastProgress = 0;
-		_userSettings = new UserSettings();
-		//}
-		
-		//{Initialize sound object
-		_sound = new Sound();
-		_sound.addEventListener(Event.COMPLETE, onSoundComplete);
-        _sound.addEventListener(Event.ID3, onSoundID3);
-        _sound.addEventListener(IOErrorEvent.IO_ERROR, onSoundIOError);
-        _sound.addEventListener(ProgressEvent.PROGRESS, onSoundProgress);
-
-		//}
-		
-		//{Initialize video and connection objects
-		_connection = new NetConnection();
-		_connection.client = this;
-		_connection.connect(null);
-		_stream = new NetStream(_connection);
-		
-		_video = new Video(_stage.stageWidth, _stage.stageHeight);
-		
-		_movieClip.addChild(_video);
-		//}
-		
-		//Video mask so that custom menu items work
-		_videoMask = new Sprite();
-		_movieClip.addChild(_videoMask);
-		
-		//Set initial rendering to high quality
-		toggleQuality();
-		
-		//{Initialize system event listeners
-		_movieClip.addEventListener(Event.ENTER_FRAME, onEnterFrame);
-		_stage.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
-		_stage.addEventListener(MouseEvent.MOUSE_MOVE, onMouseMove);
-		_stage.addEventListener(FullScreenEvent.FULL_SCREEN, onFullScreen);
-		_stage.addEventListener(Event.RESIZE, onResize);
-		_hideMouseTimer.addEventListener(TimerEvent.TIMER, hideMouseTimer);
-		_checkAudioTimer.addEventListener(TimerEvent.TIMER, checkAudioTimer);
-		_connection.addEventListener(NetStatusEvent.NET_STATUS, onNetStatus);
-		_connection.addEventListener(AsyncErrorEvent.ASYNC_ERROR, onAsyncError);
-		//}
-	}
-	//}
-	
-	
-	//{Timers
-	/**
-	 * Timer that hides the mouse pointer when it is idle and dispatch the PlayerEvents.MOUSE_HIDE
-	 * @param	event
-	 */
-	private function hideMouseTimer(event:TimerEvent):Void
-	{
-		if (_fullscreen)
-		{
-			if (_mouseVisible)
-			{
-				_mouseVisible = false;
-			}
-			else
-			{
-				Mouse.hide();
-				callEvents(PlayerEvents.MOUSE_HIDE);
-				_hideMouseTimer.stop();
-			}
-		}
-	}
-	
-	/**
-	 * To check if the sound finished playing
-	 * @param	event
-	 */
-	private function checkAudioTimer(event:TimerEvent):Void
-	{
-		if (_soundChannel.position + 100 >= _sound.length)
-		{
-			_isPlaying = false;
-			_mediaEndReached = true;
-			callEvents(PlayerEvents.PLAYBACK_FINISHED);
-			
-			_checkAudioTimer.stop();
-		}
-	}
-	//}
-	
-	
-	//{Events
-	/**
-	 * Callback after bandwidth calculation for rtmp streams
-	 */
-	private function onBWDone():Void
-	{
-		//Need to study this more
-	}
-	
-	/**
-	 * Triggers error event on rtmp connections
-	 * @param	event
-	 */
-	private function onAsyncError(event:AsyncErrorEvent):Void
-	{
-		//TODO: Should trigger event for controls to display error message
-		trace(event.error);
-	}
-	
-	/**
-	 * Checks if connection failed or succeed
-	 * @param	event
-	 */
-	private function onNetStatus(event:NetStatusEvent):Void
-	{
-		switch (event.info.code)
-		{
-			case "NetConnection.Connect.Success":
-				if (_streamType == StreamType.RTMP)
-				{
-					_stream = new NetStream(_connection);
-					_stream.addEventListener(NetStatusEvent.NET_STATUS, onNetStatus);
-					_stream.bufferTime = 10;
-					_stream.play(Utils.rtmpSourceParser(_mediaSource), true);
-					_stream.client = this;
-					if(_type == InputType.VIDEO) {_video.attachNetStream(_stream); }
-				}
-				callEvents(PlayerEvents.CONNECTION_SUCCESS);
-
-			case "NetStream.Play.StreamNotFound":
-				trace("Stream not found: " + _mediaSource); //Replace with a dispatch for error event
-				callEvents(PlayerEvents.CONNECTION_FAILED);
-				
-			case "NetStream.Play.Stop":
-				if (_streamType != StreamType.RTMP)
-				{
-					if (_isPlaying) { _stream.togglePause(); }
-					_isPlaying = false;
-					_mediaEndReached = true;
-					callEvents(PlayerEvents.PLAYBACK_FINISHED);
-				}
-				
-			case "NetStream.Play.Start":
-				_isPlaying = true;
-				_mediaEndReached = false;
-				if (_stream.bytesLoaded != _stream.bytesTotal || _streamType == StreamType.RTMP)
-				{
-					callEvents(PlayerEvents.BUFFERING);
-				}
-				
-			case "NetStream.Seek.Notify":
-				_mediaEndReached = false;
-				if (_streamType == StreamType.RTMP)
-				{
-					_isPlaying = true;
-					callEvents(PlayerEvents.PLAY_PAUSE);
-					callEvents(PlayerEvents.BUFFERING);
-				}
-				
-			case "NetStream.Buffer.Empty":
-				if (_stream.bytesLoaded != _stream.bytesTotal)
-				{
-					callEvents(PlayerEvents.BUFFERING);
-				}
-				
-			case "NetStream.Buffer.Full":
-				callEvents(PlayerEvents.NOT_BUFFERING);
-				
-			case "NetStream.Buffer.Flush":
-				if (_stream.bytesLoaded == _stream.bytesTotal)
-				{
-					_downloadCompleted = true;
-				}
-		}
-	}
-	
-	/**
-	 * Proccess keyboard shortcuts
-	 * @param	event
-	 */
-	private function onKeyDown(event:KeyboardEvent):Void
-	{
-		var F_KEY:UInt = 70;
-		var M_KEY:UInt = 77;
-		var X_KEY:UInt = 88;
-		
-		switch(event.keyCode)
-		{
-			case Keyboard.TAB:
-				toggleAspectRatio();
-			
-			case F_KEY:
-				toggleFullscreen();
-				
-			case M_KEY:
-				toggleMute();
-				
-			case Keyboard.UP:
-				volumeUp();
-				
-			case Keyboard.DOWN:
-				volumeDown();
-				
-			case Keyboard.RIGHT:
-				forward();
-				
-			case Keyboard.LEFT:
-				rewind();
-				
-			case Keyboard.SPACE:
-				togglePlay();
-				
-			case X_KEY:
-				stopAndClose();
-		}
-	}
-	
-	/**
-	 * IF player is full screen shows the mouse when gets hide
-	 * @param	event
-	 */
-	private function onMouseMove(event:MouseEvent):Void
-	{
-		if (_fullscreen && !_mouseVisible)
-		{
-			if (!_hideMouseTimer.running)
-			{
-				_hideMouseTimer.start();
-			}
-			
-			_mouseVisible = true;
-			Mouse.show();
-			
-			callEvents(PlayerEvents.MOUSE_SHOW);
-		}
-	}
-	
-	/**
-	 * Resize video player
-	 * @param	event
-	 */
-	private function onResize(event:Event):Void
-	{
-		resizeAndCenterPlayer();
-	}
-	
-	/**
-	 * Dispath a full screen event to listeners as redraw player an takes care of some other aspects
-	 * @param	event
-	 */
-	private function onFullScreen(event:FullScreenEvent):Void
-	{
-		_fullscreen = event.fullScreen;
-		
-		if (!event.fullScreen)
-		{
-			Mouse.show();
-			callEvents(PlayerEvents.MOUSE_SHOW);
-			_mouseVisible = true;
-		}
-		else
-		{
-			_mouseVisible = true;
-			_hideMouseTimer.start();
-		}
-		
-		resizeAndCenterPlayer();
-		
-		callEvents(PlayerEvents.FULLSCREEN);
-	}
-	
-	/**
-	 * Sits for any cue points available
-	 * @param	data
-	 * @note Planned future implementation
-	 */
-	private function onCuePoint(data:Dynamic):Void
-	{
-		
-	}
-	
-	/**
-	 * After a video is loaded this callback gets the video information at start and stores it on variables
-	 * @param	data
-	 */
-	private function onMetaData(data:Dynamic):Void
-	{
-		if (_firstLoad)
-		{
-			_isPlaying = true;
-			
-			_firstLoad = false;
-			if (data.width)
-			{
-				_videoWidth = data.width;
-				_videoHeight = data.height;
-			}
-			else
-			{
-				_videoWidth = _video.width;
-				_videoHeight = _video.height;
-			}
-			
-			//Store seekpoints times
-			if (data.hasOwnProperty("seekpoints")) //MP4
-			{
-				for (position in Reflect.fields(data.seekpoints))
-				{
-					_seekPoints.push(Reflect.field(data.seekpoints, position).time);
-				}
-			}
-			else if (data.hasOwnProperty("keyframes")) //FLV
-			{
-				for (position in Reflect.fields(data.keyframes.times))
-				{
-					_seekPoints.push(Reflect.field(data.keyframes.times, position));
-				}
-			}
-			
-			_mediaLoaded = true;
-			_mediaDuration = data.duration;
-			_originalAspectRatio = AspectRatio.getAspectRatio(_videoWidth, _videoHeight);
-			
-			if (_aspectRatio <= 0)
-			{
-				_aspectRatio = _originalAspectRatio;
-			}
-			
-			callEvents(PlayerEvents.MEDIA_INITIALIZED);
-			
-			resizeAndCenterPlayer();
-			
-			//Retrieve the volume that user selected last time
-			setVolume(_userSettings.getVolume());
-		}
-	}
-	
-	/**
-	 * Dummy function invoked for pseudostream servers
-	 * @param	data
-	 */
-	private function onLastSecond(data:Dynamic):Void
-	{
-		trace("last second pseudostream");
-	}
-	
-	/**
-	 * Broadcast Timeupdate and Duration	 
-	 */	
-	private function onEnterFrame(event:Event):Void
-	{
-		if (getDuration() > 0 && _lastTime != getCurrentTime()) 
-		{
-			_lastTime = getCurrentTime();
-			callEvents(PlayerEvents.TIME);
-		}
-		
-		if (getBytesLoaded() > 0 && _lastProgress < getBytesLoaded()) 
-		{
-			_lastProgress = getBytesLoaded();
-			callEvents(PlayerEvents.PROGRESS);
-		}
-		
-	}		
-	
-	
-	/**
-	 * Triggers when playbacks end on rtmp streaming server
-	 */
-	private function onPlayStatus(info:Dynamic):Void
-	{
-		_isPlaying = false;
-		_mediaEndReached = true;
-		callEvents(PlayerEvents.PLAYBACK_FINISHED);
-	}
-	
-	/**
-	 * When sound finished downloading
-	 * @param	event
-	 */
-	private function onSoundComplete(event:Event)
-	{
-		_mediaDuration = _sound.length / 1000;
-		_downloadCompleted = true;
-		
-		callEvents(PlayerEvents.MEDIA_INITIALIZED);
-	}
-	
-	/**
-	 * Mimic stream onMetaData
-	 * @param	event
-	 */
-	private function onSoundID3(event:Event)
-	{
-		if (_firstLoad)
-		{
-			_soundChannel = _sound.play();
-			_checkAudioTimer.start();
-
-			_isPlaying = true;
-			
-			_firstLoad = false;
-			
-			_mediaLoaded = true;
-			_mediaDuration = ((_sound.bytesTotal / _sound.bytesLoaded) * _sound.length) / 1000;
-			_aspectRatio = AspectRatio.getAspectRatio(_videoWidth, _videoHeight);
-			_originalAspectRatio = _aspectRatio;
-			_id3Info = _sound.id3;
-			
-			callEvents(PlayerEvents.CONNECTION_SUCCESS);
-			callEvents(PlayerEvents.MEDIA_INITIALIZED);
-			
-			resizeAndCenterPlayer();
-			
-			//Retrieve the volume that user selected last time
-			setVolume(_userSettings.getVolume());
-		}
-	}
-	
-	/**
-	 * Dispatch connection failed event on error
-	 * @param	event
-	 */
-	private function onSoundIOError(event:IOErrorEvent)
-	{
-		callEvents(PlayerEvents.CONNECTION_FAILED);
-	}
-	
-	/**
-	 * Monitor sound download progress
-	 * @param	event
-	 */
-	private function onSoundProgress(event:ProgressEvent)
-	{
-		if (_sound.isBuffering)
-		{
-			callEvents(PlayerEvents.BUFFERING);
-		}
-		else
-		{
-			callEvents(PlayerEvents.NOT_BUFFERING);
-		}
-		
-		_mediaDuration = ((_sound.bytesTotal / _sound.bytesLoaded) * _sound.length) / 1000;
-		callEvents(PlayerEvents.MEDIA_INITIALIZED);
-	}
-	
-	/**
-	 * Initializes the youtube loader object
-	 * @param	event
-	 */
-	private function onYouTubeLoaderInit(event:Event):Void
-	{
-		_youtubeLoader.content.addEventListener("onReady", onYoutubeReady);
-		_youtubeLoader.content.addEventListener("onError", onYoutubeError);
-		_youtubeLoader.content.addEventListener("onStateChange", onYoutubeStateChange);
-		_youtubeLoader.content.addEventListener("onPlaybackQualityChange", onYoutubePlaybackQualityChange);
-
-	}
-	
-	/**
-	 * This event is fired when the player is loaded and initialized, meaning it is ready to receive API calls.
-	 */
-	private function onYoutubeReady(event:Event):Void
-	{
-		_movieClip.addChild(_youtubeLoader.content);
-		_movieClip.setChildIndex(_youtubeLoader.content, 0);
-		Reflect.field(_youtubeLoader.content, "setSize")(_stage.stageWidth, _stage.stageHeight);
-		Reflect.field(_youtubeLoader.content, "loadVideoByUrl")(Utils.youtubeSourceParse(_mediaSource));
-		callEvents(PlayerEvents.BUFFERING);
-	}
-
-	/**
-	 * This event is fired whenever the player's state changes. Possible values are unstarted (-1), ended (0), 
-	 * playing (1), paused (2), buffering (3), video cued (5). When the SWF is first loaded it will broadcast 
-	 * an unstarted (-1) event. When the video is cued and ready to play it will broadcast a video cued event (5).
-	 * @param	event
-	 */
-	private function onYoutubeStateChange(event:Event):Void
-	{
-		var status:UInt = Std.parseInt(Reflect.field(event, "data"));
-		
-		switch(status)
-		{
-			case -1:
-				callEvents(PlayerEvents.BUFFERING);
-			
-			case 0:
-				_isPlaying = false;
-				_mediaEndReached = true;
-				callEvents(PlayerEvents.PLAYBACK_FINISHED);
-				
-			case 1:
-				if (_firstLoad)
-				{
-					_isPlaying = true;
-					
-					_videoWidth = _stage.stageWidth;
-					_videoHeight = _stage.stageHeight;
-				
-					_firstLoad = false;
-					
-					_mediaLoaded = true;
-					_mediaDuration = Reflect.field(_youtubeLoader.content, "getDuration")();
-					_aspectRatio = AspectRatio.getAspectRatio(_videoWidth, _videoHeight);
-					_originalAspectRatio = _aspectRatio;
-					
-					callEvents(PlayerEvents.CONNECTION_SUCCESS);
-					callEvents(PlayerEvents.MEDIA_INITIALIZED);
-					
-					resizeAndCenterPlayer();
-					
-					//Retrieve the volume that user selected last time
-					setVolume(_userSettings.getVolume());
-				}
-				callEvents(PlayerEvents.NOT_BUFFERING);
-				
-			case 2:
-				callEvents(PlayerEvents.NOT_BUFFERING);
-				
-			case 3:
-				callEvents(PlayerEvents.BUFFERING);
-				
-			case 5:
-				callEvents(PlayerEvents.NOT_BUFFERING);
-		}
-	}
-    
-	/**
-	 * This event is fired whenever the video playback quality changes. For example, if you call the 
-	 * setPlaybackQuality(suggestedQuality) function, this event will fire if the playback quality actually 
-	 * changes. Your code should respond to the event and should not assume that the quality will automatically 
-	 * change when the setPlaybackQuality(suggestedQuality) function is called. Similarly, your code should not 
-	 * assume that playback quality will only change as a result of an explicit call to setPlaybackQuality or any 
-	 * other function that allows you to set a suggested playback quality.
-	 * 
-	 * The value that the event broadcasts is the new playback quality. Possible values are "small", "medium", 
-	 * "large" and "hd720".
-	 * @param	event
-	 */
-	private function onYoutubePlaybackQualityChange(event:Event):Void
-	{
-		//trace(Reflect.field(event, "data"));
-	}
-   
-	/**
-	 * This event is fired when an error in the player occurs. The possible error codes are 100, 101, 
-	 * and 150. The 100 error code is broadcast when the video requested is not found. This occurs when 
-	 * a video has been removed (for any reason), or it has been marked as private. The 101 error code is 
-	 * broadcast when the video requested does not allow playback in the embedded players. The error code 
-	 * 150 is the same as 101, it's just 101 in disguise!
-	 * @param	event
-	 */
-	private function onYoutubeError(event:Event):Void
-	{
-		trace(Reflect.field(event, "data"));
-	}
-	//}
-	
-	
-	//{Private Methods
-	/**
-	 * Function used each time is needed to dispatch an event
-	 * @param	type
-	 */
-	private function callEvents(type:String):Void
-	{
-		var playerEvent:PlayerEvents = new PlayerEvents(type, true);
-		
-		playerEvent.aspectRatio = getAspectRatio();
-		playerEvent.duration = getDuration();
-		playerEvent.fullscreen = isFullscreen();
-		playerEvent.mute = getMute();
-		playerEvent.volume = getVolume();
-		playerEvent.width = _video.width;
-		playerEvent.height = _video.height;
-		playerEvent.stream = getNetStream();
-		playerEvent.sound = getSound();
-		playerEvent.time = getCurrentTime();
-		playerEvent.id3Info = getId3Info();
-		
-		dispatchEvent(playerEvent);
-	}
-	
-	/**
-	 * Reposition and resizes the video player to fit on screen
-	 */
-	private function resizeAndCenterPlayer():Void
-	{
-		if (_streamType != StreamType.YOUTUBE)
-		{
-			_video.height = _stage.stageHeight;
-			_video.width = _video.height * _aspectRatio;
-			
-			_video.x = (_stage.stageWidth / 2) - (_video.width / 2);
-			_video.y = 0;
-			
-			if (_video.width > _stage.stageWidth && _aspectRatio == _originalAspectRatio)
-			{
-				var aspectRatio:Float = _videoHeight / _videoWidth;
-				_video.width = _stage.stageWidth;
-				_video.height = aspectRatio * _video.width;
-				_video.x = 0;
-				_video.y = (_stage.stageHeight / 2) - (_video.height / 2);
-			}
-			
-			_videoMask.graphics.clear();
-			_videoMask.graphics.lineStyle();
-			_videoMask.graphics.beginFill(0x000000, 0);
-			_videoMask.graphics.drawRect(_video.x, _video.y, _video.width, _video.height);
-			_videoMask.graphics.endFill();
-		}
-		else
-		{
-			Reflect.field(_youtubeLoader.content, "setSize")(_stage.stageWidth, _stage.stageHeight);
-			
-			_videoMask.graphics.clear();
-			_videoMask.graphics.lineStyle();
-			_videoMask.graphics.beginFill(0x000000, 0);
-			_videoMask.graphics.drawRect(0, 0, _stage.stageWidth, _stage.stageHeight);
-			_videoMask.graphics.endFill();
-		}
-		
-		callEvents(PlayerEvents.RESIZE);
-	}
-	
-	/**
-	 * Check the best seek point available if the seekpoints array is available
-	 * @param	time time in seconds
-	 * @return best seek point in seconds or given one if no seekpoints array is available
-	 */
-	private function getBestSeekPoint(time:Float):Float
-	{
-		if (_seekPoints.length > 0)
-		{
-			var timeOne:String="0";
-			var timeTwo:String="0";
-			
-			for(prop in Reflect.fields(_seekPoints))
-			{
-				if(Reflect.field(_seekPoints,prop) < time)
-				{
-					timeOne = prop;
-				}
-				else
-				{
-					timeTwo = prop;
-				break;
-				}
-			}
-
-			if(time - _seekPoints[Std.parseInt(timeOne)] < _seekPoints[Std.parseInt(timeTwo)] - time)
-			{
-				return _seekPoints[Std.parseInt(timeOne)];
-			}
-			else
-			{
-				return _seekPoints[Std.parseInt(timeTwo)];
-			}
-		}
-		
-		return time;
-	}
-	
-	/**
-	 * Checks if the given seek time is already buffered
-	 * @param	time time in seconds
-	 * @return true if can seek false if not in buffer
-	 */
-	private function canSeek(time:Float):Bool
-	{
-		if (_type == InputType.VIDEO)
-		{
-			time = getBestSeekPoint(time);
-		}
-		
-		var cacheTotal = Math.floor((getDuration() - _startTime) * (getBytesLoaded() / getBytesTotal())) - 1;
-
-		if(time >= _startTime && time < _startTime + cacheTotal)
-		{
-			return true;
-		}
-		
-		return false;
-	}
-	//}
-	
-	
-	//{Public methods	
-	/**
-	 * Loads a video and starts playing it
-	 * @param	video video url to load
-	 */
-	public function load(source:String, type:String="video", streamType:String="file", server:String=""):Void
-	{
-		stopAndClose();
-		
-		_type = type;
-		_streamType = streamType;
-		_mediaSource = source;
-		_stopped = false;
-		_mediaLoaded = false;
-		_firstLoad = true;
-		_startTime = 0;
-		_downloadCompleted = false;
-		_seekPoints = new Array();
-		_server = server;
-		
-		callEvents(PlayerEvents.BUFFERING);
-		
-		if (_streamType == StreamType.YOUTUBE)
-		{
-			Security.allowDomain("*");
-			Security.allowDomain("www.youtube.com");  
-			Security.allowDomain("youtube.com");  
-			Security.allowDomain("s.ytimg.com");  
-			Security.allowDomain("i.ytimg.com"); 
-		
-			_youtubeLoader = new Loader();
-			_youtubeLoader.contentLoaderInfo.addEventListener(Event.INIT, onYouTubeLoaderInit);
-			_youtubeLoader.load(new URLRequest("http://www.youtube.com/apiplayer?version=3"));
-		}
-		else if (_type == InputType.VIDEO && (_streamType == StreamType.FILE || _streamType == StreamType.PSEUDOSTREAM))
-		{	
-			_connection.connect(null);
-			_stream = new NetStream(_connection);
-			_stream.addEventListener(NetStatusEvent.NET_STATUS, onNetStatus);
-			_stream.bufferTime = _bufferTime;
-			_stream.play(source);
-			_stream.client = this;
-			_video.attachNetStream(_stream);
-		}
-		else if (_type == InputType.VIDEO && _streamType == StreamType.RTMP)
-		{
-			_connection.connect(_server);
-		}
-		else if (_type == InputType.AUDIO && _streamType == StreamType.RTMP)
-		{
-			_connection.connect(_server);
-		}
-		else if(_type == InputType.AUDIO && _streamType == StreamType.FILE)
-		{
-			_sound.load(new URLRequest(source));
-		}
-	}
-	
-	/**
-	 * Closes the connection and makes player available for another video
-	 */
-	public function stopAndClose():Void
-	{
-		if (_mediaLoaded)
-		{
-			_mediaLoaded = false;
-			_isPlaying = false;
-			_stopped = true;
-			_startTime = 0;
-			
-			if (_streamType == StreamType.YOUTUBE)
-			{
-				Reflect.field(_youtubeLoader.content, "destroy")();
-			}
-			else if (_type == InputType.VIDEO)
-			{
-				_stream.close();
-			}
-			else
-			{
-				_soundChannel.stop();
-				_sound.close();
-			}
-		}
-		
-		callEvents(PlayerEvents.STOP_CLOSE);
-	}
-	
-	/**
-	 * Seeks 8 seconds forward from the current position.
-	 * @return current play time after forward
-	 */
-	public function forward():Float
-	{	
-		var seekTime = (getCurrentTime() + 8) + _startTime;
-		
-		if (getDuration() > seekTime)
-		{
-			seekTime = seek(seekTime);
-		}
-		
-		return seekTime;
-	}
-	
-	/**
-	 * Seeks 8 seconds back from the current position.
-	 * @return current play time after rewind
-	 */
-	public function rewind():Float
-	{
-		var seekTime = (getCurrentTime() - 8) + _startTime;
-		
-		if (seekTime >= _startTime)
-		{
-			seekTime = seek(seekTime);
-		}
-		
-		return seekTime;
-	}
-	
-	/**
-	 * Seeks video player to a given time in seconds
-	 * @param	seekTime time in seconds to seek
-	 * @return current play time after seeking
-	 */
-	public function seek(seekTime:Float):Float
-	{
-		if (_startTime <= 1 && _downloadCompleted)
-		{
-			if (_type == InputType.VIDEO || _streamType == StreamType.RTMP)
-			{
-				_stream.seek(seekTime);
-			}
-			else if (_type == InputType.AUDIO)
-			{
-				_soundChannel.stop();
-				_soundChannel = _sound.play(seekTime * 1000);
-				if (!_isPlaying)
-				{
-					_soundChannel.stop();
-				}
-				
-				setVolume(_userSettings.getVolume());
-			}
-		}
-		else if(_seekPoints.length > 0 && _streamType == StreamType.PSEUDOSTREAM)
-		{
-			seekTime = getBestSeekPoint(seekTime);
-			
-			if (canSeek(seekTime))
-			{
-				_stream.seek(seekTime - _startTime);
-			}
-			else if(seekTime != _startTime)
-			{	
-				_startTime = seekTime;
-				
-				var url:String;
-				if (_mediaSource.indexOf("?") != -1)
-				{
-					url = _mediaSource + "&start=" + seekTime;
-				}
-				else
-				{
-					url = _mediaSource + "?start=" + seekTime;
-				}
-				_stream.play(url);
-			}
-		}
-		else if (_streamType == StreamType.YOUTUBE)
-		{
-			if (!canSeek(seekTime))
-			{
-				_startTime = seekTime;
-				Reflect.field(_youtubeLoader.content, "seekTo")(seekTime);
-			}
-			else
-			{
-				Reflect.field(_youtubeLoader.content, "seekTo")(seekTime);
-			}
-			
-		}
-		else if (_streamType == StreamType.RTMP)
-		{
-			// seekTime = getBestSeekPoint(seekTime); //Not Needed?
-			_stream.seek(seekTime);
-		}
-		else if(canSeek(seekTime))
-		{
-			if (_type == InputType.VIDEO || _streamType == StreamType.RTMP)
-			{
-				_stream.seek(seekTime);
-			}
-			else if (_type == InputType.AUDIO)
-			{
-				_soundChannel.stop();
-				_soundChannel = _sound.play(seekTime * 1000);
-				if (!_isPlaying)
-				{
-					_soundChannel.stop();
-				}
-				
-				setVolume(_userSettings.getVolume());
-			}
-		}
-		callEvents(PlayerEvents.SEEK);
-		return seekTime;
-	}
-	
-	/**
-	 * To check wheter the media is playing
-	 * @return true if is playing false otherwise
-	 */
-	public function isPlaying():Bool
-	{
-		return _isPlaying;
-	}
-	
-	/**
-	 * Cycle betewen aspect ratios
-	 * @return new aspect ratio in use
-	 */
-	public function toggleAspectRatio():Float
-	{
-		switch(_currentAspectRatio)
-		{
-			case "original":
-				_aspectRatio = AspectRatio._1_1;
-				_currentAspectRatio = "1:1";
-				
-			case "1:1":
-				_aspectRatio = AspectRatio._3_2;
-				_currentAspectRatio = "3:2";
-				
-			case "3:2":
-				_aspectRatio = AspectRatio._4_3;
-				_currentAspectRatio = "4:3";
-				
-			case "4:3":
-				_aspectRatio = AspectRatio._5_4;
-				_currentAspectRatio = "5:4";
-				
-			case "5:4":
-				_aspectRatio = AspectRatio._14_9;
-				_currentAspectRatio = "14:9";
-				
-			case "14:9":
-				_aspectRatio = AspectRatio._14_10;
-				_currentAspectRatio = "14:10";
-				
-			case "14:10":
-				_aspectRatio = AspectRatio._16_9;
-				_currentAspectRatio = "16:9";
-				
-			case "16:9":
-				_aspectRatio = AspectRatio._16_10;
-				_currentAspectRatio = "16:10";
-				
-			case "16:10":
-				_aspectRatio = _originalAspectRatio;
-				_currentAspectRatio = "original";
-			
-			default:
-				_aspectRatio = _originalAspectRatio;
-				_currentAspectRatio = "original";
-		}
-		
-		resizeAndCenterPlayer();
-		
-		callEvents(PlayerEvents.ASPECT_RATIO);
-		
-		//Store aspect ratio into user settings
-		if (_aspectRatio == _originalAspectRatio)
-		{
-			_userSettings.setAspectRatio(0.0);
-		}
-		else
-		{
-			_userSettings.setAspectRatio(_aspectRatio);
-		}
-		
-		return _aspectRatio;
-	}
-	
-	/**
-	 * Swithces between play and pause
-	 */
-	public function togglePlay():Bool
-	{
-		if (_mediaLoaded)
-		{
-			if (_mediaEndReached)
-			{
-				_mediaEndReached = false;
-				
-				if (_streamType == StreamType.YOUTUBE)
-				{
-					Reflect.field(_youtubeLoader.content, "seekTo")(0);
-					Reflect.field(_youtubeLoader.content, "playVideo")();
-				}
-				else if (_type == InputType.VIDEO || _streamType == StreamType.RTMP)
-				{
-					_stream.seek(0);
-					_stream.togglePause();
-				}
-				else if (_type == InputType.AUDIO)
-				{
-					_checkAudioTimer.start();
-					_soundChannel = _sound.play();
-					setVolume(_userSettings.getVolume());
-				}
-			}
-			else if (_mediaLoaded)
-			{
-				if (_streamType == StreamType.YOUTUBE)
-				{
-					if (_isPlaying)
-					{
-						Reflect.field(_youtubeLoader.content, "pauseVideo")();
-					}
-					else
-					{
-						Reflect.field(_youtubeLoader.content, "playVideo")();
-					}
-				}
-				else if (_type == InputType.VIDEO || _streamType == StreamType.RTMP)
-				{
-					_stream.togglePause();
-				}
-				else if (_type == InputType.AUDIO)
-				{
-					if (_isPlaying)
-					{
-						_soundChannel.stop();
-					}
-					else
-					{
-						//If end of audio reached start from beggining
-						if (_soundChannel.position + 100 >= _sound.length)
-						{
-							_soundChannel = _sound.play();
-						}
-						else 
-						{
-							_soundChannel = _sound.play(_soundChannel.position);
-						}
-						
-						setVolume(_userSettings.getVolume());
-					}
-				}
-			}
-			else if (_stopped)
-			{
-				load(_mediaSource, _type, _streamType, _server);
-			}
-			
-			_isPlaying = !_isPlaying;
-			callEvents(PlayerEvents.PLAY_PAUSE);
-			return _isPlaying;
-		}
-		else if(_mediaSource != "")
-		{
-			load(_mediaSource, _type, _streamType, _server);
-			callEvents(PlayerEvents.BUFFERING);
-			return true;
-		}
-		callEvents(PlayerEvents.PLAY_PAUSE);
-		return false;
-	}
-	
-	/**
-	 * Switches on or off fullscreen
-	 * @return true if fullscreen otherwise false
-	 */
-	public function toggleFullscreen():Bool 
-	{
-		if (_fullscreen)
-		{
-			_stage.displayState = StageDisplayState.NORMAL;
-			_stage.focus = _stage;
-			return false;
-		}
-		else
-		{	
-			if (_useHardWareScaling)
-			{
-				//Match full screen aspec ratio to desktop
-				var aspectRatio = Capabilities.screenResolutionY / Capabilities.screenResolutionX;
-				_stage.fullScreenSourceRect = new Rectangle(0, 0, _videoWidth, _videoWidth * aspectRatio);
-			}
-			else
-			{
-				//Use desktop resolution
-				_stage.fullScreenSourceRect = new Rectangle(0, 0, Capabilities.screenResolutionX ,Capabilities.screenResolutionY);
-			}
-			
-			_stage.displayState = StageDisplayState.FULL_SCREEN;
-			_stage.focus = _stage;
-			return true;
-		}
-	}
-	
-	/**
-	 * Toggles betewen high and low quality image rendering
-	 * @return true if quality high false otherwise
-	 */
-	public function toggleQuality():Bool
-	{
-		if (_videoQualityHigh)
-		{
-			_video.smoothing = false;
-			_video.deblocking = 1;
-		}
-		else
-		{
-			_video.smoothing = true;
-			_video.deblocking = 5;
-		}
-		
-		_videoQualityHigh = _videoQualityHigh?false:true;
-		
-		return _videoQualityHigh;
-	}
-	
-	/**
-	 * Mutes or unmutes the sound
-	 * @return true if muted false if unmuted
-	 */
-	public function toggleMute():Bool
-	{
-		var soundTransform:SoundTransform = new SoundTransform();
-		var isMute:Bool;
-		
-		//unmute sound
-		if (_soundMuted)
-		{
-			_soundMuted = false;
-			
-			if (_volume > 0)
-			{
-				soundTransform.volume = _volume;
-			}
-			else
-			{
-				_volume = 1.0;
-				soundTransform.volume = _volume;
-			}
-			
-			isMute =  false;
-		}
-		
-		//mute sound
-		else
-		{
-			_soundMuted = true;
-			_volume = _stream.soundTransform.volume;
-			soundTransform.volume = 0;
-			_stream.soundTransform = soundTransform;
-			
-			isMute = true;
-		}
-		
-		if (_streamType == StreamType.YOUTUBE)
-		{
-			Reflect.field(_youtubeLoader.content, "setVolume")(soundTransform.volume * 100);
-		}
-		else if (_type == InputType.VIDEO || _streamType == StreamType.RTMP)
-		{
-			_stream.soundTransform = soundTransform;
-		}
-		else if (_type == InputType.AUDIO)
-		{
-			_soundChannel.soundTransform = soundTransform;
-			setVolume(_userSettings.getVolume());
-		}
-		
-		callEvents(PlayerEvents.MUTE);
-		return isMute;
-	}
-	
-	/**
-	 * Check if player is running on fullscreen mode
-	 * @return true if fullscreen false if not
-	 */
-	public function isFullscreen():Bool
-	{
-		return _stage.displayState == StageDisplayState.FULL_SCREEN;
-	}
-	
-	/**
-	 * Raises the volume
-	 * @return volume value after raising
-	 */
-	public function volumeUp():Float
-	{
-		var soundTransform:SoundTransform = new SoundTransform();
-		
-		if (_soundMuted)
-		{
-			_soundMuted = false;
-		}
-	
-		//raise volume if not already at max
-		if (_volume < 1)
-		{
-			if (_streamType == StreamType.YOUTUBE)
-			{
-				_volume = (Reflect.field(_youtubeLoader.content, "getVolume")() + 10) / 100;
-				Reflect.field(_youtubeLoader.content, "setVolume")(_volume * 100);
-			}
-			else if (_type == InputType.VIDEO || _streamType == StreamType.RTMP)
-			{
-				_volume = _stream.soundTransform.volume + (10/100);
-				soundTransform.volume = _volume;
-				_stream.soundTransform = soundTransform;
-			}
-			else if (_type == InputType.AUDIO)
-			{
-				_volume = _soundChannel.soundTransform.volume + (10/100);
-				soundTransform.volume = _volume;
-				_soundChannel.soundTransform = soundTransform;
-			}
-		}
-		
-		//reset volume to 1.0 if already reached max
-		if (_volume >= 1)
-		{
-			_volume = 1.0;
-		}
-		
-		//Store volume into user settings
-		_userSettings.setVolume(_volume);
-		
-		callEvents(PlayerEvents.VOLUME_UP);
-		return _volume;
-	}
-	
-	/**
-	 * Lower the volume
-	 * @return volume value after lowering
-	 */
-	public function volumeDown():Float
-	{
-		var soundTransform:SoundTransform = new SoundTransform();
-		
-		//lower sound
-		if(!_soundMuted)
-		{	
-			if (_streamType == StreamType.YOUTUBE)
-			{
-				_volume = (Reflect.field(_youtubeLoader.content, "getVolume")() - 10) / 100;
-				Reflect.field(_youtubeLoader.content, "setVolume")(_volume * 100);
-			}
-			else if (_type == InputType.VIDEO || _streamType == StreamType.RTMP)
-			{
-				_volume = _stream.soundTransform.volume - (10/100);
-				soundTransform.volume = _volume;
-				_stream.soundTransform = soundTransform;
-			}
-			else if (_type == InputType.AUDIO)
-			{
-				_volume = _soundChannel.soundTransform.volume - (10/100);
-				soundTransform.volume = _volume;
-				_soundChannel.soundTransform = soundTransform;
-			}
-			
-			//if volume reached min is muted
-			if (_volume <= 0)
-			{
-				_soundMuted = true;
-				_volume = 0;
-			}
-		}
-		
-		//Store volume into user settings
-		_userSettings.setVolume(_volume);
-		
-		callEvents(PlayerEvents.VOLUME_DOWN);
-		return _volume;
-	}
-	//}
-	
-	
-	//{Setters
-	/**
-	 * Set input type
-	 * @param	type Allowable values are audio, video
-	 */
-	public function setType(type:String):Void
-	{
-		_type = type;
-	}
-	
-	/**
-	 * Set streaming type
-	 * @param	streamType Allowable values are file, http, rmtp
-	 */
-	public function setStreamType(streamType:String):Void
-	{
-		_streamType = streamType;
-	}
-	
-	/**
-	 * Sets the server url for rtmp streams
-	 * @param	server
-	 */
-	public function setServer(server:String):Void
-	{
-		_server = server;
-	}
-	
-	/**
-	 * To set the video source in case we dont want to start downloading at first so when use tooglePlay the
-	 * media is loaded automatically
-	 * @param	source
-	 */
-	public function setSource(source):Void
-	{
-		_mediaSource = source;
-	}
-	
-	/**
-	 * Changes the current volume
-	 * @param	volume
-	 */
-	public function setVolume(volume:Float):Void
-	{
-		var soundTransform:SoundTransform = new SoundTransform();
-		
-		if (volume > _volume) {
-			callEvents(PlayerEvents.VOLUME_UP);
-		}
-
-		if (volume < _volume) {
-			callEvents(PlayerEvents.VOLUME_DOWN);
-		}
-
-		if (volume > 0)
-		{
-			_soundMuted = false;
-			_volume = volume;
-		}
-		else
-		{
-			_soundMuted = true;
-			_volume = 1.0;
-		}
-		
-		soundTransform.volume = volume;
-		
-		if (!_firstLoad) //To prevent errors if objects aren't initialized
-		{
-			if (_streamType == StreamType.YOUTUBE)
-			{
-				Reflect.field(_youtubeLoader.content, "setVolume")(soundTransform.volume * 100);
-			}
-			else if (_type == InputType.VIDEO || _streamType == StreamType.RTMP)
-			{
-				_stream.soundTransform = soundTransform;
-			}
-			else if (_type == InputType.AUDIO)
-			{
-				_soundChannel.soundTransform = soundTransform;
-			}
-		}
-		
-		//Store volume into user settings
-		_userSettings.setVolume(_volume);
-
-		callEvents(PlayerEvents.VOLUME_CHANGE);
-	}
-	
-	/**
-	 * Changes the buffer time for local and pseudo streaming
-	 * @param	time in seconds
-	 */
-	public function setBufferTime(time:Float):Void
-	{
-		if (time > 0)
-		{
-			_bufferTime = time;
-		}
-	}
-	
-	/**
-	 * Changes the aspec ratio of current playing media and resizes video player
-	 * @param	aspectRatio new aspect ratio value
-	 */
-	public function setAspectRatio(aspectRatio:Float):Void
-	{
-		_aspectRatio = aspectRatio;
-		
-		switch(_aspectRatio)
-		{
-			case 0.0:
-				_currentAspectRatio = "original";
-				
-			case AspectRatio._1_1:
-				_currentAspectRatio = "1:1";
-				
-			case AspectRatio._3_2:
-				_currentAspectRatio = "3:2";
-				
-			case AspectRatio._4_3:
-				_currentAspectRatio = "4:3";
-				
-			case AspectRatio._5_4:
-				_currentAspectRatio = "5:4";
-				
-			case AspectRatio._14_9:
-				_currentAspectRatio = "14:9";
-				
-			case AspectRatio._14_10:
-				_currentAspectRatio = "14:10";
-				
-			case AspectRatio._16_9:
-				_currentAspectRatio = "16:9";
-				
-			case AspectRatio._16_10:
-				_currentAspectRatio = "16:10";
-		}
-		
-		resizeAndCenterPlayer();
-		
-		//Store aspect ratio into user settings
-		_userSettings.setAspectRatio(_aspectRatio);
-	}
-	
-	/**
-	 * Enable or disable hardware scaling
-	 * @param	value true to enable false to disable
-	 */
-	public function setHardwareScaling(value:Bool):Void
-	{
-		_useHardWareScaling = value;
-	}
-	//}
-	
-	
-	//{Getters
-	/**
-	 * Gets the volume amount 0.0 to 1.0
-	 * @return 
-	 */
-	public function getVolume():Float
-	{
-		return _volume;
-	}
-	
-	/**
-	 * The current aspect ratio of the loaded Player
-	 * @return
-	 */
-	public function getAspectRatio():Float
-	{
-		return _aspectRatio;
-	}
-	
-	/**
-	 * The current aspect ratio of the loaded Player in string format
-	 * @return
-	 */
-	public function getAspectRatioString():String
-	{
-		return _currentAspectRatio;
-	}
-	
-	/**
-	 * Original aspect ratio of the video
-	 * @return original aspect ratio
-	 */
-	public function getOriginalAspectRatio():Float
-	{
-		return _originalAspectRatio;
-	}
-	
-	/**
-	 * Total duration time of the loaded media
-	 * @return time in seconds
-	 */
-	public function getDuration():Float
-	{
-		return _mediaDuration;
-	}
-	
-	/**
-	 * The time in seconds where the player started downloading
-	 * @return time in seconds
-	 */
-	public function getStartTime():Float
-	{
-		return _startTime;
-	}
-	
-	/**
-	 * The stream associated with the player
-	 * @return netstream object
-	 */
-	public function getNetStream():NetStream
-	{
-		return _stream;
-	}
-	
-	/**
-	 * Video object associated to the player
-	 * @return video object for further manipulation
-	 */
-	public function getVideo():Video
-	{	
-		return _video;
-	}
-	
-	/**
-	 * Sound object associated to the player
-	 * @return sound object for further manipulation
-	 */
-	public function getSound():Sound
-	{
-		return _sound;
-	}
-	
-	/**
-	 * The id3 info of sound object
-	 * @return
-	 */
-	public function getId3Info():ID3Info
-	{
-		return _id3Info;
-	}
-	
-	/**
-	 * The current sound state
-	 * @return true if mute otherwise false
-	 */
-	public function getMute():Bool
-	{
-		return _soundMuted;
-	}
-	
-	/**
-	 * The amount of total bytes
-	 * @return amount of bytes
-	 */
-	public function getBytesTotal():Float
-	{
-		var bytesTotal:Float = 0;
-		
-		if (_streamType == StreamType.YOUTUBE)
-		{
-			if(_youtubeLoader != null && _mediaLoaded)
-			bytesTotal = Reflect.field(_youtubeLoader.content, "getVideoBytesTotal")();
-		}
-		else if (_type == InputType.VIDEO || _streamType == StreamType.RTMP)
-		{
-			bytesTotal = _stream.bytesTotal;
-		}
-		else if (_type == InputType.AUDIO)
-		{
-			bytesTotal = _sound.bytesTotal;
-		}
-		
-		return bytesTotal;
-	}
-	
-	/**
-	 * The amount of bytes loaded
-	 * @return amount of bytes
-	 */
-	public function getBytesLoaded():Float
-	{
-		var bytesLoaded:Float = 0;
-		
-		if (_streamType == StreamType.YOUTUBE)
-		{
-			if(_youtubeLoader != null && _mediaLoaded)
-			bytesLoaded = Reflect.field(_youtubeLoader.content, "getVideoBytesLoaded")();
-		}
-		else if (_type == InputType.VIDEO || _streamType == StreamType.RTMP)
-		{
-			bytesLoaded = _stream.bytesLoaded;
-		}
-		else if (_type == InputType.AUDIO)
-		{
-			bytesLoaded = _sound.bytesLoaded;
-		}
-		
-		return bytesLoaded;
-	}
-	
-	/**
-	 * Current playing file type
-	 * @return audio or video
-	 */
-	public function getType():String
-	{
-		return _type;
-	}
-	
-	/**
-	 * The stream method for the current playing media
-	 * @return
-	 */
-	public function getStreamType():String
-	{
-		return _streamType;
-	}
-	
-	/**
-	 * The server url for current rtmp stream
-	 * @return
-	 */
-	public function getServer():String
-	{
-		return _server;
-	}
-	
-	/**
-	 * To check current quality mode
-	 * @return true if high quality false if low
-	 */
-	public function getQuality():Bool
-	{
-		return _videoQualityHigh;
-	}
-	
-	/**
-	 * The current playing time
-	 * @return current playing time in seconds
-	 */
-	public function getCurrentTime():Float
-	{
-		var time:Float = 0;
-		if (_streamType == StreamType.YOUTUBE)
-		{
-			if(_youtubeLoader != null)
-			{
-				time = Reflect.field(_youtubeLoader.content, "getCurrentTime")();
-			}
-			else
-			{
-				time = 0;
-			}
-		}
-		else if (_streamType == StreamType.PSEUDOSTREAM)
-		{
-			time = getStartTime() + _stream.time;
-		}
-		else if (_type == InputType.VIDEO || _streamType == StreamType.RTMP)
-		{
-			time = _stream.time;
-		}
-		else if (_type == InputType.AUDIO)
-		{
-			if(_soundChannel != null)
-			{	
-				time = _soundChannel.position / 1000;
-			}
-			else
-			{
-				time = 0;
-			}
-		}
-		
-		return time;
-	}
-	//}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/StreamType.hx b/lib/Jaris/src/jaris/player/StreamType.hx
deleted file mode 100644
index d3b110243..000000000
--- a/lib/Jaris/src/jaris/player/StreamType.hx
+++ /dev/null
@@ -1,34 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player;
-
-/**
- * Some constants for the stream types
- */
-class StreamType 
-{
-	public static var FILE:String = "file";
-	public static var PSEUDOSTREAM:String = "http";
-	public static var RTMP:String = "rtmp";
-	public static var YOUTUBE = "youtube";
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/UserSettings.hx b/lib/Jaris/src/jaris/player/UserSettings.hx
deleted file mode 100644
index cb3688cc9..000000000
--- a/lib/Jaris/src/jaris/player/UserSettings.hx
+++ /dev/null
@@ -1,112 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player;
-
-import flash.net.SharedObject;
-
-
-/**
- * To store and retrieve user settings so the player can load them next time it loads.
- * In this way player can remember user selected aspect ratio and volume.
- */
-class UserSettings 
-{
-	private var _settings:SharedObject;
-	
-	public function new() 
-	{
-		_settings = SharedObject.getLocal("JarisPlayerUserSettings");
-	}
-	
-	//{Methods
-	/**
-	 * Deletes all user settings
-	 */
-	public function deleteSettings():Void
-	{		
-		_settings.clear();
-	}
-	
-	/**
-	 * Checks if a user setting is available
-	 * @param	field The name of the setting
-	 * @return true if is set false otherwise
-	 */
-	public function isSet(field:String):Bool
-	{
-		return Reflect.hasField(_settings.data, field);
-	}
-	//}
-	
-	//{Properties Setters
-	/**
-	 * Stores the volume value
-	 * @param	level
-	 */
-	public function setVolume(level:Float):Void
-	{
-		_settings.data.volume = level;
-		_settings.flush();
-	}
-	
-	/**
-	 * Stores the aspect ratio value
-	 * @param	aspect
-	 */
-	public function setAspectRatio(aspectratio:Float):Void
-	{
-		_settings.data.aspectratio = aspectratio;
-		_settings.flush();
-	}
-	//}
-	
-	//{Properties Getters
-	/**
-	 * The last user selected volume value
-	 * @return Last user selected volume value or default if not set.
-	 */
-	public function getVolume():Float
-	{
-		if (!isSet("volume"))
-		{
-			return 1.0; //The maximum volume value
-		}
-		
-		return _settings.data.volume;
-	}
-	
-	/**
-	 * The last user selected aspect ratio value
-	 * @return Last user selected aspect ratio value or default if not set.
-	 */
-	public function getAspectRatio():Float
-	{
-		if (!isSet("aspectratio"))
-		{
-			return 0.0; //Equivalent to original
-		}
-		
-		return _settings.data.aspectratio;
-	}
-	//}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/controls/AspectRatioIcon.hx b/lib/Jaris/src/jaris/player/controls/AspectRatioIcon.hx
deleted file mode 100644
index d05d5fa20..000000000
--- a/lib/Jaris/src/jaris/player/controls/AspectRatioIcon.hx
+++ /dev/null
@@ -1,119 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player.controls;
-import flash.display.Sprite;
-import flash.events.MouseEvent;
-
-class AspectRatioIcon extends Sprite
-{
-	private var _width:Float;
-	private var _height:Float;
-	private var _normalColor:UInt;
-	private var _hoverColor:UInt;
-	
-	public function new(x:Float, y:Float, width:Float, height:Float, normalColor:UInt, hoverColor:UInt) 
-	{
-		super();
-		
-		this.x = x;
-		this.y = y;
-		this.buttonMode = true;
-		this.useHandCursor = true;
-		this.tabEnabled = false;
-		
-		_width = width;
-		_height = height;
-		_normalColor = normalColor;
-		_hoverColor = hoverColor;
-		
-		addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
-		addEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
-		
-		draw(_normalColor);
-	}
-	
-	private function onMouseOver(event:MouseEvent):Void
-	{
-		draw(_hoverColor);
-	}
-	
-	private function onMouseOut(event:MouseEvent):Void
-	{
-		draw(_normalColor);
-	}
-	
-	//{Private Methods
-	private function draw(color:UInt):Void
-	{
-		graphics.clear();
-		
-		graphics.lineStyle(2, color);
-		graphics.drawRect(0, 0, _width, _height);
-		
-		var innerWidth:Float = (60 / 100) * width;
-		var innerHeight:Float = (60 / 100) * height;
-		var innerX:Float = (width / 2) - (innerWidth / 2) - 1;
-		var innerY:Float = (height / 2) - (innerHeight / 2) - 1;
-		
-		graphics.lineStyle();
-		graphics.beginFill(color, 1);
-		graphics.drawRect(innerX, innerY, innerWidth, innerHeight);
-		graphics.endFill();
-		
-		graphics.lineStyle();
-		graphics.beginFill(0, 0);
-		graphics.drawRect(0, 0, width, height);
-		graphics.endFill();
-	}
-	//}
-	
-	//{Setters
-	public function setNormalColor(color:UInt):Void
-	{
-		_normalColor = color;
-		draw(_normalColor);
-	}
-	
-	public function setHoverColor(color:UInt):Void
-	{
-		_hoverColor = color;
-		draw(_hoverColor);
-	}
-	
-	public function setPosition(x:Float, y:Float):Void
-	{
-		this.x = x;
-		this.y = y;
-		
-		draw(_normalColor);
-	}
-	
-	public function setSize(width:Float, height:Float):Void
-	{
-		_width = width;
-		_height = height;
-		
-		draw(_normalColor);
-	}
-	//}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/controls/Controls.hx b/lib/Jaris/src/jaris/player/controls/Controls.hx
deleted file mode 100644
index 4311fcaa6..000000000
--- a/lib/Jaris/src/jaris/player/controls/Controls.hx
+++ /dev/null
@@ -1,912 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player.controls;
-
-//{Libraries
-import flash.display.GradientType;
-import flash.events.Event;
-import flash.events.TimerEvent;
-import flash.geom.Matrix;
-import flash.Lib;
-import flash.events.MouseEvent;
-import flash.display.MovieClip;
-import flash.net.NetStream;
-import flash.geom.Rectangle;
-import flash.text.AntiAliasType;
-import flash.text.TextField;
-import flash.text.TextFieldAutoSize;
-import flash.text.TextFormat;
-import flash.utils.Timer;
-import jaris.animation.Animation;
-import jaris.display.Loader;
-import jaris.events.PlayerEvents;
-import jaris.player.controls.AspectRatioIcon;
-import jaris.player.controls.FullscreenIcon;
-import jaris.player.controls.PauseIcon;
-import jaris.player.controls.PlayIcon;
-import jaris.player.controls.VolumeIcon;
-import jaris.player.Player;
-import flash.display.Sprite;
-import flash.display.Stage;
-import jaris.utils.Utils;
-//}
-
-/**
- * Default controls for jaris player
- */
-class Controls extends MovieClip {
-	
-	//{Member Variables
-	private var _thumb:Sprite;
-	private var _track:Sprite;
-	private var _trackDownloaded:Sprite;
-	private var _scrubbing:Bool;
-	private var _stage:Stage;
-	private var _movieClip:MovieClip;
-	private var _player:Player;
-	private var _darkColor:UInt;
-	private var _brightColor:UInt;
-	private var _controlColor:UInt;
-	private var _hoverColor:UInt;
-	private var _hideControlsTimer:Timer;
-	private var _hideAspectRatioLabelTimer:Timer;
-	private var _currentPlayTimeLabel:TextField;
-	private var _totalPlayTimeLabel:TextField;
-	private var _seekPlayTimeLabel:TextField;
-	private var _percentLoaded:Float;
-	private var _controlsVisible:Bool;
-	private var _seekBar:Sprite;
-	private var _controlsBar:Sprite;
-	private var _playControl:PlayIcon;
-	private var _pauseControl:PauseIcon;
-	private var _aspectRatioControl:AspectRatioIcon;
-	private var _fullscreenControl:FullscreenIcon;
-	private var _volumeIcon:VolumeIcon;
-	private var _volumeTrack:Sprite;
-	private var _volumeSlider:Sprite;
-	private var _loader:Loader;
-	private var _aspectRatioLabelContainer:Sprite;
-	private var _aspectRatioLabel:TextField;
-	private var _textFormat:TextFormat;
-	//}
-	
-	
-	//{Constructor
-	public function new(player:Player)
-	{
-		super();
-		
-		//{Main variables
-		_stage = Lib.current.stage;
-		_movieClip = Lib.current;
-		_player = player;
-		_darkColor = 0x000000;
-		_brightColor = 0x4c4c4c;
-		_controlColor = 0xFFFFFF;
-		_hoverColor = 0x67A8C1;
-		_percentLoaded = 0.0;
-		_hideControlsTimer = new Timer(500);
-		_hideAspectRatioLabelTimer = new Timer(500);
-		_controlsVisible = false;
-		
-		_textFormat = new TextFormat();
-		_textFormat.font = "arial";
-		_textFormat.color = _controlColor;
-		_textFormat.size = 14;
-		//}
-		
-		//{Seeking Controls initialization
-		_seekBar = new Sprite();
-		addChild(_seekBar);
-		
-		_trackDownloaded = new Sprite(  );
-		_trackDownloaded.tabEnabled = false;
-		_seekBar.addChild(_trackDownloaded);
-		
-		_track = new Sprite(  );
-		_track.tabEnabled = false;
-		_track.buttonMode = true;
-		_track.useHandCursor = true;
-		_seekBar.addChild(_track);
-		
-		
-		_thumb = new Sprite(  );
-		_thumb.buttonMode = true;
-		_thumb.useHandCursor = true;
-		_thumb.tabEnabled = false;
-		_seekBar.addChild(_thumb);
-		
-		_currentPlayTimeLabel = new TextField();
-		_currentPlayTimeLabel.autoSize = TextFieldAutoSize.LEFT;
-		_currentPlayTimeLabel.text = "00:00:00";
-		_currentPlayTimeLabel.tabEnabled = false;
-		_currentPlayTimeLabel.setTextFormat(_textFormat);
-		_seekBar.addChild(_currentPlayTimeLabel);
-		
-		_totalPlayTimeLabel = new TextField();
-		_totalPlayTimeLabel.autoSize = TextFieldAutoSize.LEFT;
-		_totalPlayTimeLabel.text = "00:00:00";
-		_totalPlayTimeLabel.tabEnabled = false;
-		_totalPlayTimeLabel.setTextFormat(_textFormat);
-		_seekBar.addChild(_totalPlayTimeLabel);
-		
-		_seekPlayTimeLabel = new TextField();
-		_seekPlayTimeLabel.visible = false;
-		_seekPlayTimeLabel.autoSize = TextFieldAutoSize.LEFT;
-		_seekPlayTimeLabel.text = "00:00:00";
-		_seekPlayTimeLabel.tabEnabled = false;
-		_seekPlayTimeLabel.setTextFormat(_textFormat);
-		addChild(_seekPlayTimeLabel);
-		//}
-		
-		//{Playing controls initialization
-		_controlsBar = new Sprite();
-		_controlsBar.visible = true;
-		addChild(_controlsBar);
-		
-		_playControl = new PlayIcon(0, 0, 0, 0, _controlColor, _hoverColor);
-		_controlsBar.addChild(_playControl);
-		
-		_pauseControl = new PauseIcon(0, 0, 0, 0, _controlColor, _hoverColor);
-		_pauseControl.visible = false;
-		_controlsBar.addChild(_pauseControl);
-		
-		_aspectRatioControl = new AspectRatioIcon(0, 0, 0, 0, _controlColor, _hoverColor);
-		_controlsBar.addChild(_aspectRatioControl);
-		
-		_fullscreenControl = new FullscreenIcon(0, 0, 0, 0, _controlColor, _hoverColor);
-		_controlsBar.addChild(_fullscreenControl);
-		
-		_volumeIcon = new VolumeIcon(0, 0, 0, 0, _controlColor, _hoverColor);
-		_controlsBar.addChild(_volumeIcon);
-		
-		_volumeSlider = new Sprite();
-		_controlsBar.addChild(_volumeSlider);
-		
-		_volumeTrack = new Sprite();
-		_volumeTrack.buttonMode = true;
-		_volumeTrack.useHandCursor = true;
-		_volumeTrack.tabEnabled = false;
-		_controlsBar.addChild(_volumeTrack); 
-		//}
-		
-		//{Aspect ratio label
-		_aspectRatioLabelContainer = new Sprite();
-		addChild(_aspectRatioLabelContainer);
-		
-		_aspectRatioLabel = new TextField();
-		_aspectRatioLabel.autoSize = TextFieldAutoSize.CENTER;
-		_aspectRatioLabel.text = "original";
-		_aspectRatioLabel.tabEnabled = false;
-		_aspectRatioLabelContainer.addChild(_aspectRatioLabel);
-		//}
-		
-		redrawControls();
-		
-		//{Loader bar
-		_loader = new Loader();
-		_loader.hide();
-		
-		var loaderColors:Array <String> = ["", "", "", ""];
-		loaderColors[0] = Std.string(_brightColor);
-		loaderColors[1] = Std.string(_controlColor);
-		
-		_loader.setColors(loaderColors);
-		
-		addChild(_loader);
-		//}
-		
-		//{event Listeners
-		_movieClip.addEventListener(Event.ENTER_FRAME, onEnterFrame);
-		_thumb.addEventListener(MouseEvent.MOUSE_DOWN, onThumbMouseDown);
-		_thumb.addEventListener(MouseEvent.MOUSE_UP, onThumbMouseUp);
-		_thumb.addEventListener(MouseEvent.MOUSE_OVER, onThumbHover);
-		_thumb.addEventListener(MouseEvent.MOUSE_OUT, onThumbMouseOut);
-		_thumb.addEventListener(MouseEvent.MOUSE_MOVE, onTrackMouseMove);
-		_thumb.addEventListener(MouseEvent.MOUSE_OUT, onTrackMouseOut);
-		_track.addEventListener(MouseEvent.CLICK, onTrackClick);
-		_track.addEventListener(MouseEvent.MOUSE_MOVE, onTrackMouseMove);
-		_track.addEventListener(MouseEvent.MOUSE_OUT, onTrackMouseOut);
-		_playControl.addEventListener(MouseEvent.CLICK, onPlayClick);
-		_pauseControl.addEventListener(MouseEvent.CLICK, onPauseClick);
-		_aspectRatioControl.addEventListener(MouseEvent.CLICK, onAspectRatioClick);
-		_fullscreenControl.addEventListener(MouseEvent.CLICK, onFullscreenClick);
-		_volumeIcon.addEventListener(MouseEvent.CLICK, onVolumeIconClick);
-		_volumeTrack.addEventListener(MouseEvent.CLICK, onVolumeTrackClick);
-		
-		_player.addEventListener(PlayerEvents.MOUSE_HIDE, onPlayerMouseHide);
-		_player.addEventListener(PlayerEvents.MOUSE_SHOW, onPlayerMouseShow);
-		_player.addEventListener(PlayerEvents.MEDIA_INITIALIZED, onPlayerMediaInitialized);
-		_player.addEventListener(PlayerEvents.BUFFERING, onPlayerBuffering);
-		_player.addEventListener(PlayerEvents.NOT_BUFFERING, onPlayerNotBuffering);
-		_player.addEventListener(PlayerEvents.RESIZE, onPlayerResize);
-		_player.addEventListener(PlayerEvents.PLAY_PAUSE, onPlayerPlayPause);
-		_player.addEventListener(PlayerEvents.PLAYBACK_FINISHED, onPlayerPlaybackFinished);
-		_player.addEventListener(PlayerEvents.CONNECTION_FAILED, onPlayerStreamNotFound);
-		_player.addEventListener(PlayerEvents.ASPECT_RATIO, onPlayerAspectRatio);
-		
-		_stage.addEventListener(MouseEvent.MOUSE_UP, onThumbMouseUp);
-		_stage.addEventListener(MouseEvent.MOUSE_OUT, onThumbMouseUp);
-		_stage.addEventListener(MouseEvent.MOUSE_MOVE, onMouseMove);
-		_stage.addEventListener(Event.RESIZE, onStageResize);
-		
-		_hideControlsTimer.addEventListener(TimerEvent.TIMER, hideControlsTimer);
-		_hideAspectRatioLabelTimer.addEventListener(TimerEvent.TIMER, hideAspectRatioLabelTimer);
-		
-		_hideControlsTimer.start();
-		//}
-	}
-	//}
-
-	
-	//{Timers
-	/**
-	 * Hides the playing controls when not moving mouse.
-	 * @param	event The timer event associated
-	 */
-	private function hideControlsTimer(event:TimerEvent):Void
-	{
-		if (_player.isPlaying())
-		{
-			if (_controlsVisible)
-			{
-				if (_stage.mouseX < _controlsBar.x || 
-					_stage.mouseX >= _stage.stageWidth - 1 || 
-					_stage.mouseY >= _stage.stageHeight - 1 ||
-					_stage.mouseY <= 1
-				   )
-				{
-					_controlsVisible = false;
-				}
-			}
-			else
-			{
-				hideControls();
-				_hideControlsTimer.stop();
-			}
-		}
-	}
-	
-	/**
-	 * Hides aspect ratio label
-	 * @param	event
-	 */
-	private function hideAspectRatioLabelTimer(event:TimerEvent):Void
-	{	
-		//wait till fade in effect finish
-		if (_aspectRatioLabelContainer.alpha >= 1)
-		{
-			Animation.fadeOut(_aspectRatioLabelContainer, 300);
-			_hideAspectRatioLabelTimer.stop();
-		}
-	}
-	//}
-	
-	
-	//{Events
-	/**
-	 * Keeps syncronized various elements of the controls like the thumb and download track bar
-	 * @param	event
-	 */
-	private function onEnterFrame(event:Event):Void
-	{
-		if(_player.getDuration() > 0) {
-			if (_scrubbing) 
-			{
-				_player.seek(((_thumb.x - _track.x) / _track.width) * _player.getDuration());
-			}
-			else 
-			{
-				_currentPlayTimeLabel.text = Utils.formatTime(_player.getCurrentTime());
-				_currentPlayTimeLabel.setTextFormat(_textFormat);
-				_thumb.x = _player.getCurrentTime() / _player.getDuration() * (_track.width-_thumb.width) + _track.x;
-			}
-		}
-		
-		_volumeSlider.height = _volumeTrack.height * (_player.getVolume() / 1.0);
-		_volumeSlider.y = (_volumeTrack.y + _volumeTrack.height) - _volumeSlider.height;
-		
-		drawDownloadProgress();
-	}
-	
-	/**
-	 * Show playing controls on mouse movement.
-	 * @param	event
-	 */
-	private function onMouseMove(event:MouseEvent):Void
-	{
-		if (_stage.mouseX >= _controlsBar.x)
-		{
-			if (!_hideControlsTimer.running)
-			{
-				_hideControlsTimer.start();
-			}
-			
-			_controlsVisible = true;
-			showControls();
-		}
-	}
-	
-	/**
-	 * Function fired by a stage resize eventthat redraws the player controls
-	 * @param	event
-	 */
-	private function onStageResize(event:Event):Void
-	{
-		redrawControls();
-	}
-	
-	/**
-	 * Toggles pause or play
-	 * @param	event
-	 */
-	private function onPlayClick(event:MouseEvent):Void
-	{
-		_player.togglePlay();
-		_playControl.visible = !_player.isPlaying();
-		_pauseControl.visible = _player.isPlaying();
-	}
-	
-	/**
-	 * Toggles pause or play
-	 * @param	event
-	 */
-	private function onPauseClick(event:MouseEvent):Void
-	{
-		_player.togglePlay();
-		_playControl.visible = !_player.isPlaying();
-		_pauseControl.visible = _player.isPlaying();
-	}
-	
-	/**
-	 * Toggles betewen aspect ratios
-	 * @param	event
-	 */
-	private function onAspectRatioClick(event:MouseEvent):Void
-	{
-		_player.toggleAspectRatio();
-	}
-	
-	/**
-	 * Toggles between window and fullscreen mode
-	 * @param	event
-	 */
-	private function onFullscreenClick(event:MouseEvent):Void
-	{
-		_player.toggleFullscreen();
-	}
-	
-	/**
-	 * Toggles between mute and unmute
-	 * @param	event
-	 */
-	private function onVolumeIconClick(event: MouseEvent):Void
-	{
-		_player.toggleMute();
-	}
-	
-	/**
-	 * Detect user click on volume track control and change volume according
-	 * @param	event
-	 */
-	private function onVolumeTrackClick(event:MouseEvent):Void
-	{
-		var percent:Float = _volumeTrack.height - _volumeTrack.mouseY;
-		var volume:Float = 1.0 * (percent / _volumeTrack.height);
-		
-		_player.setVolume(volume);
-	}
-	
-	/**
-	 * Display not found message
-	 * @param	event
-	 */
-	private function onPlayerStreamNotFound(event:PlayerEvents):Void
-	{
-		//todo: to work on this
-	}	
-	
-	/**
-	 * Shows the loader bar when buffering
-	 * @param	event
-	 */
-	private function onPlayerBuffering(event:PlayerEvents):Void
-	{
-		_loader.show();
-	}
-	
-	/**
-	 * Hides loader bar when not buffering
-	 * @param	event
-	 */
-	private function onPlayerNotBuffering(event:PlayerEvents):Void
-	{
-		_loader.hide();
-	}
-	
-	/**
-	 * Show the selected aspect ratio
-	 * @param	event
-	 */
-	private function onPlayerAspectRatio(event:PlayerEvents):Void
-	{
-		_hideAspectRatioLabelTimer.stop();
-		_aspectRatioLabel.text = _player.getAspectRatioString();
-		drawAspectRatioLabel();
-		
-		while (_aspectRatioLabelContainer.visible)
-		{
-			//wait till fade out finishes
-		}
-		
-		Animation.fadeIn(_aspectRatioLabelContainer, 300);
-		
-		_hideAspectRatioLabelTimer.start();
-	}
-		
-	/**
-	 * Monitors playbeack when finishes tu update controls
-	 * @param	event
-	 */
-	private function onPlayerPlaybackFinished(event:PlayerEvents):Void
-	{
-		_playControl.visible = !_player.isPlaying();
-		_pauseControl.visible = _player.isPlaying();
-		showControls();
-	}
-	
-	/**
-	 * Monitors keyboard play pause actions to update icons
-	 * @param	event
-	 */
-	private function onPlayerPlayPause(event:PlayerEvents):Void
-	{
-		_playControl.visible = !_player.isPlaying();
-		_pauseControl.visible = _player.isPlaying();
-	}
-	
-	/**
-	 * Resizes the video player on windowed mode substracting the seekbar height
-	 * @param	event
-	 */
-	private function onPlayerResize(event:PlayerEvents):Void
-	{
-		if (!_player.isFullscreen())
-		{
-			if (_player.getVideo().y + _player.getVideo().height >= _stage.stageHeight)
-			{
-				_player.getVideo().height = _stage.stageHeight - _seekBar.height;
-				_player.getVideo().width = _player.getVideo().height * _player.getAspectRatio();
-				
-				_player.getVideo().x = (_stage.stageWidth / 2) - (_player.getVideo().width / 2);
-			}
-		}
-	}
-	
-	/**
-	 * Updates media total time duration.
-	 * @param	event
-	 */
-	private function onPlayerMediaInitialized(event:PlayerEvents):Void
-	{	
-		_totalPlayTimeLabel.text = Utils.formatTime(event.duration);
-		_totalPlayTimeLabel.setTextFormat(_textFormat);
-		
-		_playControl.visible = !_player.isPlaying();
-		_pauseControl.visible = _player.isPlaying();
-	}
-	
-	/**
-	 * Hides seekbar if on fullscreen.
-	 * @param	event
-	 */
-	private function onPlayerMouseHide(event:PlayerEvents):Void
-	{
-		if (_seekBar.visible && _player.isFullscreen())
-		{
-			Animation.slideOut(_seekBar, "bottom", 1000);
-		}
-	}
-	
-	/**
-	 * Shows seekbar
-	 * @param	event
-	 */
-	private function onPlayerMouseShow(event:PlayerEvents):Void
-	{
-		//Only use slidein effect on fullscreen since switching to windowed mode on
-		//hardware scaling causes a bug by a slow response on stage height changes
-		if (_player.isFullscreen() && !_seekBar.visible)
-		{
-			Animation.slideIn(_seekBar, "bottom",1000);
-		}
-		else
-		{
-			_seekBar.visible = true;
-		}
-	}
-	
-	/**
-	 * Translates a user click in to time and seeks to it
-	 * @param	event
-	 */
-	private function onTrackClick(event:MouseEvent):Void
-	{
-		var clickPosition:Float = _track.mouseX;
-		_player.seek(_player.getDuration() * (clickPosition / _track.width));
-	}
-	
-	/**
-	 * Shows a small tooltip showing the time calculated by mouse position
-	 * @param	event
-	 */
-	private function onTrackMouseMove(event:MouseEvent):Void
-	{
-		var clickPosition:Float = _track.mouseX;
-		_seekPlayTimeLabel.text = Utils.formatTime(_player.getDuration() * (clickPosition / _track.width));
-		_seekPlayTimeLabel.setTextFormat(_textFormat);
-		
-		_seekPlayTimeLabel.y = _stage.stageHeight - _seekBar.height - _seekPlayTimeLabel.height - 1;
-		_seekPlayTimeLabel.x = clickPosition + (_seekPlayTimeLabel.width / 2);
-		
-		_seekPlayTimeLabel.backgroundColor = _brightColor;
-		_seekPlayTimeLabel.background = true;
-		_seekPlayTimeLabel.textColor = _controlColor;
-		_seekPlayTimeLabel.borderColor = _darkColor;
-		_seekPlayTimeLabel.border = true;
-		
-		if (!_seekPlayTimeLabel.visible)
-		{
-			Animation.fadeIn(_seekPlayTimeLabel, 300);
-		}
-	}
-	
-	/**
-	 * Hides the tooltip that shows the time calculated by mouse position
-	 * @param	event
-	 */
-	private function onTrackMouseOut(event:MouseEvent):Void
-	{
-		Animation.fadeOut(_seekPlayTimeLabel, 300);
-	}
-	
-	/**
-	 * Enables dragging of thumb for seeking media
-	 * @param	event
-	 */
-	private function onThumbMouseDown(event:MouseEvent):Void
-	{
-		_scrubbing = true;
-		var rectangle:Rectangle = new Rectangle(_track.x, _track.y, _track.width-_thumb.width, 0);
-		_thumb.startDrag(false, rectangle);
-	}
-	
-	/**
-	 * Changes thumb seek control to hover color
-	 * @param	event
-	 */
-	private function onThumbHover(event:MouseEvent):Void
-	{
-		_thumb.graphics.lineStyle();
-		_thumb.graphics.beginFill(_hoverColor);
-		_thumb.graphics.drawRect(0, (_seekBar.height/2)-(10/2), 10, 10);
-		_thumb.graphics.endFill();
-	}
-	
-	/**
-	 * Changes thumb seek control to control color
-	 * @param	event
-	 */
-	private function onThumbMouseOut(event:MouseEvent):Void
-	{
-		_thumb.graphics.lineStyle();
-		_thumb.graphics.beginFill(_controlColor);
-		_thumb.graphics.drawRect(0, (_seekBar.height/2)-(10/2), 10, 10);
-		_thumb.graphics.endFill();
-	}
-	
-	/**
-	 * Disables dragging of thumb
-	 * @param	event
-	 */
-	private function onThumbMouseUp(event:MouseEvent):Void
-	{
-		_scrubbing = false;
-		_thumb.stopDrag(  );
-	}
-	//}
-	
-	
-	//{Drawing functions
-	/**
-	 * Clears all current graphics a draw new ones
-	 */
-	private function redrawControls():Void
-	{	
-		drawSeekControls();
-		drawPlayingControls();
-		drawAspectRatioLabel();
-	}
-	
-	/**
-	 * Draws the download progress track bar
-	 */
-	private function drawDownloadProgress():Void
-	{
-		if (_player.getBytesTotal() > 0)
-		{
-			var bytesLoaded:Float = _player.getBytesLoaded();
-			var bytesTotal:Float = _player.getBytesTotal();
-			
-			_percentLoaded = bytesLoaded / bytesTotal;
-		}
-		
-		var position:Float = _player.getStartTime() / _player.getDuration();
-		//var startPosition:Float = (position * _track.width) + _track.x; //Old way
-		var startPosition:Float = (position > 0?(position * _track.width):0) + _track.x;
-		
-		_trackDownloaded.graphics.clear();
-		_trackDownloaded.graphics.lineStyle();
-		_trackDownloaded.x = startPosition;
-		_trackDownloaded.graphics.beginFill(_brightColor, 0xFFFFFF);
-		_trackDownloaded.graphics.drawRect(0, (_seekBar.height / 2) - (10 / 2), ((_track.width + _track.x) - _trackDownloaded.x) * _percentLoaded, 10);
-		_trackDownloaded.graphics.endFill();
-	}
-	
-	/**
-	 * Draws all seekbar controls
-	 */
-	private function drawSeekControls()
-	{
-		//Reset sprites for redraw
-		_seekBar.graphics.clear();
-		_track.graphics.clear();
-		_thumb.graphics.clear();
-		
-		//Draw seek bar
-		var _seekBarWidth:UInt = _stage.stageWidth;
-		var _seekBarHeight:UInt = 25;
-		_seekBar.x = 0;
-		_seekBar.y = _stage.stageHeight - _seekBarHeight;
-		var matrix:Matrix = new Matrix(  );
-		matrix.createGradientBox(_seekBarWidth, _seekBarHeight, Utils.degreesToRadians(90), 0, 0);
-		var colors:Array<UInt> = [_brightColor, _darkColor];
-		var alphas:Array<UInt> = [1, 1];
-		var ratios:Array<UInt> = [0, 255];
-		_seekBar.graphics.lineStyle();
-		_seekBar.graphics.beginGradientFill(GradientType.LINEAR, colors, alphas, ratios, matrix);
-		_seekBar.graphics.drawRect(0, 0, _seekBarWidth, _seekBarHeight);
-		_seekBar.graphics.endFill();
-
-		_textFormat.color = _controlColor;
-		
-		//Draw current play time label
-		_currentPlayTimeLabel.y = _seekBarHeight - (_seekBarHeight / 2) - (_currentPlayTimeLabel.height / 2);
-		_currentPlayTimeLabel.antiAliasType = AntiAliasType.ADVANCED;
-		_currentPlayTimeLabel.setTextFormat(_textFormat);
-		
-		//Draw total play time label
-		_totalPlayTimeLabel.x = _seekBarWidth - _totalPlayTimeLabel.width;
-		_totalPlayTimeLabel.y = _seekBarHeight - (_seekBarHeight / 2) - (_totalPlayTimeLabel.height / 2);
-		_totalPlayTimeLabel.antiAliasType = AntiAliasType.ADVANCED;
-		_totalPlayTimeLabel.setTextFormat(_textFormat);
-		
-		//Draw download progress
-		drawDownloadProgress();
-		
-		//Draw track place holder for drag
-		_track.x = _currentPlayTimeLabel.width;
-		_track.graphics.lineStyle(1, _controlColor);
-		_track.graphics.beginFill(_darkColor, 0);
-		_track.graphics.drawRect(0, (_seekBarHeight / 2) - (10 / 2), _seekBarWidth - _currentPlayTimeLabel.width - _totalPlayTimeLabel.width, 10);
-		_track.graphics.endFill();
-		
-		//Draw thumb
-		_thumb.x = _currentPlayTimeLabel.width;
-		_thumb.graphics.lineStyle();
-		_thumb.graphics.beginFill(_controlColor);
-		_thumb.graphics.drawRect(0, (_seekBarHeight/2)-(10/2), 10, 10);
-		_thumb.graphics.endFill();
-	}
-	
-	/**
-	 * Draws control bar player controls
-	 */
-	private function drawPlayingControls():Void
-	{
-		//Reset sprites for redraw
-		_controlsBar.graphics.clear();
-		_volumeTrack.graphics.clear();
-		_volumeSlider.graphics.clear();
-		
-		//Draw controls bar
-		var barMargin = _stage.stageHeight < 330 ? 5 : 25;
-		var barHeight = _stage.stageHeight - _seekBar.height - (barMargin * 2);
-		var barWidth = _stage.stageHeight < 330 ? 45 : 60;
-		_controlsBar.x = (_stage.stageWidth - barWidth) + 20;
-		_controlsBar.y = barMargin;
-		
-		var matrix:Matrix = new Matrix(  );
-		matrix.createGradientBox(barWidth, barHeight, Utils.degreesToRadians(0), 0, barHeight);
-		var colors:Array<UInt> = [_brightColor, _darkColor];
-		var alphas:Array<Float> = [0.75, 0.75];
-		var ratios:Array<UInt> = [0, 255];
-		_controlsBar.graphics.lineStyle();
-		_controlsBar.graphics.beginGradientFill(GradientType.LINEAR, colors, alphas, ratios, matrix);
-		_controlsBar.graphics.drawRoundRect(0, 0, barWidth, barHeight, 20, 20);
-		_controlsBar.graphics.endFill();
-		
-		var topMargin:Float = _stage.stageHeight < 330 ? 5 : 10;
-		var barCenter:Float = (barWidth - 20) / 2;
-		var buttonSize:Float = ((80 / 100) * (barWidth - 20));
-		var buttonX:Float = buttonSize / 2;
-		
-		//Draw playbutton
-		_playControl.setNormalColor(_controlColor);
-		_playControl.setHoverColor(_hoverColor);
-		_playControl.setPosition(barCenter - buttonX, topMargin);
-		_playControl.setSize(buttonSize, buttonSize);
-		
-		//Draw pausebutton
-		_pauseControl.setNormalColor(_controlColor);
-		_pauseControl.setHoverColor(_hoverColor);
-		_pauseControl.setPosition(_playControl.x, topMargin);
-		_pauseControl.setSize(buttonSize, buttonSize);
-		
-		//Draw aspec ratio button
-		_aspectRatioControl.setNormalColor(_controlColor);
-		_aspectRatioControl.setHoverColor(_hoverColor);
-		_aspectRatioControl.setPosition(_playControl.x, (_playControl.y + buttonSize) + topMargin);
-		_aspectRatioControl.setSize(buttonSize, buttonSize);
-		
-		//Draw fullscreen button
-		_fullscreenControl.setNormalColor(_controlColor);
-		_fullscreenControl.setHoverColor(_hoverColor);
-		_fullscreenControl.setPosition(_playControl.x, (_aspectRatioControl.y + _aspectRatioControl.height) + topMargin);
-		_fullscreenControl.setSize(buttonSize, buttonSize);
-		
-		//Draw volume icon
-		_volumeIcon.setNormalColor(_controlColor);
-		_volumeIcon.setHoverColor(_hoverColor);
-		_volumeIcon.setPosition(_playControl.x, barHeight - _playControl.height - topMargin);
-		_volumeIcon.setSize(buttonSize, buttonSize);
-		
-		//Draw volume track
-		_volumeTrack.x = _playControl.x;
-		_volumeTrack.y = (_fullscreenControl.y + _fullscreenControl.height) + topMargin;
-		_volumeTrack.graphics.lineStyle(1, _controlColor);
-		_volumeTrack.graphics.beginFill(0x000000, 0);
-		_volumeTrack.graphics.drawRect(0, 0, _playControl.width / 2, _volumeIcon.y - (_fullscreenControl.y + _fullscreenControl.height) - (topMargin*2));
-		_volumeTrack.graphics.endFill();
-		_volumeTrack.x = barCenter - (_volumeTrack.width / 2);
-		
-		//Draw volume slider
-		_volumeSlider.x = _volumeTrack.x;
-		_volumeSlider.y = _volumeTrack.y;
-		_volumeSlider.graphics.lineStyle();
-		_volumeSlider.graphics.beginFill(_controlColor, 1);
-		_volumeSlider.graphics.drawRect(0, 0, _volumeTrack.width, _volumeTrack.height);
-		_volumeSlider.graphics.endFill();
-		
-	}
-	
-	private function drawAspectRatioLabel():Void
-	{
-		_aspectRatioLabelContainer.graphics.clear();
-		_aspectRatioLabelContainer.visible = false;
-		
-		//Update aspect ratio label
-		var textFormat:TextFormat = new TextFormat();
-		textFormat.font = "arial";
-		textFormat.bold = true;
-		textFormat.size = 40;
-		textFormat.color = _controlColor;
-		
-		_aspectRatioLabel.setTextFormat(textFormat);
-		_aspectRatioLabel.x = (_stage.stageWidth / 2) - (_aspectRatioLabel.width / 2);
-		_aspectRatioLabel.y = (_stage.stageHeight / 2) - (_aspectRatioLabel.height / 2);
-		
-		//Draw aspect ratio label container
-		_aspectRatioLabelContainer.x = _aspectRatioLabel.x - 10;
-		_aspectRatioLabelContainer.y = _aspectRatioLabel.y - 10;
-		_aspectRatioLabelContainer.graphics.lineStyle(3, _controlColor);
-		_aspectRatioLabelContainer.graphics.beginFill(_brightColor, 1);
-		_aspectRatioLabelContainer.graphics.drawRoundRect(0, 0, _aspectRatioLabel.width + 20, _aspectRatioLabel.height + 20, 15, 15);
-		_aspectRatioLabelContainer.graphics.endFill();
-		
-		_aspectRatioLabel.x = 10;
-		_aspectRatioLabel.y = 10;
-	}
-	//}
-	
-	
-	//{Private Methods
-	/**
-	 * Hide the play controls bar
-	 */
-	private function hideControls():Void
-	{
-		if(_controlsBar.visible)
-		{
-			drawPlayingControls();	
-			Animation.slideOut(_controlsBar, "right", 800);
-		}
-	}
-	
-	/**
-	 * Shows play controls bar
-	 */
-	private function showControls():Void
-	{
-		if(!_controlsBar.visible)
-		{
-			drawPlayingControls();	
-			Animation.slideIn(_controlsBar, "right", 800);
-		}
-	}
-	//}
-	
-	
-	//{Setters
-	/**
-	 * Sets the player colors and redraw them
-	 * @param	colors Array of colors in the following order: darkColor, brightColor, controlColor, hoverColor
-	 */
-	public function setControlColors(colors:Array<String>):Void
-	{
-		_darkColor = colors[0].length > 0? Std.parseInt("0x" + colors[0]) : 0x000000;
-		_brightColor = colors[1].length > 0? Std.parseInt("0x" + colors[1]) : 0x4c4c4c;
-		_controlColor = colors[2].length > 0? Std.parseInt("0x" + colors[2]) : 0xFFFFFF;
-		_hoverColor = colors[3].length > 0? Std.parseInt("0x" + colors[3]) : 0x67A8C1;
-		
-		var loaderColors:Array <String> = ["", ""];
-		loaderColors[0] = colors[1];
-		loaderColors[1] = colors[2];
-		_loader.setColors(loaderColors);
-		
-		redrawControls();
-	}
-	
-	/**
-	 * To set the duration label when autostart parameter is false
-	 * @param	duration in seconds or formatted string in format hh:mm:ss
-	 */
-	public function setDurationLabel(duration:String):Void
-	{
-		//Person passed time already formatted
-		if (duration.indexOf(":") != -1)
-		{
-			_totalPlayTimeLabel.text = duration;
-		}
-		
-		//Time passed in seconds
-		else
-		{
-			_totalPlayTimeLabel.text = Std.string(Utils.formatTime(Std.parseFloat(duration)));
-		}
-		
-		_totalPlayTimeLabel.setTextFormat(_textFormat);
-	}
-	//}
-	
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/controls/FullscreenIcon.hx b/lib/Jaris/src/jaris/player/controls/FullscreenIcon.hx
deleted file mode 100644
index 95da6e51e..000000000
--- a/lib/Jaris/src/jaris/player/controls/FullscreenIcon.hx
+++ /dev/null
@@ -1,114 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player.controls;
-import flash.display.Sprite;
-import flash.events.MouseEvent;
-
-class FullscreenIcon extends Sprite
-{
-	private var _width:Float;
-	private var _height:Float;
-	private var _normalColor:UInt;
-	private var _hoverColor:UInt;
-	
-	public function new(x:Float, y:Float, width:Float, height:Float, normalColor:UInt, hoverColor:UInt) 
-	{
-		super();
-		
-		this.x = x;
-		this.y = y;
-		this.buttonMode = true;
-		this.useHandCursor = true;
-		this.tabEnabled = false;
-		
-		_width = width;
-		_height = height;
-		_normalColor = normalColor;
-		_hoverColor = hoverColor;
-		
-		addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
-		addEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
-		
-		draw(_normalColor);
-	}
-	
-	private function onMouseOver(event:MouseEvent):Void
-	{
-		draw(_hoverColor);
-	}
-	
-	private function onMouseOut(event:MouseEvent):Void
-	{
-		draw(_normalColor);
-	}
-	
-	//{Private Methods
-	private function draw(color:UInt):Void
-	{
-		graphics.clear();
-		
-		graphics.lineStyle(2, color);
-		graphics.beginFill(0x000000, 0);
-		graphics.drawRoundRect(0, 0, _width, _height, 6, 6);
-		graphics.endFill();
-		
-		graphics.lineStyle();
-		graphics.beginFill(color, 1);
-		graphics.drawRoundRect(3, 3, 4, 4, 2, 2);
-		graphics.drawRoundRect(width - 9, 3, 4, 4, 2, 2);
-		graphics.drawRoundRect(3, height - 9, 4, 4, 2, 2);
-		graphics.drawRoundRect(width - 9, height - 9, 4, 4, 2, 2);
-		graphics.endFill();
-	}
-	//}
-	
-	//{Setters
-	public function setNormalColor(color:UInt):Void
-	{
-		_normalColor = color;
-		draw(_normalColor);
-	}
-	
-	public function setHoverColor(color:UInt):Void
-	{
-		_hoverColor = color;
-		draw(_hoverColor);
-	}
-	
-	public function setPosition(x:Float, y:Float):Void
-	{
-		this.x = x;
-		this.y = y;
-		
-		draw(_normalColor);
-	}
-	
-	public function setSize(width:Float, height:Float):Void
-	{
-		_width = width;
-		_height = height;
-		
-		draw(_normalColor);
-	}
-	//}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/controls/PauseIcon.hx b/lib/Jaris/src/jaris/player/controls/PauseIcon.hx
deleted file mode 100644
index c16a113e4..000000000
--- a/lib/Jaris/src/jaris/player/controls/PauseIcon.hx
+++ /dev/null
@@ -1,112 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player.controls;
-import flash.display.Sprite;
-import flash.events.MouseEvent;
-
-class PauseIcon extends Sprite
-{
-	private var _width:Float;
-	private var _height:Float;
-	private var _normalColor:UInt;
-	private var _hoverColor:UInt;
-	
-	public function new(x:Float, y:Float, width:Float, height:Float, normalColor:UInt, hoverColor:UInt) 
-	{
-		super();
-		
-		this.x = x;
-		this.y = y;
-		this.buttonMode = true;
-		this.useHandCursor = true;
-		this.tabEnabled = false;
-		
-		_width = width;
-		_height = height;
-		_normalColor = normalColor;
-		_hoverColor = hoverColor;
-		
-		addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
-		addEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
-		
-		draw(_normalColor);
-	}
-	
-	private function onMouseOver(event:MouseEvent):Void
-	{
-		draw(_hoverColor);
-	}
-	
-	private function onMouseOut(event:MouseEvent):Void
-	{
-		draw(_normalColor);
-	}
-	
-	//{Private Methods
-	private function draw(color:UInt):Void
-	{
-		graphics.clear();
-		
-		graphics.lineStyle();
-		graphics.beginFill(color);
-		graphics.drawRoundRect(0, 0, (33 / 100) * _width, _height, 6, 6);
-		graphics.drawRoundRect(_width - ((33 / 100) * _width), 0, (33 / 100) * _width, _height, 6, 6);
-		graphics.endFill();
-		
-		graphics.lineStyle();
-		graphics.beginFill(color, 0);
-		graphics.drawRect(0, 0, _width, _height);
-		graphics.endFill();
-	}
-	//}
-	
-	//{Setters
-	public function setNormalColor(color:UInt):Void
-	{
-		_normalColor = color;
-		draw(_normalColor);
-	}
-	
-	public function setHoverColor(color:UInt):Void
-	{
-		_hoverColor = color;
-		draw(_hoverColor);
-	}
-	
-	public function setPosition(x:Float, y:Float):Void
-	{
-		this.x = x;
-		this.y = y;
-		
-		draw(_normalColor);
-	}
-	
-	public function setSize(width:Float, height:Float):Void
-	{
-		_width = width;
-		_height = height;
-		
-		draw(_normalColor);
-	}
-	//}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/controls/PlayIcon.hx b/lib/Jaris/src/jaris/player/controls/PlayIcon.hx
deleted file mode 100644
index 0d506d981..000000000
--- a/lib/Jaris/src/jaris/player/controls/PlayIcon.hx
+++ /dev/null
@@ -1,107 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player.controls;
-import flash.display.Sprite;
-import flash.events.MouseEvent;
-
-class PlayIcon extends Sprite
-{
-	private var _width:Float;
-	private var _height:Float;
-	private var _normalColor:UInt;
-	private var _hoverColor:UInt;
-	
-	public function new(x:Float, y:Float, width:Float, height:Float, normalColor:UInt, hoverColor:UInt) 
-	{
-		super();
-		
-		this.x = x;
-		this.y = y;
-		this.buttonMode = true;
-		this.useHandCursor = true;
-		this.tabEnabled = false;
-		
-		_width = width;
-		_height = height;
-		_normalColor = normalColor;
-		_hoverColor = hoverColor;
-		
-		addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
-		addEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
-		
-		draw(_normalColor);
-	}
-	
-	private function onMouseOver(event:MouseEvent):Void
-	{
-		draw(_hoverColor);
-	}
-	
-	private function onMouseOut(event:MouseEvent):Void
-	{
-		draw(_normalColor);
-	}
-	
-	//{Private Methods
-	private function draw(color:UInt):Void
-	{
-		graphics.clear();
-		graphics.lineStyle();
-		graphics.beginFill(color);
-		graphics.lineTo(0, _height);
-		graphics.lineTo(_width, _height / 2);
-		graphics.lineTo(0, 0);
-		graphics.endFill();
-	}
-	//}
-	
-	//{Setters
-	public function setNormalColor(color:UInt):Void
-	{
-		_normalColor = color;
-		draw(_normalColor);
-	}
-	
-	public function setHoverColor(color:UInt):Void
-	{
-		_hoverColor = color;
-		draw(_hoverColor);
-	}
-	
-	public function setPosition(x:Float, y:Float):Void
-	{
-		this.x = x;
-		this.y = y;
-		
-		draw(_normalColor);
-	}
-	
-	public function setSize(width:Float, height:Float):Void
-	{
-		_width = width;
-		_height = height;
-		
-		draw(_normalColor);
-	}
-	//}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/controls/VolumeIcon.hx b/lib/Jaris/src/jaris/player/controls/VolumeIcon.hx
deleted file mode 100644
index e2eed7d9b..000000000
--- a/lib/Jaris/src/jaris/player/controls/VolumeIcon.hx
+++ /dev/null
@@ -1,110 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player.controls;
-import flash.display.Sprite;
-import flash.events.MouseEvent;
-
-class VolumeIcon extends Sprite
-{
-	private var _width:Float;
-	private var _height:Float;
-	private var _normalColor:UInt;
-	private var _hoverColor:UInt;
-	
-	public function new(x:Float, y:Float, width:Float, height:Float, normalColor:UInt, hoverColor:UInt) 
-	{
-		super();
-		
-		this.x = x;
-		this.y = y;
-		this.buttonMode = true;
-		this.useHandCursor = true;
-		this.tabEnabled = false;
-		
-		_width = width;
-		_height = height;
-		_normalColor = normalColor;
-		_hoverColor = hoverColor;
-		
-		addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
-		addEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
-		
-		draw(_normalColor);
-	}
-	
-	private function onMouseOver(event:MouseEvent):Void
-	{
-		draw(_hoverColor);
-	}
-	
-	private function onMouseOut(event:MouseEvent):Void
-	{
-		draw(_normalColor);
-	}
-	
-	//{Private Methods
-	private function draw(color:UInt):Void
-	{
-		graphics.clear();
-		
-		graphics.lineStyle();
-		graphics.beginFill(color, 1);
-		graphics.drawRect(0, ((50 / 100) * _height) / 2, _width / 2, ((50 / 100) * _height));
-		graphics.moveTo(_width / 2, ((50 / 100) * _height)/2);
-		graphics.lineTo(_width, 0);
-		graphics.lineTo(_width, _height);
-		graphics.lineTo(_width / 2, ((50 / 100) * _height) + (((50 / 100) * _height) / 2));
-		graphics.endFill();
-	}
-	//}
-	
-	//{Setters
-	public function setNormalColor(color:UInt):Void
-	{
-		_normalColor = color;
-		draw(_normalColor);
-	}
-	
-	public function setHoverColor(color:UInt):Void
-	{
-		_hoverColor = color;
-		draw(_hoverColor);
-	}
-	
-	public function setPosition(x:Float, y:Float):Void
-	{
-		this.x = x;
-		this.y = y;
-		
-		draw(_normalColor);
-	}
-	
-	public function setSize(width:Float, height:Float):Void
-	{
-		_width = width;
-		_height = height;
-		
-		draw(_normalColor);
-	}
-	//}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/newcontrols/AspectRatioIcon.hx b/lib/Jaris/src/jaris/player/newcontrols/AspectRatioIcon.hx
deleted file mode 100644
index 10f91f439..000000000
--- a/lib/Jaris/src/jaris/player/newcontrols/AspectRatioIcon.hx
+++ /dev/null
@@ -1,130 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player.newcontrols;
-import flash.display.Sprite;
-import flash.events.MouseEvent;
-import flash.geom.Matrix;
-import jaris.utils.Utils;
-import flash.display.GradientType;
-
-class AspectRatioIcon extends Sprite
-{
-	private var _width:Float;
-	private var _height:Float;
-	private var _normalColor:UInt;
-	private var _hoverColor:UInt;
-	
-	public function new(x:Float, y:Float, width:Float, height:Float, normalColor:UInt, hoverColor:UInt) 
-	{
-		super();
-		
-		this.x = x;
-		this.y = y;
-		this.buttonMode = true;
-		this.useHandCursor = true;
-		this.tabEnabled = false;
-		
-		_width = width;
-		_height = height;
-		_normalColor = normalColor;
-		_hoverColor = hoverColor;
-		
-		addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
-		addEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
-		
-		draw(_normalColor);
-	}
-	
-	private function onMouseOver(event:MouseEvent):Void
-	{
-		draw(_hoverColor);
-	}
-	
-	private function onMouseOut(event:MouseEvent):Void
-	{
-		draw(_normalColor);
-	}
-	
-	//{Private Methods
-	private function draw(color:UInt):Void
-	{
-		graphics.clear();
-		
-		graphics.lineStyle(0, color, 0.0);
-		graphics.beginFill(color, 0);
-		graphics.drawRect(0, 0, _width, _height);
-		graphics.endFill();
-		
-		var matrix:Matrix = new Matrix(  );
-		matrix.createGradientBox(_width, _height, Utils.degreesToRadians(-90), _width, 0);
-		var colors:Array<UInt> = [color, color];
-		var alphas:Array<Float> = [0.75, 1];
-		var ratios:Array<UInt> = [0, 255];
-		
-		var innerWidth:Float = (70 / 100) * width;
-		var innerHeight:Float = (40 / 100) * height;
-		var innerX:Float = (width / 2) - (innerWidth / 2) + 1 ;
-		var innerY:Float = (height / 2) - (innerHeight / 2) + 1;
-		
-		graphics.lineStyle();
-		graphics.beginGradientFill(GradientType.LINEAR, colors, alphas, ratios, matrix);
-		//graphics.beginFill(color, 1);
-		graphics.drawRect(0, 0, 1, _height+1);
-		graphics.drawRect(0, 0, _width+1, 1);
-		graphics.drawRect(_width+1, 0, 1, _height+1);
-		graphics.drawRect(0, _height+1, _width+1, 1);
-		graphics.drawRect(innerX, innerY, innerWidth, innerHeight);
-		graphics.endFill();
-	}
-	//}
-	
-	//{Setters
-	public function setNormalColor(color:UInt):Void
-	{
-		_normalColor = color;
-		draw(_normalColor);
-	}
-	
-	public function setHoverColor(color:UInt):Void
-	{
-		_hoverColor = color;
-		draw(_hoverColor);
-	}
-	
-	public function setPosition(x:Float, y:Float):Void
-	{
-		this.x = x;
-		this.y = y;
-		
-		draw(_normalColor);
-	}
-	
-	public function setSize(width:Float, height:Float):Void
-	{
-		_width = width;
-		_height = height;
-		
-		draw(_normalColor);
-	}
-	//}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/newcontrols/FullscreenIcon.hx b/lib/Jaris/src/jaris/player/newcontrols/FullscreenIcon.hx
deleted file mode 100644
index 1749b02d1..000000000
--- a/lib/Jaris/src/jaris/player/newcontrols/FullscreenIcon.hx
+++ /dev/null
@@ -1,130 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player.newcontrols;
-import flash.display.Sprite;
-import flash.events.MouseEvent;
-import flash.geom.Matrix;
-import jaris.utils.Utils;
-import flash.display.GradientType;
-
-class FullscreenIcon extends Sprite
-{
-	private var _width:Float;
-	private var _height:Float;
-	private var _normalColor:UInt;
-	private var _hoverColor:UInt;
-	
-	public function new(x:Float, y:Float, width:Float, height:Float, normalColor:UInt, hoverColor:UInt) 
-	{
-		super();
-		
-		this.x = x;
-		this.y = y;
-		this.buttonMode = true;
-		this.useHandCursor = true;
-		this.tabEnabled = false;
-		
-		_width = width;
-		_height = height;
-		_normalColor = normalColor;
-		_hoverColor = hoverColor;
-		
-		addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
-		addEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
-		
-		draw(_normalColor);
-	}
-	
-	private function onMouseOver(event:MouseEvent):Void
-	{
-		draw(_hoverColor);
-	}
-	
-	private function onMouseOut(event:MouseEvent):Void
-	{
-		draw(_normalColor);
-	}
-	
-	//{Private Methods
-	private function draw(color:UInt):Void
-	{
-		graphics.clear();
-		
-		graphics.lineStyle(0, color, 0.0);
-		graphics.beginFill(color, 0);
-		graphics.drawRect(0, 0, _width, _height);
-		graphics.endFill();
-		
-		var arrowWidth = Std.int(_width / 2 * 0.8);
-		
-		var matrix:Matrix = new Matrix(  );
-		matrix.createGradientBox(_width, _height, Utils.degreesToRadians(-90), _width, 0);
-		var colors:Array<UInt> = [color, color];
-		var alphas:Array<Float> = [0.75, 1];
-		var ratios:Array<UInt> = [0, 255];
-		
-		graphics.lineStyle(0, color, 0, true);
-		graphics.beginGradientFill(GradientType.LINEAR, colors, alphas, ratios, matrix);
-		//graphics.beginFill(color, 0);
-		graphics.drawRect(0, 0, arrowWidth, 2);
-		graphics.drawRect(0, 2, 2, arrowWidth-2);
-		graphics.drawRect(_width-arrowWidth+1, 0, arrowWidth, 2);
-		graphics.drawRect(_width-1, 2, 2, arrowWidth-2);
-		graphics.drawRect(0, _height-arrowWidth+2, 2, arrowWidth);
-		graphics.drawRect(2, _height, arrowWidth-2, 2);
-		graphics.drawRect(_width-1, _height-arrowWidth+2, 2, arrowWidth-2);
-		graphics.drawRect(_width-arrowWidth+1, _height, arrowWidth, 2);
-		graphics.endFill();
-	}
-	//}
-	
-	//{Setters
-	public function setNormalColor(color:UInt):Void
-	{
-		_normalColor = color;
-		draw(_normalColor);
-	}
-	
-	public function setHoverColor(color:UInt):Void
-	{
-		_hoverColor = color;
-		draw(_hoverColor);
-	}
-	
-	public function setPosition(x:Float, y:Float):Void
-	{
-		this.x = x;
-		this.y = y;
-		
-		draw(_normalColor);
-	}
-	
-	public function setSize(width:Float, height:Float):Void
-	{
-		_width = width;
-		_height = height;
-		
-		draw(_normalColor);
-	}
-	//}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/newcontrols/Loader.hx b/lib/Jaris/src/jaris/player/newcontrols/Loader.hx
deleted file mode 100644
index 18fb2ac1d..000000000
--- a/lib/Jaris/src/jaris/player/newcontrols/Loader.hx
+++ /dev/null
@@ -1,195 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player.newcontrols;
-
-import flash.display.MovieClip;
-import flash.display.Sprite;
-import flash.display.Stage;
-import flash.events.Event;
-import flash.Lib;
-import flash.geom.Matrix;
-import jaris.utils.Utils;
-import flash.display.GradientType;
-
-/**
- * Draws a loading bar
- */
-class Loader extends Sprite 
-{
-	private var _stage:Stage;
-	private var _movieClip:MovieClip;
-	private var _background:Sprite;
-	private var _loaderTrack:Sprite;
-	private var _loaderThumb:Sprite;
-	private var _visible:Bool;
-	private var _darkColor:UInt;
-	private var _controlColor:UInt;
-	private var _seekColor:UInt;
-	private var _forward:Bool;
-
-	public function new() 
-	{
-		super();
-		
-		_stage = Lib.current.stage;
-		_movieClip = Lib.current;
-		
-		_background = new Sprite();
-		addChild(_background);
-		
-		_loaderTrack = new Sprite();
-		addChild(_loaderTrack);
-		
-		_loaderThumb = new Sprite();
-		addChild(_loaderThumb);
-		
-		_darkColor = 0x000000;
-		_controlColor = 0xFFFFFF;
-		_seekColor = 0x747474;
-		
-		_forward = true;
-		_visible = true;
-		
-		addEventListener(Event.ENTER_FRAME, onEnterFrame);
-		_stage.addEventListener(Event.RESIZE, onResize);
-		
-		drawLoader();
-	}
-	
-	/**
-	 * Animation of a thumb moving on the track
-	 * @param	event
-	 */
-	private function onEnterFrame(event:Event):Void
-	{
-		if (_visible)
-		{
-			if (_forward)
-			{
-				if ((_loaderThumb.x + _loaderThumb.width) >= (_loaderTrack.x + _loaderTrack.width))
-				{
-					_forward = false;
-				}
-				else
-				{
-					_loaderThumb.x += 10;
-				}
-			}
-			else
-			{
-				if (_loaderThumb.x  <= _loaderTrack.x)
-				{
-					_forward = true;
-				}
-				else
-				{
-					_loaderThumb.x -= 10;
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Redraws the loader to match new stage size
-	 * @param	event
-	 */
-	private function onResize(event:Event):Void
-	{
-		drawLoader();
-	}
-	
-	/**
-	 * Draw loader graphics
-	 */
-	private function drawLoader():Void
-	{
-		//Clear graphics
-		_background.graphics.clear();
-		_loaderTrack.graphics.clear();
-		_loaderThumb.graphics.clear();
-		
-		//Draw background
-		var backgroundWidth:Float = (65 / 100) * _stage.stageWidth;
-		var backgroundHeight:Float = 30;
-		_background.x = (_stage.stageWidth / 2) - (backgroundWidth / 2);
-		_background.y = (_stage.stageHeight / 2) - (backgroundHeight / 2);
-		_background.graphics.lineStyle();
-		_background.graphics.beginFill(_darkColor, 0.75);
-		_background.graphics.drawRoundRect(0, 0, backgroundWidth, backgroundHeight, 6, 6);
-		_background.graphics.endFill();
-		
-		//Draw track
-		var trackWidth:Float = (50 / 100) * _stage.stageWidth;
-		var trackHeight:Float = 11;
-		_loaderTrack.x = (_stage.stageWidth / 2) - (trackWidth / 2);
-		_loaderTrack.y = (_stage.stageHeight / 2) - (trackHeight / 2);
-		_loaderTrack.graphics.lineStyle();
-		_loaderTrack.graphics.beginFill(_seekColor, 0.3);
-		_loaderTrack.graphics.drawRoundRect(0, trackHeight/2/2, trackWidth, trackHeight/2, 5, 5);
-		
-		//Draw thumb
-		var matrix:Matrix = new Matrix(  );
-		matrix.createGradientBox(trackHeight*3, trackHeight, Utils.degreesToRadians(-90), trackHeight*3, 0);
-		var colors:Array<UInt> = [_controlColor, _controlColor];
-		var alphas:Array<Float> = [0.75, 1];
-		var ratios:Array<UInt> = [0, 255];
-		
-		_loaderThumb.x = _loaderTrack.x;
-		_loaderThumb.y = _loaderTrack.y;
-		_loaderThumb.graphics.lineStyle();
-		_loaderThumb.graphics.beginGradientFill(GradientType.LINEAR, colors, alphas, ratios, matrix);
-		//_loaderThumb.graphics.beginFill(_controlColor, 1);
-		_loaderThumb.graphics.drawRoundRect(0, 0, trackHeight*3, trackHeight, 10, 10);
-	}
-	
-	/**
-	 * Stops drawing the loader
-	 */
-	public function hide():Void
-	{
-		this.visible = false;
-		_visible = false;
-	}
-	
-	/**
-	 * Starts drawing the loader
-	 */
-	public function show():Void
-	{
-		this.visible = true;
-		_visible = true;
-	}
-	
-	/**
-	 * Set loader colors
-	 * @param	colors
-	 */
-	public function setColors(colors:Array<String>):Void
-	{
-		_darkColor = colors[0].length > 0? Std.parseInt("0x" + colors[0]) : 0x000000;
-		_controlColor = colors[1].length > 0? Std.parseInt("0x" + colors[1]) : 0xFFFFFF;
-		_seekColor = colors[2].length > 0? Std.parseInt("0x" + colors[2]) : 0x747474;
-		
-		drawLoader();
-	}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/newcontrols/NewControls.hx b/lib/Jaris/src/jaris/player/newcontrols/NewControls.hx
deleted file mode 100644
index e3493bc64..000000000
--- a/lib/Jaris/src/jaris/player/newcontrols/NewControls.hx
+++ /dev/null
@@ -1,945 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player.newcontrols;
-
-//{Libraries
-import flash.display.GradientType;
-import flash.events.Event;
-import flash.events.TimerEvent;
-import flash.geom.Matrix;
-import flash.Lib;
-import flash.events.MouseEvent;
-import flash.display.MovieClip;
-import flash.net.NetStream;
-import flash.geom.Rectangle;
-import flash.text.AntiAliasType;
-import flash.text.TextField;
-import flash.text.TextFieldAutoSize;
-import flash.text.TextFormat;
-import flash.utils.Timer;
-import jaris.animation.Animation;
-import jaris.events.PlayerEvents;
-import jaris.player.newcontrols.Loader;
-import jaris.player.newcontrols.AspectRatioIcon;
-import jaris.player.newcontrols.FullscreenIcon;
-import jaris.player.newcontrols.PauseIcon;
-import jaris.player.newcontrols.PlayIcon;
-import jaris.player.newcontrols.VolumeIcon;
-import jaris.player.Player;
-import flash.display.Sprite;
-import flash.display.Stage;
-import jaris.utils.Utils;
-//}
-
-/**
- * Default controls for jaris player
- */
-class NewControls extends MovieClip {
-	
-	//{Member Variables
-	private var _thumb:Sprite;
-	private var _track:Sprite;
-	private var _trackDownloaded:Sprite;
-	private var _scrubbing:Bool;
-	private var _stage:Stage;
-	private var _movieClip:MovieClip;
-	private var _player:Player;
-	private var _darkColor:UInt;
-	private var _brightColor:UInt;
-	private var _seekColor:UInt;
-	private var _controlColor:UInt;
-	private var _controlSize:Int;
-	private var _hoverColor:UInt;
-	private var _hideControlsTimer:Timer;
-	private var _hideAspectRatioLabelTimer:Timer;
-	private var _currentPlayTimeLabel:TextField;
-	private var _totalPlayTimeLabel:TextField;
-	private var _seekPlayTimeLabel:TextField;
-	private var _percentLoaded:Float;
-	private var _controlsVisible:Bool;
-	private var _seekBar:Sprite;
-	private var _controlsBar:Sprite;
-	private var _playControl:PlayIcon;
-	private var _pauseControl:PauseIcon;
-	private var _aspectRatioControl:AspectRatioIcon;
-	private var _fullscreenControl:FullscreenIcon;
-	private var _volumeIcon:VolumeIcon;
-	private var _volumeTrack:Sprite;
-	private var _volumeSlider:Sprite;
-	private var _loader:Loader;
-	private var _aspectRatioLabelContainer:Sprite;
-	private var _aspectRatioLabel:TextField;
-	private var _textFormat:TextFormat;
-	//}
-	
-	
-	//{Constructor
-	public function new(player:Player)
-	{
-		super();
-		
-		//{Main variables
-		_stage = Lib.current.stage;
-		_movieClip = Lib.current;
-		_player = player;
-		_darkColor = 0x000000;
-		_brightColor = 0x4c4c4c;
-		_controlColor = 0xFFFFFF;
-		_hoverColor = 0x67A8C1;
-		_seekColor = 0x7c7c7c;
-		_controlSize = 40;
-		_percentLoaded = 0.0;
-		_hideControlsTimer = new Timer(500);
-		_hideAspectRatioLabelTimer = new Timer(500);
-		_controlsVisible = false;
-		
-		_textFormat = new TextFormat();
-		_textFormat.font = "arial";
-		_textFormat.color = _controlColor;
-		_textFormat.size = 14;
-		//}
-		
-		//{Playing controls initialization
-		_controlsBar = new Sprite();
-		_controlsBar.visible = true;
-		addChild(_controlsBar);
-		
-		_playControl = new PlayIcon(0, 0, 0, 0, _controlColor, _hoverColor);
-		_controlsBar.addChild(_playControl);
-		
-		_pauseControl = new PauseIcon(0, 0, 0, 0, _controlColor, _hoverColor);
-		_pauseControl.visible = false;
-		_controlsBar.addChild(_pauseControl);
-		
-		_aspectRatioControl = new AspectRatioIcon(0, 0, 0, 0, _controlColor, _hoverColor);
-		_controlsBar.addChild(_aspectRatioControl);
-		
-		_fullscreenControl = new FullscreenIcon(0, 0, 0, 0, _controlColor, _hoverColor);
-		_controlsBar.addChild(_fullscreenControl);
-		
-		_volumeIcon = new VolumeIcon(0, 0, 0, 0, _controlColor, _hoverColor);
-		_controlsBar.addChild(_volumeIcon);
-		
-		_volumeSlider = new Sprite();
-		_volumeSlider.visible = false;
-		_controlsBar.addChild(_volumeSlider);
-		
-		_volumeTrack = new Sprite();
-		_volumeTrack.visible = false;
-		_volumeTrack.buttonMode = true;
-		_volumeTrack.useHandCursor = true;
-		_volumeTrack.tabEnabled = false;
-		_controlsBar.addChild(_volumeTrack); 
-		//}
-		
-		//{Seeking Controls initialization
-		_seekBar = new Sprite();
-		_controlsBar.addChild(_seekBar);
-		
-		_trackDownloaded = new Sprite(  );
-		_trackDownloaded.tabEnabled = false;
-		_seekBar.addChild(_trackDownloaded);
-		
-		_track = new Sprite(  );
-		_track.tabEnabled = false;
-		_track.buttonMode = true;
-		_track.useHandCursor = true;
-		_seekBar.addChild(_track);
-		
-		_thumb = new Sprite(  );
-		_thumb.buttonMode = true;
-		_thumb.useHandCursor = true;
-		_thumb.tabEnabled = false;
-		_seekBar.addChild(_thumb);
-		
-		_currentPlayTimeLabel = new TextField();
-		_currentPlayTimeLabel.autoSize = TextFieldAutoSize.LEFT;
-		_currentPlayTimeLabel.text = "00:00:00";
-		_currentPlayTimeLabel.tabEnabled = false;
-		_currentPlayTimeLabel.setTextFormat(_textFormat);
-		_seekBar.addChild(_currentPlayTimeLabel);
-		
-		_totalPlayTimeLabel = new TextField();
-		_totalPlayTimeLabel.autoSize = TextFieldAutoSize.LEFT;
-		_totalPlayTimeLabel.text = "00:00:00";
-		_totalPlayTimeLabel.tabEnabled = false;
-		_totalPlayTimeLabel.setTextFormat(_textFormat);
-		_seekBar.addChild(_totalPlayTimeLabel);
-		
-		_seekPlayTimeLabel = new TextField();
-		_seekPlayTimeLabel.visible = false;
-		_seekPlayTimeLabel.autoSize = TextFieldAutoSize.LEFT;
-		_seekPlayTimeLabel.text = "00:00:00";
-		_seekPlayTimeLabel.tabEnabled = false;
-		_seekPlayTimeLabel.setTextFormat(_textFormat);
-		addChild(_seekPlayTimeLabel);
-		//}
-		
-		//{Aspect ratio label
-		_aspectRatioLabelContainer = new Sprite();
-		addChild(_aspectRatioLabelContainer);
-		
-		_aspectRatioLabel = new TextField();
-		_aspectRatioLabel.autoSize = TextFieldAutoSize.CENTER;
-		_aspectRatioLabel.text = "original";
-		_aspectRatioLabel.tabEnabled = false;
-		_aspectRatioLabelContainer.addChild(_aspectRatioLabel);
-		//}
-		
-		redrawControls();
-		
-		//{Loader bar
-		_loader = new Loader();
-		_loader.hide();
-		
-		var loaderColors:Array <String> = ["", "", "", ""];
-		loaderColors[0] = Std.string(_darkColor);
-		loaderColors[1] = Std.string(_controlColor);
-		loaderColors[2] = Std.string(_seekColor);
-		
-		_loader.setColors(loaderColors);
-		
-		addChild(_loader);
-		//}
-		
-		//{event Listeners
-		_movieClip.addEventListener(Event.ENTER_FRAME, onEnterFrame);
-		_thumb.addEventListener(MouseEvent.MOUSE_DOWN, onThumbMouseDown);
-		_thumb.addEventListener(MouseEvent.MOUSE_UP, onThumbMouseUp);
-		_thumb.addEventListener(MouseEvent.MOUSE_OVER, onThumbHover);
-		_thumb.addEventListener(MouseEvent.MOUSE_OUT, onThumbMouseOut);
-		_thumb.addEventListener(MouseEvent.MOUSE_MOVE, onTrackMouseMove);
-		_thumb.addEventListener(MouseEvent.MOUSE_OUT, onTrackMouseOut);
-		_track.addEventListener(MouseEvent.CLICK, onTrackClick);
-		_track.addEventListener(MouseEvent.MOUSE_MOVE, onTrackMouseMove);
-		_track.addEventListener(MouseEvent.MOUSE_OUT, onTrackMouseOut);
-		_playControl.addEventListener(MouseEvent.CLICK, onPlayClick);
-		_pauseControl.addEventListener(MouseEvent.CLICK, onPauseClick);
-		_aspectRatioControl.addEventListener(MouseEvent.CLICK, onAspectRatioClick);
-		_fullscreenControl.addEventListener(MouseEvent.CLICK, onFullscreenClick);
-		_volumeIcon.addEventListener(MouseEvent.CLICK, onVolumeIconClick);
-		_volumeTrack.addEventListener(MouseEvent.CLICK, onVolumeTrackClick);
-		
-		_player.addEventListener(PlayerEvents.MOUSE_HIDE, onPlayerMouseHide);
-		_player.addEventListener(PlayerEvents.MOUSE_SHOW, onPlayerMouseShow);
-		_player.addEventListener(PlayerEvents.MEDIA_INITIALIZED, onPlayerMediaInitialized);
-		_player.addEventListener(PlayerEvents.BUFFERING, onPlayerBuffering);
-		_player.addEventListener(PlayerEvents.NOT_BUFFERING, onPlayerNotBuffering);
-		_player.addEventListener(PlayerEvents.RESIZE, onPlayerResize);
-		_player.addEventListener(PlayerEvents.PLAY_PAUSE, onPlayerPlayPause);
-		_player.addEventListener(PlayerEvents.PLAYBACK_FINISHED, onPlayerPlaybackFinished);
-		_player.addEventListener(PlayerEvents.CONNECTION_FAILED, onPlayerStreamNotFound);
-		_player.addEventListener(PlayerEvents.ASPECT_RATIO, onPlayerAspectRatio);
-		
-		_stage.addEventListener(MouseEvent.MOUSE_UP, onThumbMouseUp);
-		_stage.addEventListener(MouseEvent.MOUSE_OUT, onThumbMouseUp);
-		_stage.addEventListener(MouseEvent.MOUSE_MOVE, onMouseMove);
-		_stage.addEventListener(Event.RESIZE, onStageResize);
-		
-		_hideControlsTimer.addEventListener(TimerEvent.TIMER, hideControlsTimer);
-		_hideAspectRatioLabelTimer.addEventListener(TimerEvent.TIMER, hideAspectRatioLabelTimer);
-		
-		_hideControlsTimer.start();
-		//}
-	}
-	//}
-
-	
-	//{Timers
-	/**
-	 * Hides the playing controls when not moving mouse.
-	 * @param	event The timer event associated
-	 */
-	private function hideControlsTimer(event:TimerEvent):Void
-	{
-		if (_player.isPlaying())
-		{
-			if (_controlsVisible)
-			{
-				if (_stage.mouseX < _controlsBar.x || 
-					_stage.mouseX >= _stage.stageWidth - 1 || 
-					_stage.mouseY >= _stage.stageHeight - 1 ||
-					_stage.mouseY <= 1
-				   )
-				{
-					_controlsVisible = false;
-				}
-			}
-			else
-			{
-				hideControls();
-				_hideControlsTimer.stop();
-			}
-		}
-	}
-	
-	/**
-	 * Hides aspect ratio label
-	 * @param	event
-	 */
-	private function hideAspectRatioLabelTimer(event:TimerEvent):Void
-	{	
-		//wait till fade in effect finish
-		if (_aspectRatioLabelContainer.alpha >= 1)
-		{
-			Animation.fadeOut(_aspectRatioLabelContainer, 300);
-			_hideAspectRatioLabelTimer.stop();
-		}
-	}
-	//}
-	
-	
-	//{Events
-	/**
-	 * Keeps syncronized various elements of the controls like the thumb and download track bar
-	 * @param	event
-	 */
-	private function onEnterFrame(event:Event):Void
-	{
-		if(_player.getDuration() > 0) {
-			if (_scrubbing) 
-			{
-				_player.seek(((_thumb.x - _track.x) / _track.width) * _player.getDuration());
-			}
-			else 
-			{
-				_currentPlayTimeLabel.text = Utils.formatTime(_player.getCurrentTime());
-				_currentPlayTimeLabel.setTextFormat(_textFormat);
-				_thumb.x = _player.getCurrentTime() / _player.getDuration() * (_track.width-_thumb.width) + _track.x;
-			}
-		}
-		
-		_volumeSlider.height = _volumeTrack.height * (_player.getVolume() / 1.0);
-		_volumeSlider.y = (_volumeTrack.y + _volumeTrack.height) - _volumeSlider.height;
-		
-		drawDownloadProgress();
-	}
-	
-	/**
-	 * Show playing controls on mouse movement.
-	 * @param	event
-	 */
-	private function onMouseMove(event:MouseEvent):Void
-	{
-		if (_stage.mouseX >= _controlsBar.x)
-		{
-			if (!_hideControlsTimer.running)
-			{
-				_hideControlsTimer.start();
-			}
-			
-			_controlsVisible = true;
-			showControls();
-		}
-	}
-	
-	/**
-	 * Function fired by a stage resize eventthat redraws the player controls
-	 * @param	event
-	 */
-	private function onStageResize(event:Event):Void
-	{
-		redrawControls();
-	}
-	
-	/**
-	 * Toggles pause or play
-	 * @param	event
-	 */
-	private function onPlayClick(event:MouseEvent):Void
-	{
-		_player.togglePlay();
-		_playControl.visible = !_player.isPlaying();
-		_pauseControl.visible = _player.isPlaying();
-	}
-	
-	/**
-	 * Toggles pause or play
-	 * @param	event
-	 */
-	private function onPauseClick(event:MouseEvent):Void
-	{
-		_player.togglePlay();
-		_playControl.visible = !_player.isPlaying();
-		_pauseControl.visible = _player.isPlaying();
-	}
-	
-	/**
-	 * Toggles betewen aspect ratios
-	 * @param	event
-	 */
-	private function onAspectRatioClick(event:MouseEvent):Void
-	{
-		_player.toggleAspectRatio();
-	}
-	
-	/**
-	 * Toggles between window and fullscreen mode
-	 * @param	event
-	 */
-	private function onFullscreenClick(event:MouseEvent):Void
-	{
-		_player.toggleFullscreen();
-	}
-	
-	/**
-	 * Toggles between mute and unmute
-	 * @param	event
-	 */
-	private function onVolumeIconClick(event: MouseEvent):Void
-	{
-		if (_volumeSlider.visible) {
-			_volumeSlider.visible = false;
-			_volumeTrack.visible = false;
-		} else {
-			_volumeSlider.visible = true;
-			_volumeTrack.visible = true;
-		}
-	}
-	
-	/**
-	 * Detect user click on volume track control and change volume according
-	 * @param	event
-	 */
-	private function onVolumeTrackClick(event:MouseEvent):Void
-	{
-		var percent:Float = _volumeTrack.height - _volumeTrack.mouseY;
-		var volume:Float = 1.0 * (percent / _volumeTrack.height);
-		
-		_player.setVolume(volume);
-	}
-	
-	/**
-	 * Display not found message
-	 * @param	event
-	 */
-	private function onPlayerStreamNotFound(event:PlayerEvents):Void
-	{
-		//todo: to work on this
-	}	
-	
-	/**
-	 * Shows the loader bar when buffering
-	 * @param	event
-	 */
-	private function onPlayerBuffering(event:PlayerEvents):Void
-	{
-		_loader.show();
-	}
-	
-	/**
-	 * Hides loader bar when not buffering
-	 * @param	event
-	 */
-	private function onPlayerNotBuffering(event:PlayerEvents):Void
-	{
-		_loader.hide();
-	}
-	
-	/**
-	 * Show the selected aspect ratio
-	 * @param	event
-	 */
-	private function onPlayerAspectRatio(event:PlayerEvents):Void
-	{
-		_hideAspectRatioLabelTimer.stop();
-		_aspectRatioLabel.text = _player.getAspectRatioString();
-		drawAspectRatioLabel();
-		
-		while (_aspectRatioLabelContainer.visible)
-		{
-			//wait till fade out finishes
-		}
-		
-		Animation.fadeIn(_aspectRatioLabelContainer, 1);
-		
-		_hideAspectRatioLabelTimer.start();
-	}
-		
-	/**
-	 * Monitors playbeack when finishes tu update controls
-	 * @param	event
-	 */
-	private function onPlayerPlaybackFinished(event:PlayerEvents):Void
-	{
-		_playControl.visible = !_player.isPlaying();
-		_pauseControl.visible = _player.isPlaying();
-		showControls();
-	}
-	
-	/**
-	 * Monitors keyboard play pause actions to update icons
-	 * @param	event
-	 */
-	private function onPlayerPlayPause(event:PlayerEvents):Void
-	{
-		_playControl.visible = !_player.isPlaying();
-		_pauseControl.visible = _player.isPlaying();
-	}
-	
-	/**
-	 * Resizes the video player on windowed mode substracting the seekbar height
-	 * @param	event
-	 */
-	private function onPlayerResize(event:PlayerEvents):Void
-	{
-	}
-	
-	/**
-	 * Updates media total time duration.
-	 * @param	event
-	 */
-	private function onPlayerMediaInitialized(event:PlayerEvents):Void
-	{	
-		_totalPlayTimeLabel.text = Utils.formatTime(event.duration);
-		_totalPlayTimeLabel.setTextFormat(_textFormat);
-		
-		_playControl.visible = !_player.isPlaying();
-		_pauseControl.visible = _player.isPlaying();
-	}
-	
-	/**
-	 * Hides seekbar if on fullscreen.
-	 * @param	event
-	 */
-	private function onPlayerMouseHide(event:PlayerEvents):Void
-	{
-		if (_controlsBar.visible && _player.isFullscreen())
-		{
-			hideControls();
-		}
-	}
-	
-	/**
-	 * Shows seekbar
-	 * @param	event
-	 */
-	private function onPlayerMouseShow(event:PlayerEvents):Void
-	{
-		//Only use slidein effect on fullscreen since switching to windowed mode on
-		//hardware scaling causes a bug by a slow response on stage height changes
-		if (_player.isFullscreen() && !_controlsBar.visible)
-		{
-			_controlsBar.visible = true;
-		}
-		else if (!_controlsBar.visible)
-		{
-			_controlsBar.visible = true;
-		}
-	}
-	
-	/**
-	 * Translates a user click in to time and seeks to it
-	 * @param	event
-	 */
-	private function onTrackClick(event:MouseEvent):Void
-	{
-		var clickPosition:Float = _track.mouseX;
-		_player.seek(_player.getDuration() * (clickPosition / _track.width));
-	}
-	
-	/**
-	 * Shows a small tooltip showing the time calculated by mouse position
-	 * @param	event
-	 */
-	private function onTrackMouseMove(event:MouseEvent):Void
-	{
-		var clickPosition:Float = _track.mouseX;
-		_seekPlayTimeLabel.text = Utils.formatTime(_player.getDuration() * (clickPosition / _track.width));
-		_seekPlayTimeLabel.setTextFormat(_textFormat);
-		
-		_seekPlayTimeLabel.y = _stage.stageHeight - _seekBar.height - _seekPlayTimeLabel.height - 1;
-		_seekPlayTimeLabel.x = clickPosition + (_seekPlayTimeLabel.width / 2) + (_playControl.width + 10) * 2;
-		_seekPlayTimeLabel.backgroundColor = _darkColor;
-		_seekPlayTimeLabel.background = true;
-		_seekPlayTimeLabel.textColor = _controlColor;
-		_seekPlayTimeLabel.borderColor = _darkColor;
-		_seekPlayTimeLabel.border = true;
-		
-		if (!_seekPlayTimeLabel.visible)
-		{
-			_seekPlayTimeLabel.visible = true;
-		}
-	}
-	
-	/**
-	 * Hides the tooltip that shows the time calculated by mouse position
-	 * @param	event
-	 */
-	private function onTrackMouseOut(event:MouseEvent):Void
-	{
-		_seekPlayTimeLabel.visible = false;
-	}
-	
-	/**
-	 * Enables dragging of thumb for seeking media
-	 * @param	event
-	 */
-	private function onThumbMouseDown(event:MouseEvent):Void
-	{
-		_scrubbing = true;
-		var rectangle:Rectangle = new Rectangle(_track.x, _track.y, _track.width-_thumb.width, 0);
-		_thumb.startDrag(false, rectangle);
-	}
-	
-	/**
-	 * Changes thumb seek control to hover color
-	 * @param	event
-	 */
-	private function onThumbHover(event:MouseEvent):Void
-	{
-		_thumb.graphics.lineStyle();
-		_thumb.graphics.beginFill(_hoverColor);
-		_thumb.graphics.drawRoundRect(0, (_seekBar.height/2)-(11/2), 11, 11, 10, 10);
-		_thumb.graphics.endFill();
-	}
-	
-	/**
-	 * Changes thumb seek control to control color
-	 * @param	event
-	 */
-	private function onThumbMouseOut(event:MouseEvent):Void
-	{
-		var matrix:Matrix = new Matrix(  );
-		matrix.createGradientBox(11, 11, Utils.degreesToRadians(-90), 11, 0);
-		var colors:Array<UInt> = [_controlColor, _controlColor];
-		var alphas:Array<Float> = [0.75, 1];
-		var ratios:Array<UInt> = [0, 255];
-		
-		_thumb.graphics.beginGradientFill(GradientType.LINEAR, colors, alphas, ratios, matrix);
-		_thumb.graphics.drawRoundRect(0, (_seekBar.height / 2) - (11 / 2), 11, 11, 10, 10);
-		_thumb.graphics.endFill();
-	}
-	
-	/**
-	 * Disables dragging of thumb
-	 * @param	event
-	 */
-	private function onThumbMouseUp(event:MouseEvent):Void
-	{
-		_scrubbing = false;
-		_thumb.stopDrag(  );
-	}
-	//}
-	
-	
-	//{Drawing functions
-	/**
-	 * Clears all current graphics a draw new ones
-	 */
-	private function redrawControls():Void
-	{	
-		drawControls();
-		drawAspectRatioLabel();
-	}
-	
-	/**
-	 * Draws the download progress track bar
-	 */
-	private function drawDownloadProgress():Void
-	{
-		if (_player.getBytesTotal() > 0)
-		{
-			var bytesLoaded:Float = _player.getBytesLoaded();
-			var bytesTotal:Float = _player.getBytesTotal();
-			
-			_percentLoaded = bytesLoaded / bytesTotal;
-		}
-		
-		var position:Float = _player.getStartTime() / _player.getDuration();
-		var startPosition:Float = (position > 0?(position * _track.width):0) + _track.x;
-		
-		_trackDownloaded.graphics.clear();
-		_trackDownloaded.graphics.lineStyle();
-		_trackDownloaded.x = startPosition;
-		_trackDownloaded.graphics.beginFill(_seekColor, 0.5);
-		_trackDownloaded.graphics.drawRoundRect(0, (_seekBar.height / 2) - (5 / 2), ((_track.width + _track.x) - _trackDownloaded.x) * _percentLoaded, 5, 3, 3);
-		_trackDownloaded.graphics.endFill();
-	}
-	
-	/**
-	 * Draws NEW control bar player/seek controls
-	 */
-	private function drawControls():Void
-	{
-		//Reset sprites for redraw
-		_controlsBar.graphics.clear();
-		_volumeTrack.graphics.clear();
-		_volumeSlider.graphics.clear();
-		_volumeSlider.visible = false;
-		_volumeTrack.visible = false;
-		
-		//Reset sprites for redraw
-		_seekBar.graphics.clear();
-		_track.graphics.clear();
-		_thumb.graphics.clear();
-		
-		//Draw controls bar
-		var barMargin = 10;
-		var barWidth = _stage.stageWidth;
-		var barHeight = _controlSize;
-		var barCenter = barWidth / 2;
-		var buttonSize = Std.int(((80 / 100) * (barHeight - (barMargin*2))));
-		
-		_controlsBar.x = 0;
-		_controlsBar.y = (_stage.stageHeight - barHeight);
-		
-		var matrix:Matrix = new Matrix(  );
-		matrix.createGradientBox(barWidth, barHeight, Utils.degreesToRadians(-90), barWidth, 0);
-		var colors:Array<UInt> = [_brightColor, _darkColor];
-		var alphas:Array<Float> = [1.0, 1];
-		var ratios:Array<UInt> = [0, 255];
-		_controlsBar.graphics.lineStyle();
-		_controlsBar.graphics.beginGradientFill(GradientType.LINEAR, colors, alphas, ratios, matrix);
-		_controlsBar.graphics.drawRect(0, 2, barWidth, barHeight-2);
-		_controlsBar.graphics.endFill();
-		_controlsBar.graphics.beginFill(_darkColor, 1);
-		_controlsBar.graphics.drawRect(0, 0, barWidth, 1);
-		_controlsBar.graphics.endFill();
-		_controlsBar.graphics.beginFill(_brightColor, 1);
-		_controlsBar.graphics.drawRect(0, 1, barWidth, 1);
-		_controlsBar.graphics.endFill();
-		
-		//Draw seek bar
-		var _seekBarWidth = barWidth - (buttonSize+barMargin)*3 - (_playControl.x + _playControl.width + barMargin) - barMargin;
-		var _seekBarHeight = barHeight;
-		_seekBar.x = _playControl.x + _playControl.width + barMargin;
-		_seekBar.y = 0;
-		_seekBar.graphics.lineStyle();
-		_seekBar.graphics.beginFill(_darkColor, 0);
-		_seekBar.graphics.drawRect(0, 0, _seekBarWidth, _seekBarHeight);
-		_seekBar.graphics.endFill();
-
-		//Draw playbutton
-		_playControl.setNormalColor(_controlColor);
-		_playControl.setHoverColor(_hoverColor);
-		_playControl.setPosition(barMargin, barMargin);
-		_playControl.setSize(buttonSize+5, buttonSize+5);
-		
-		//Draw pausebutton
-		_pauseControl.setNormalColor(_controlColor);
-		_pauseControl.setHoverColor(_hoverColor);
-		_pauseControl.setPosition(_playControl.x, _playControl.y);
-		_pauseControl.setSize(buttonSize+5, buttonSize+5);
-
-		//Draw current play time label
-		_textFormat.color = _seekColor;
-		_currentPlayTimeLabel.x = 0;
-		_currentPlayTimeLabel.y = _seekBarHeight - (_seekBarHeight / 2) - (_currentPlayTimeLabel.height / 2);
-		_currentPlayTimeLabel.antiAliasType = AntiAliasType.ADVANCED;
-		_currentPlayTimeLabel.setTextFormat(_textFormat);
-		
-		//Draw total play time label
-		_totalPlayTimeLabel.x = _seekBarWidth - _totalPlayTimeLabel.width;
-		_totalPlayTimeLabel.y = _seekBarHeight - (_seekBarHeight / 2) - (_totalPlayTimeLabel.height / 2);
-		_totalPlayTimeLabel.antiAliasType = AntiAliasType.ADVANCED;
-		_totalPlayTimeLabel.setTextFormat(_textFormat);
-		
-		//Draw download progress
-		drawDownloadProgress();
-		
-		//Draw track place holder for drag
-		_track.x = _currentPlayTimeLabel.x + _currentPlayTimeLabel.width + barMargin;
-		_track.graphics.lineStyle();
-		_track.graphics.beginFill(_seekColor, 0);
-		_track.graphics.drawRect(0, (_seekBarHeight / 2) - ((buttonSize+barMargin) / 2), _totalPlayTimeLabel.x - _totalPlayTimeLabel.width - barMargin - barMargin, buttonSize + barMargin);
-		_track.graphics.endFill();
-		
-		_track.graphics.lineStyle();
-		_track.graphics.beginFill(_seekColor, 0.3);
-		_track.graphics.drawRoundRect(0, (_seekBarHeight / 2) - (5 / 2), _totalPlayTimeLabel.x - _totalPlayTimeLabel.width - barMargin - barMargin, 5, 3, 3);
-		_track.graphics.endFill();
-		
-		//Draw thumb
-		var matrix:Matrix = new Matrix(  );
-		matrix.createGradientBox(11, 11, Utils.degreesToRadians(-90), 11, 0);
-		var colors:Array<UInt> = [_controlColor, _controlColor];
-		var alphas:Array<Float> = [0.75, 1];
-		var ratios:Array<UInt> = [0, 255];
-		
-		_thumb.x = _currentPlayTimeLabel.width + _currentPlayTimeLabel.x + barMargin;
-		_thumb.graphics.lineStyle();
-		_thumb.graphics.beginGradientFill(GradientType.LINEAR, colors, alphas, ratios, matrix);
-		//_thumb.graphics.beginFill(_controlColor);
-		_thumb.graphics.drawRoundRect(0, (_seekBarHeight/2)-(11/2), 11, 11, 10, 10);
-		_thumb.graphics.endFill();
-		
-		//Draw volume icon
-		_volumeIcon.setNormalColor(_controlColor);
-		_volumeIcon.setHoverColor(_hoverColor);
-		_volumeIcon.setPosition(_seekBar.x + _seekBar.width + barMargin, _playControl.y+1);
-		_volumeIcon.setSize(buttonSize, buttonSize);
-		
-		//Draw aspec ratio button
-		_aspectRatioControl.setNormalColor(_controlColor);
-		_aspectRatioControl.setHoverColor(_hoverColor);
-		_aspectRatioControl.setPosition(_volumeIcon.x + _volumeIcon.width + barMargin, _playControl.y+1);
-		_aspectRatioControl.setSize(buttonSize, buttonSize);
-		
-		//Draw fullscreen button
-		_fullscreenControl.setNormalColor(_controlColor);
-		_fullscreenControl.setHoverColor(_hoverColor);
-		_fullscreenControl.setPosition(_aspectRatioControl.x + _aspectRatioControl.width + barMargin, _playControl.y+1);
-		_fullscreenControl.setSize(buttonSize, buttonSize);
-		
-		//Draw volume track
-		_volumeTrack.x = _controlsBar.width-(buttonSize+barMargin)*3;
-		_volumeTrack.y = -_controlsBar.height-2;
-		_volumeTrack.graphics.lineStyle(1, _controlColor);
-		_volumeTrack.graphics.beginFill(0x000000, 0);
-		_volumeTrack.graphics.drawRect(0, 0, buttonSize, _controlsBar.height);
-		_volumeTrack.graphics.endFill();
-		
-		//Draw volume slider
-		var matrix:Matrix = new Matrix(  );
-		matrix.createGradientBox(_volumeTrack.width, _volumeTrack.height, Utils.degreesToRadians(-90), _volumeTrack.width, 0);
-		var colors:Array<UInt> = [_hoverColor, _hoverColor];
-		var alphas:Array<Float> = [0.75, 1];
-		var ratios:Array<UInt> = [0, 255];
-		
-		_volumeSlider.x = _volumeTrack.x;
-		_volumeSlider.y = _volumeTrack.y;
-		_volumeSlider.graphics.lineStyle();
-		_volumeSlider.graphics.beginGradientFill(GradientType.LINEAR, colors, alphas, ratios, matrix);
-		//_volumeSlider.graphics.beginFill(_hoverColor, 1);
-		_volumeSlider.graphics.drawRect(0, 0, _volumeTrack.width, _volumeTrack.height);
-		_volumeSlider.graphics.endFill();
-		
-	}
-	
-	private function drawAspectRatioLabel():Void
-	{
-		_aspectRatioLabelContainer.graphics.clear();
-		_aspectRatioLabelContainer.visible = false;
-		
-		//Update aspect ratio label
-		var textFormat:TextFormat = new TextFormat();
-		textFormat.font = "arial";
-		textFormat.bold = true;
-		textFormat.size = 40;
-		textFormat.color = _controlColor;
-		
-		_aspectRatioLabel.setTextFormat(textFormat);
-		_aspectRatioLabel.x = (_stage.stageWidth / 2) - (_aspectRatioLabel.width / 2);
-		_aspectRatioLabel.y = (_stage.stageHeight / 2) - (_aspectRatioLabel.height / 2);
-		
-		//Draw aspect ratio label container
-		_aspectRatioLabelContainer.x = _aspectRatioLabel.x - 10;
-		_aspectRatioLabelContainer.y = _aspectRatioLabel.y - 10;
-		_aspectRatioLabelContainer.graphics.lineStyle(0, _darkColor);
-		_aspectRatioLabelContainer.graphics.beginFill(_darkColor, 1);
-		_aspectRatioLabelContainer.graphics.drawRoundRect(0, 0, _aspectRatioLabel.width + 20, _aspectRatioLabel.height + 20, 15, 15);
-		_aspectRatioLabelContainer.graphics.endFill();
-		
-		_aspectRatioLabel.x = 10;
-		_aspectRatioLabel.y = 10;
-	}
-	//}
-	
-	
-	//{Private Methods
-	/**
-	 * Hide the play controls bar
-	 */
-	private function hideControls():Void
-	{
-		if(_controlsBar.visible)
-		{
-			drawControls();
-			Animation.slideOut(_controlsBar, "bottom", 800);
-		}
-	}
-	
-	/**
-	 * Shows play controls bar
-	 */
-	private function showControls():Void
-	{
-		if(!_controlsBar.visible)
-		{
-			drawControls();
-			_controlsBar.visible = true;
-		}
-	}
-	//}
-	
-	
-	//{Setters
-	/**
-	 * Sets the player colors and redraw them
-	 * @param	colors Array of colors in the following order: darkColor, brightColor, controlColor, hoverColor
-	 */
-	public function setControlColors(colors:Array<String>):Void
-	{
-		_darkColor = colors[0].length > 0? Std.parseInt("0x" + colors[0]) : 0x000000;
-		_brightColor = colors[1].length > 0? Std.parseInt("0x" + colors[1]) : 0x4c4c4c;
-		_controlColor = colors[2].length > 0? Std.parseInt("0x" + colors[2]) : 0xFFFFFF;
-		_hoverColor = colors[3].length > 0? Std.parseInt("0x" + colors[3]) : 0x67A8C1;
-		_seekColor = colors[4].length > 0? Std.parseInt("0x" + colors[4]) : 0x7c7c7c;
-		
-		
-		var loaderColors:Array <String> = ["", ""];
-		loaderColors[0] = colors[0];
-		loaderColors[1] = colors[2];
-		loaderColors[2] = colors[4];
-		_loader.setColors(loaderColors);
-		
-		redrawControls();
-	}
-	
-	/**
-	 * Sets the player controls size (height)
-	 * @param	size int: for e.g. 50
-	 */
-	public function setControlSize(size:Int):Void
-	{
-		if (size == 0)
-			return;
-		
-		_controlSize = size;
-		redrawControls();
-	}
-	
-	/**
-	 * To set the duration label when autostart parameter is false
-	 * @param	duration in seconds or formatted string in format hh:mm:ss
-	 */
-	public function setDurationLabel(duration:String):Void
-	{
-		//Person passed time already formatted
-		if (duration.indexOf(":") != -1)
-		{
-			_totalPlayTimeLabel.text = duration;
-		}
-		
-		//Time passed in seconds
-		else
-		{
-			_totalPlayTimeLabel.text = Std.string(Utils.formatTime(Std.parseFloat(duration)));
-		}
-		
-		_totalPlayTimeLabel.setTextFormat(_textFormat);
-	}
-	//}
-	
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/newcontrols/PauseIcon.hx b/lib/Jaris/src/jaris/player/newcontrols/PauseIcon.hx
deleted file mode 100644
index c0b8343b4..000000000
--- a/lib/Jaris/src/jaris/player/newcontrols/PauseIcon.hx
+++ /dev/null
@@ -1,127 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player.newcontrols;
-import flash.display.Sprite;
-import flash.events.MouseEvent;
-import flash.geom.Matrix;
-import jaris.utils.Utils;
-import flash.display.GradientType;
-
-class PauseIcon extends Sprite
-{
-	private var _width:Float;
-	private var _height:Float;
-	private var _normalColor:UInt;
-	private var _hoverColor:UInt;
-	
-	public function new(x:Float, y:Float, width:Float, height:Float, normalColor:UInt, hoverColor:UInt) 
-	{
-		super();
-		
-		this.x = x;
-		this.y = y;
-		this.buttonMode = true;
-		this.useHandCursor = true;
-		this.tabEnabled = false;
-		
-		_width = width;
-		_height = height;
-		_normalColor = normalColor;
-		_hoverColor = hoverColor;
-		
-		addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
-		addEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
-		
-		draw(_normalColor);
-	}
-	
-	private function onMouseOver(event:MouseEvent):Void
-	{
-		draw(_hoverColor);
-	}
-	
-	private function onMouseOut(event:MouseEvent):Void
-	{
-		draw(_normalColor);
-	}
-	
-	//{Private Methods
-	private function draw(color:UInt):Void
-	{
-		graphics.clear();
-		
-		graphics.lineStyle(0, color, 0.0);
-		graphics.beginFill(color, 0);
-		graphics.drawRect(0, 0, _width, _height);
-		graphics.endFill();
-		
-		var matrix:Matrix = new Matrix(  );
-		matrix.createGradientBox(_width, _height, Utils.degreesToRadians(-90), _width, 0);
-		var colors:Array<UInt> = [color, color];
-		var alphas:Array<Float> = [0.75, 1];
-		var ratios:Array<UInt> = [0, 255];
-		
-		graphics.lineStyle();
-		graphics.beginGradientFill(GradientType.LINEAR, colors, alphas, ratios, matrix);
-		//graphics.beginFill(color);
-		graphics.drawRoundRect(0, 0, (33 / 100) * _width, _height, 6, 6);
-		graphics.drawRoundRect(_width - ((33 / 100) * _width), 0, (33 / 100) * _width, _height, 6, 6);
-		graphics.endFill();
-		
-		graphics.lineStyle();
-		graphics.beginFill(color, 0);
-		graphics.drawRect(0, 0, _width, _height);
-		graphics.endFill();
-	}
-	//}
-	
-	//{Setters
-	public function setNormalColor(color:UInt):Void
-	{
-		_normalColor = color;
-		draw(_normalColor);
-	}
-	
-	public function setHoverColor(color:UInt):Void
-	{
-		_hoverColor = color;
-		draw(_hoverColor);
-	}
-	
-	public function setPosition(x:Float, y:Float):Void
-	{
-		this.x = x;
-		this.y = y;
-		
-		draw(_normalColor);
-	}
-	
-	public function setSize(width:Float, height:Float):Void
-	{
-		_width = width;
-		_height = height;
-		
-		draw(_normalColor);
-	}
-	//}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/newcontrols/PlayIcon.hx b/lib/Jaris/src/jaris/player/newcontrols/PlayIcon.hx
deleted file mode 100644
index 9059215e9..000000000
--- a/lib/Jaris/src/jaris/player/newcontrols/PlayIcon.hx
+++ /dev/null
@@ -1,122 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player.newcontrols;
-import flash.display.Sprite;
-import flash.events.MouseEvent;
-import flash.geom.Matrix;
-import jaris.utils.Utils;
-import flash.display.GradientType;
-
-class PlayIcon extends Sprite
-{
-	private var _width:Float;
-	private var _height:Float;
-	private var _normalColor:UInt;
-	private var _hoverColor:UInt;
-	
-	public function new(x:Float, y:Float, width:Float, height:Float, normalColor:UInt, hoverColor:UInt) 
-	{
-		super();
-		
-		this.x = x;
-		this.y = y;
-		this.buttonMode = true;
-		this.useHandCursor = true;
-		this.tabEnabled = false;
-		
-		_width = width;
-		_height = height;
-		_normalColor = normalColor;
-		_hoverColor = hoverColor;
-		
-		addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
-		addEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
-		
-		draw(_normalColor);
-	}
-	
-	private function onMouseOver(event:MouseEvent):Void
-	{
-		draw(_hoverColor);
-	}
-	
-	private function onMouseOut(event:MouseEvent):Void
-	{
-		draw(_normalColor);
-	}
-	
-	//{Private Methods
-	private function draw(color:UInt):Void
-	{
-		graphics.clear();
-		graphics.lineStyle(0, color, 0.0);
-		graphics.beginFill(color, 0);
-		graphics.drawRect(0, 0, _width, _height);
-		graphics.endFill();
-		
-		var matrix:Matrix = new Matrix(  );
-		matrix.createGradientBox(_width, _height, Utils.degreesToRadians(-90), _width, 0);
-		var colors:Array<UInt> = [color, color];
-		var alphas:Array<Float> = [0.75, 1];
-		var ratios:Array<UInt> = [0, 255];
-		
-		graphics.lineStyle();
-		graphics.beginGradientFill(GradientType.LINEAR, colors, alphas, ratios, matrix);
-		//graphics.beginFill(color);
-		graphics.lineTo(0, _height);
-		graphics.lineTo(_width, _height / 2);
-		graphics.lineTo(0, 0);
-		graphics.endFill();
-	}
-	//}
-	
-	//{Setters
-	public function setNormalColor(color:UInt):Void
-	{
-		_normalColor = color;
-		draw(_normalColor);
-	}
-	
-	public function setHoverColor(color:UInt):Void
-	{
-		_hoverColor = color;
-		draw(_hoverColor);
-	}
-	
-	public function setPosition(x:Float, y:Float):Void
-	{
-		this.x = x;
-		this.y = y;
-		
-		draw(_normalColor);
-	}
-	
-	public function setSize(width:Float, height:Float):Void
-	{
-		_width = width;
-		_height = height;
-		
-		draw(_normalColor);
-	}
-	//}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/player/newcontrols/VolumeIcon.hx b/lib/Jaris/src/jaris/player/newcontrols/VolumeIcon.hx
deleted file mode 100644
index c263ecfaf..000000000
--- a/lib/Jaris/src/jaris/player/newcontrols/VolumeIcon.hx
+++ /dev/null
@@ -1,125 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.player.newcontrols;
-import flash.display.Sprite;
-import flash.events.MouseEvent;
-import flash.geom.Matrix;
-import jaris.utils.Utils;
-import flash.display.GradientType;
-
-class VolumeIcon extends Sprite
-{
-	private var _width:Float;
-	private var _height:Float;
-	private var _normalColor:UInt;
-	private var _hoverColor:UInt;
-	
-	public function new(x:Float, y:Float, width:Float, height:Float, normalColor:UInt, hoverColor:UInt) 
-	{
-		super();
-		
-		this.x = x;
-		this.y = y;
-		this.buttonMode = true;
-		this.useHandCursor = true;
-		this.tabEnabled = false;
-		
-		_width = width;
-		_height = height;
-		_normalColor = normalColor;
-		_hoverColor = hoverColor;
-		
-		addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
-		addEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
-		
-		draw(_normalColor);
-	}
-	
-	private function onMouseOver(event:MouseEvent):Void
-	{
-		draw(_hoverColor);
-	}
-	
-	private function onMouseOut(event:MouseEvent):Void
-	{
-		draw(_normalColor);
-	}
-	
-	//{Private Methods
-	private function draw(color:UInt):Void
-	{
-		graphics.clear();
-		
-		graphics.lineStyle(0, color, 0.0);
-		graphics.beginFill(color, 0);
-		graphics.drawRect(0, 0, _width, _height);
-		graphics.endFill();
-		
-		var matrix:Matrix = new Matrix(  );
-		matrix.createGradientBox(_width, _height, Utils.degreesToRadians(-90), _width, 0);
-		var colors:Array<UInt> = [color, color];
-		var alphas:Array<Float> = [0.75, 1];
-		var ratios:Array<UInt> = [0, 255];
-		
-		graphics.lineStyle();
-		graphics.beginGradientFill(GradientType.LINEAR, colors, alphas, ratios, matrix);
-		//graphics.beginFill(color, 1);
-		graphics.drawRect(0, ((50 / 100) * _height) / 2+1, _width / 2-1, ((50 / 100) * _height));
-		graphics.moveTo(_width / 2 -1, ((50 / 100) * _height)/2+1);
-		graphics.lineTo(_width, 0);
-		graphics.lineTo(_width, _height+2);
-		graphics.lineTo(_width / 2 -1, ((50 / 100) * _height) + (((50 / 100) * _height) / 2)+1);
-		graphics.endFill();
-	}
-	//}
-	
-	//{Setters
-	public function setNormalColor(color:UInt):Void
-	{
-		_normalColor = color;
-		draw(_normalColor);
-	}
-	
-	public function setHoverColor(color:UInt):Void
-	{
-		_hoverColor = color;
-		draw(_hoverColor);
-	}
-	
-	public function setPosition(x:Float, y:Float):Void
-	{
-		this.x = x;
-		this.y = y;
-		
-		draw(_normalColor);
-	}
-	
-	public function setSize(width:Float, height:Float):Void
-	{
-		_width = width;
-		_height = height;
-		
-		draw(_normalColor);
-	}
-	//}
-}
\ No newline at end of file
diff --git a/lib/Jaris/src/jaris/utils/Utils.hx b/lib/Jaris/src/jaris/utils/Utils.hx
deleted file mode 100644
index be279307e..000000000
--- a/lib/Jaris/src/jaris/utils/Utils.hx
+++ /dev/null
@@ -1,161 +0,0 @@
-/**    
- * @author Jefferson González
- * @copyright 2010 Jefferson González
- *
- * @license 
- * This file is part of Jaris FLV Player.
- *
- * Jaris FLV Player is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License or GNU LESSER GENERAL 
- * PUBLIC LICENSE as published by the Free Software Foundation, either version 
- * 3 of the License, or (at your option) any later version.
- *
- * Jaris FLV Player is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License and 
- * GNU LESSER GENERAL PUBLIC LICENSE along with Jaris FLV Player.  If not, 
- * see <http://www.gnu.org/licenses/>.
- */
-
-package jaris.utils;
-
-/**
- * Some utility functions
- */
-class Utils 
-{
-
-	/**
-	 * Converts degrees to radians for easy rotation where applicable
-	 * @param	value A radian value to convert
-	 * @return conversion of degree to radian
-	 */
-	public static function degreesToRadians(value:Float):Float
-	{
-		return (Math.PI / 180) * value;
-	}
-	
-	/**
-	 * Converts a float value representing seconds to a readale string
-	 * @param	time A given time in seconds
-	 * @return A string in the format 00:00:00
-	 */
-	public static function formatTime(time:Float):String
-	{
-		var seconds:String = "";
-		var minutes:String = "";
-		var hours:String = "";
-		var timeString:String = "";
-		
-		if (((time / 60) / 60) >= 1)
-		{
-			if (Math.floor((time / 60)) / 60 < 10)
-			{
-				hours = "0" + Math.floor((time / 60) / 60) + ":";
-			}
-			else
-			{
-				hours = Math.floor((time / 60) / 60) + ":";
-			}
-			
-			if (Math.floor((time / 60) % 60) < 10)
-			{
-				minutes = "0" + Math.floor((time / 60) % 60) + ":";
-			}
-			else
-			{
-				minutes = Math.floor((time / 60) % 60) + ":";
-			}
-			
-			if (Math.floor(time % 60) < 10)
-			{
-				seconds = "0" + Math.floor(time % 60);
-			}
-			else
-			{
-				seconds = Std.string(Math.floor(time % 60));
-			}
-		}
-		else if((time / 60) >= 1)
-		{
-			hours = "00:";
-			
-			if (Math.floor(time / 60) < 10)
-			{
-				minutes = "0" + Math.floor(time / 60) + ":";
-			}
-			else
-			{
-				minutes = Math.floor(time / 60) + ":";
-			}
-			
-			if (Math.floor(time % 60) < 10)
-			{
-				seconds = "0" + Math.floor(time % 60);
-			}
-			else
-			{
-				seconds = Std.string(Math.floor(time % 60));
-			}
-		}
-		else
-		{
-			hours = "00:";
-			
-			minutes = "00:";
-			
-			if (Math.floor(time) < 10)
-			{
-				seconds = "0" + Math.floor(time);
-			}
-			else
-			{
-				seconds = Std.string(Math.floor(time));
-			}
-		}
-		
-		timeString += hours + minutes + seconds;
-		
-		return timeString;
-	}
-	
-	/**
-	 * Converts a given rtmp source to a valid format for NetStream
-	 * @param	source
-	 * @return
-	 */
-	public static function rtmpSourceParser(source:String):String
-	{
-		if (source.indexOf(".flv") != -1)
-		{
-			return source.split(".flv").join("");
-		}
-		else if (source.indexOf(".mp3") != -1)
-		{
-			return "mp3:" + source.split(".mp3").join("");
-		}
-		else if (source.indexOf(".mp4") != -1)
-		{
-			return "mp4:" + source;
-		}
-		else if (source.indexOf(".f4v") != -1)
-		{
-			return "mp4:" + source;
-		}
-		
-		return source;
-	}
-	
-	/**
-	 * Changes a youtube url to the format youtube.com/v/video_id
-	 * @param	source
-	 * @return
-	 */
-	public static function youtubeSourceParse(source:String):String
-	{
-		return source.split("watch?v=").join("v/");
-	}
-}
\ No newline at end of file

From 951323abcf125ff938c9eb179950a5b0509a3cf0 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 14 May 2016 23:39:45 +0100
Subject: [PATCH 078/250] default handle_video thumbgen to ffmpeg if ffmpeg in
 path & is_executable

---
 ext/handle_video/main.php | 41 ++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/ext/handle_video/main.php b/ext/handle_video/main.php
index 21585748a..e25674128 100644
--- a/ext/handle_video/main.php
+++ b/ext/handle_video/main.php
@@ -19,23 +19,38 @@
 class VideoFileHandler extends DataHandlerExtension {
 	public function onInitExt(InitExtEvent $event) {
 		global $config;
-		$config->set_default_string('video_thumb_engine', 'static');
-		$config->set_default_string('thumb_ffmpeg_path', '');
-
-		// By default we generate thumbnails ignoring the aspect ratio of the video file.
-		//
-		// Why? - This allows Shimmie to work with older versions of FFmpeg by default,
-		// rather than completely failing out of the box. If people complain that their
-		// thumbnails are distorted, then they can turn this feature on manually later.
-		$config->set_default_bool('video_thumb_ignore_aspect_ratio', true);
+
+		if($config->get_int("ext_handle_video_version") < 1) {
+			if($ffmpeg = shell_exec((PHP_OS == 'WINNT' ? 'where' : 'which') . ' ffmpeg')) {
+				//ffmpeg exists in PATH, check if it's executable, and if so, default to it instead of static
+				if(is_executable(strtok($ffmpeg, PHP_EOL))) {
+					$config->set_default_string('video_thumb_engine', 'ffmpeg');
+					$config->set_default_string('thumb_ffmpeg_path',  'ffmpeg');
+				}
+			} else {
+				$config->set_default_string('video_thumb_engine', 'static');
+				$config->set_default_string('thumb_ffmpeg_path',  '');
+			}
+
+			// By default we generate thumbnails ignoring the aspect ratio of the video file.
+			//
+			// Why? - This allows Shimmie to work with older versions of FFmpeg by default,
+			// rather than completely failing out of the box. If people complain that their
+			// thumbnails are distorted, then they can turn this feature on manually later.
+			$config->set_default_bool('video_thumb_ignore_aspect_ratio', TRUE);
+
+			$config->set_int("ext_handle_video_version", 1);
+			log_info("pools", "extension installed");
+		}
 	}
 
 	public function onSetupBuilding(SetupBuildingEvent $event) {
 		//global $config;
-		
-		$thumbers = array();
-		$thumbers['None'] = "static";
-		$thumbers['ffmpeg'] = "ffmpeg";
+
+		$thumbers = array(
+			'None'   => 'static',
+			'ffmpeg' => 'ffmpeg'
+		);
 
 		$sb = new SetupBlock("Video Thumbnail Options");
 

From caed53de6a064a79db6d2ad220e4f18437a1f1bb Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Jun 2016 06:27:32 +0100
Subject: [PATCH 079/250] jQuery.cookie is deprecated so use js-cookie instead
 (+ composer), some js tweaking too

Conflicts:
	ext/blotter/script.js
	ext/handle_pixel/script.js
	ext/index/script.js
	ext/pools/script.js
	lib/shimmie.js
---
 composer.json               |  14 ++--
 ext/pools/script.js         |   5 +-
 ext/pools/theme.php         |  16 ++--
 lib/js.cookie.js            | 151 ------------------------------------
 themes/lite/setup.theme.php |   6 +-
 themes/material/script0.js  |   8 +-
 6 files changed, 24 insertions(+), 176 deletions(-)
 delete mode 100644 lib/js.cookie.js

diff --git a/composer.json b/composer.json
index d147f961f..84bb6c8cb 100644
--- a/composer.json
+++ b/composer.json
@@ -29,15 +29,17 @@
 		"bower-asset/jquery"         : "1.12.3",
 		"bower-asset/jquery-timeago" : "1.5.2",
 		"bower-asset/tablesorter"    : "2.0.5",
-		"bower-asset/mediaelement"   : "2.21.1"
+		"bower-asset/mediaelement"   : "2.21.1",
+		"bower-asset/js-cookie"      : "2.1.1"
 	},
 
 	"vendor-copy": {
-		"vendor/bower-asset/jquery/dist/jquery.min.js"             : "lib/vendor/js/jquery-1.12.3.min.js",
-		"vendor/bower-asset/jquery/dist/jquery.min.map"            : "lib/vendor/js/jquery-1.12.3.min.map",
-		"vendor/bower-asset/jquery-timeago/jquery.timeago.js"      : "lib/vendor/js/jquery.timeago.js",
-		"vendor/bower-asset/tablesorter/jquery.tablesorter.min.js" : "lib/vendor/js/jquery.tablesorter.min.js"
-		"vendor/bower-asset/mediaelement/build/flashmediaelement.swf" : "lib/vendor/swf/flashmediaelement.swf"
+		"vendor/bower-asset/jquery/dist/jquery.min.js"                : "lib/vendor/js/jquery-1.12.3.min.js",
+		"vendor/bower-asset/jquery/dist/jquery.min.map"               : "lib/vendor/js/jquery-1.12.3.min.map",
+		"vendor/bower-asset/jquery-timeago/jquery.timeago.js"         : "lib/vendor/js/jquery.timeago.js",
+		"vendor/bower-asset/tablesorter/jquery.tablesorter.min.js"    : "lib/vendor/js/jquery.tablesorter.min.js",
+		"vendor/bower-asset/mediaelement/build/flashmediaelement.swf" : "lib/vendor/swf/flashmediaelement.swf",
+		"vendor/bower-asset/js-cookie/src/js.cookie.js"               : "lib/vendor/js/js.cookie.js"
 	},
 
 	"scripts": {
diff --git a/ext/pools/script.js b/ext/pools/script.js
index 88cec0e3c..6b45792cd 100644
--- a/ext/pools/script.js
+++ b/ext/pools/script.js
@@ -1,12 +1,9 @@
 /*jshint bitwise:true, curly:true, forin:false, noarg:true, noempty:true, nonew:true, undef:true, strict:false, browser:true, jquery:true */
 
 $(function() {
-	var order_pool = Cookies.get("shm_ui-order-pool") || "created";
-	$("#order_pool option[value="+order_pool+"]").attr("selected", true);
-
 	$('#order_pool').change(function(){
 		var val = $("#order_pool option:selected").val();
-		Cookies.set("shm_ui-order-pool", val, {expires: 365}); //FIXME: This won't play nice if COOKIE_PREFIX is not "shm_".
+		Cookies.set("shm_ui-order-pool", val, {path: '/', expires: 365}); //FIXME: This won't play nice if COOKIE_PREFIX is not "shm_".
 		window.location.href = '';
 	});
 });
diff --git a/ext/pools/theme.php b/ext/pools/theme.php
index b0e078666..457eb7930 100644
--- a/ext/pools/theme.php
+++ b/ext/pools/theme.php
@@ -86,14 +86,14 @@ public function list_pools(Page $page, /*array*/ $pools, /*int*/ $pageNumber, /*
 
 		$html .= "</tbody></table>";
 
-		$order_html = '
-			<select id="order_pool">
-			  <option value="created">Recently created</option>
-			  <option value="updated">Last updated</option>
-			  <option value="name">Name</option>
-			  <option value="count">Post count</option>
-			</select>
-		';
+		$order_html = '<select id="order_pool">';
+		$order_selected = $page->get_cookie('ui-order-pool');
+		$order_arr = ['created' => 'Recently created', 'updated' => 'Last updated', 'name' => 'Name', 'count' => 'Post Count'];
+		foreach($order_arr as $value => $text) {
+			$selected = ($value == $order_selected ? "selected" : "");
+			$order_html .= "<option value=\"{$value}\" {$selected}>{$text}</option>\n";
+		}
+		$order_html .= '</select>';
 
 		$this->display_top(null, "Pools");
 		$page->add_block(new Block("Order By", $order_html, "left", 15));
diff --git a/lib/js.cookie.js b/lib/js.cookie.js
deleted file mode 100644
index 7f3dffde6..000000000
--- a/lib/js.cookie.js
+++ /dev/null
@@ -1,151 +0,0 @@
-/*!
- * JavaScript Cookie v2.1.2
- * https://github.com/js-cookie/js-cookie
- *
- * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
- * Released under the MIT license
- */
-;(function (factory) {
-	if (typeof define === 'function' && define.amd) {
-		define(factory);
-	} else if (typeof exports === 'object') {
-		module.exports = factory();
-	} else {
-		var OldCookies = window.Cookies;
-		var api = window.Cookies = factory();
-		api.noConflict = function () {
-			window.Cookies = OldCookies;
-			return api;
-		};
-	}
-}(function () {
-	function extend () {
-		var i = 0;
-		var result = {};
-		for (; i < arguments.length; i++) {
-			var attributes = arguments[ i ];
-			for (var key in attributes) {
-				result[key] = attributes[key];
-			}
-		}
-		return result;
-	}
-
-	function init (converter) {
-		function api (key, value, attributes) {
-			var result;
-			if (typeof document === 'undefined') {
-				return;
-			}
-
-			// Write
-
-			if (arguments.length > 1) {
-				attributes = extend({
-					path: '/'
-				}, api.defaults, attributes);
-
-				if (typeof attributes.expires === 'number') {
-					var expires = new Date();
-					expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5);
-					attributes.expires = expires;
-				}
-
-				try {
-					result = JSON.stringify(value);
-					if (/^[\{\[]/.test(result)) {
-						value = result;
-					}
-				} catch (e) {}
-
-				if (!converter.write) {
-					value = encodeURIComponent(String(value))
-						.replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
-				} else {
-					value = converter.write(value, key);
-				}
-
-				key = encodeURIComponent(String(key));
-				key = key.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent);
-				key = key.replace(/[\(\)]/g, escape);
-
-				return (document.cookie = [
-					key, '=', value,
-					attributes.expires && '; expires=' + attributes.expires.toUTCString(), // use expires attribute, max-age is not supported by IE
-					attributes.path    && '; path=' + attributes.path,
-					attributes.domain  && '; domain=' + attributes.domain,
-					attributes.secure ? '; secure' : ''
-				].join(''));
-			}
-
-			// Read
-
-			if (!key) {
-				result = {};
-			}
-
-			// To prevent the for loop in the first place assign an empty array
-			// in case there are no cookies at all. Also prevents odd result when
-			// calling "get()"
-			var cookies = document.cookie ? document.cookie.split('; ') : [];
-			var rdecode = /(%[0-9A-Z]{2})+/g;
-			var i = 0;
-
-			for (; i < cookies.length; i++) {
-				var parts = cookies[i].split('=');
-				var cookie = parts.slice(1).join('=');
-
-				if (cookie.charAt(0) === '"') {
-					cookie = cookie.slice(1, -1);
-				}
-
-				try {
-					var name = parts[0].replace(rdecode, decodeURIComponent);
-					cookie = converter.read ?
-						converter.read(cookie, name) : converter(cookie, name) ||
-						cookie.replace(rdecode, decodeURIComponent);
-
-					if (this.json) {
-						try {
-							cookie = JSON.parse(cookie);
-						} catch (e) {}
-					}
-
-					if (key === name) {
-						result = cookie;
-						break;
-					}
-
-					if (!key) {
-						result[name] = cookie;
-					}
-				} catch (e) {}
-			}
-
-			return result;
-		}
-
-		api.set = api;
-		api.get = function (key) {
-			return api(key);
-		};
-		api.getJSON = function () {
-			return api.apply({
-				json: true
-			}, [].slice.call(arguments));
-		};
-		api.defaults = {};
-
-		api.remove = function (key, attributes) {
-			api(key, '', extend(attributes, {
-				expires: -1
-			}));
-		};
-
-		api.withConverter = init;
-
-		return api;
-	}
-
-	return init(function () {});
-}));
diff --git a/themes/lite/setup.theme.php b/themes/lite/setup.theme.php
index 7b1305071..42a1d2109 100644
--- a/themes/lite/setup.theme.php
+++ b/themes/lite/setup.theme.php
@@ -17,14 +17,14 @@ protected function sb_to_html(SetupBlock $block) {
 				$(\"#$i-toggle\").click(function() {
 					$(\"#$i\").slideToggle(\"slow\", function() {
 						if($(\"#$i\").is(\":hidden\")) {
-							$.cookie(\"$i-hidden\", 'true', {path: '/'});
+							Cookies.set(\"$i-hidden\", 'true', {path: '/'});
 						}
 						else {
-							$.cookie(\"$i-hidden\", 'false', {path: '/'});
+							Cookies.set(\"$i-hidden\", 'false', {path: '/'});
 						}
 					});
 				});
-				if($.cookie(\"$i-hidden\") == 'true') {
+				if(Cookies.get(\"$i-hidden\") == 'true') {
 					$(\"#$i\").hide();
 				}
 			});
diff --git a/themes/material/script0.js b/themes/material/script0.js
index 1fd32cd83..8d47ebb5d 100644
--- a/themes/material/script0.js
+++ b/themes/material/script0.js
@@ -33,7 +33,7 @@ $(function(){
     } else {
       $("#left-block").prependTo("#main-grid")
     }
-  	$.cookie("ui-layout-type", layout_type, {path: '/', expires: 365});
+  	Cookies.set("ui-layout-type", layout_type, {path: '/', expires: 365});
     zoom("width");
   }
 
@@ -55,10 +55,10 @@ $(function(){
     } else {
       $("#left-block").prependTo("#main-grid")
     }
-  	$.cookie("ui-layout-type", layout_type, {path: '/', expires: 365});
+  	Cookies.set("ui-layout-type", layout_type, {path: '/', expires: 365});
     zoom("width");
   }
-  current_layout = $.cookie("layout-type");
+  current_layout = Cookies.get("layout-type");
   if (current_layout != null) {
     if(current_layout =="top" || current_layout == "bottom"){
       leftAddFullSize(current_layout);
@@ -91,5 +91,5 @@ function zoom(zoom_type) {
 
 	$(".shm-zoomer").val(zoom_type);
 
-	$.cookie("ui-image-zoom", zoom_type, {path: '/', expires: 365});
+	Cookies.set("ui-image-zoom", zoom_type, {path: '/', expires: 365});
 }

From b9893cbbda74639cd085d12f157fd98abcbba32a Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Tue, 17 May 2016 17:15:29 +0100
Subject: [PATCH 080/250] $_POST["tags"] isn't always set

---
 ext/upload/main.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/upload/main.php b/ext/upload/main.php
index 9c7b3fa05..61c41d0f8 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -238,13 +238,15 @@ public function onPageRequest(PageRequestEvent $event) {
 	 * @return string[]
 	 */
 	private function tags_for_upload_slot($id) {
+		$post_tags = isset($_POST["tags"]) ? $_POST["tags"] : "";
+
 		if(isset($_POST["tags$id"])) {
 			# merge then explode, not explode then merge - else
 			# one of the merges may create a surplus "tagme"
-			$tags = Tag::explode($_POST['tags'] . " " . $_POST["tags$id"]);
+			$tags = Tag::explode($post_tags . " " . $_POST["tags$id"]);
 		}
 		else {
-			$tags = Tag::explode($_POST['tags']);
+			$tags = Tag::explode($post_tags);
 		}
 		return $tags;
 	}

From 9e7c318df01ffa9f12fe6ddd72fbfe78ab66499f Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Wed, 18 May 2016 14:36:50 +0100
Subject: [PATCH 081/250] notes ext code cleanup initial prep to fix & take the
 ext out of beta

---
 ext/notes/main.php  | 386 ++++++++++++++++++--------------------------
 ext/notes/theme.php |  87 +++++-----
 2 files changed, 203 insertions(+), 270 deletions(-)

diff --git a/ext/notes/main.php b/ext/notes/main.php
index 15327cdf2..397432264 100644
--- a/ext/notes/main.php
+++ b/ext/notes/main.php
@@ -1,3 +1,4 @@
+
 <?php
 /**
  * Name: [Beta] Notes
@@ -30,7 +31,7 @@ public function onInitExt(InitExtEvent $event) {
 					FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE
 					");
 			$database->execute("CREATE INDEX notes_image_id_idx ON notes(image_id)", array());
-			
+
 			$database->create_table("note_request", "
 					id SCORE_AIPK,
 					image_id INTEGER NOT NULL,
@@ -40,7 +41,7 @@ public function onInitExt(InitExtEvent $event) {
 					FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE
 					");
 			$database->execute("CREATE INDEX note_request_image_id_idx ON note_request(image_id)", array());
-					
+
 			$database->create_table("note_histories", "
 					id SCORE_AIPK,
 					note_enable INTEGER NOT NULL,
@@ -68,110 +69,83 @@ public function onInitExt(InitExtEvent $event) {
 			log_info("notes", "extension installed");
 		}
 	}
-	
+
 	public function onPageRequest(PageRequestEvent $event) {
 		global $page, $user;
 		if($event->page_matches("note")) {
-			
 			switch($event->get_arg(0)) {
 				case "list": //index
-				{
 					$this->get_notes_list($event); // This should show images like post/list but i don't know how do that.
 					break;
-				}
 				case "requests": // The same as post/list but only for note_request table.
-				{
-					$this->get_notes_requests($event); // This should shouw images like post/list but i don't know how do that.
+					$this->get_notes_requests($event); // This should show images like post/list but i don't know how do that.
 					break;
-				}
 				case "search":
-				{
 					if(!$user->is_anonymous())
 						$this->theme->search_notes_page($page);
 					break;
-				}
-				case "updated": //Thinking how biuld this function. 
-				{
+				case "updated": //Thinking how to build this function.
 					$this->get_histories($event);
 					break;
-				}
-				case "history": //Thinking how biuld this function. 
-				{
+				case "history": //Thinking how to build this function.
 					$this->get_history($event);
 					break;
-				}
 				case "revert":
-				{
-					$noteID = $event->get_arg(1);
+					$noteID   = $event->get_arg(1);
 					$reviewID = $event->get_arg(2);
 					if(!$user->is_anonymous()){
 						$this->revert_history($noteID, $reviewID);
 					}
-					
+
 					$page->set_mode("redirect");
 					$page->set_redirect(make_link("note/updated"));
 					break;
-				}
 				case "add_note":
-				{
 					if(!$user->is_anonymous())
 						$this->add_new_note();
-						
-						$page->set_mode("redirect");
-						$page->set_redirect(make_link("post/view/".$_POST["image_id"]));
+
+					$page->set_mode("redirect");
+					$page->set_redirect(make_link("post/view/".$_POST["image_id"]));
 					break;
-				}
 				case "add_request":
-				{
 					if(!$user->is_anonymous())
 						$this->add_note_request();
-						
-						$page->set_mode("redirect");
-						$page->set_redirect(make_link("post/view/".$_POST["image_id"]));
+
+					$page->set_mode("redirect");
+					$page->set_redirect(make_link("post/view/".$_POST["image_id"]));
 					break;
-				}
 				case "nuke_notes":
-				{
 					if($user->is_admin())
 						$this->nuke_notes();
-						
-						$page->set_mode("redirect");
-						$page->set_redirect(make_link("post/view/".$_POST["image_id"]));
+
+					$page->set_mode("redirect");
+					$page->set_redirect(make_link("post/view/".$_POST["image_id"]));
 					break;
-				}
 				case "nuke_requests":
-				{
 					if($user->is_admin())
 						$this->nuke_requests();
-						
-						$page->set_mode("redirect");
-						$page->set_redirect(make_link("post/view/".$_POST["image_id"]));
+
+					$page->set_mode("redirect");
+					$page->set_redirect(make_link("post/view/".$_POST["image_id"]));
 					break;
-				}
 				case "edit_note":
-				{
 					if (!$user->is_anonymous()) {
 						$this->update_note();
 						$page->set_mode("redirect");
-						$page->set_redirect(make_link("post/view/".$_POST["image_id"]));
+						$page->set_redirect(make_link("post/view/" . $_POST["image_id"]));
 					}
-				break;
-				}
+					break;
 				case "delete_note":
-				{
 					if ($user->is_admin()) {
 						$this->delete_note();
 						$page->set_mode("redirect");
 						$page->set_redirect(make_link("post/view/".$_POST["image_id"]));
 					}
-				break;
-				}
+					break;
 				default:
-				{
 					$page->set_mode("redirect");
 					$page->set_redirect(make_link("note/list"));
 					break;
-				}
 			}
 		}
 	}
@@ -184,7 +158,7 @@ public function onDisplayingImage(DisplayingImageEvent $event) {
 		global $page, $user;
 
 		//display form on image event
-        $notes = $this->get_notes($event->image->id);
+		$notes = $this->get_notes($event->image->id);
 		$this->theme->display_note_system($page, $event->image->id, $notes, $user->is_admin());
 	}
 
@@ -223,8 +197,7 @@ public function onSearchTermParse(SearchTermParseEvent $event) {
 			$user = User::by_name($matches[1]);
 			if(!is_null($user)) {
 				$user_id = $user->id;
-			}
-			else {
+			} else {
 				$user_id = -1;
 			}
 
@@ -250,8 +223,8 @@ private function get_notes($imageID) {
 			"SELECT * ".
 			"FROM notes ".
 			"WHERE enable = ? AND image_id = ? ".
-			"ORDER BY date ASC"
-			, array('1', $imageID));
+			"ORDER BY date ASC",
+			array('1', $imageID));
 	}
 
 
@@ -270,23 +243,21 @@ private function add_new_note() {
 		$noteText   = html_escape($_POST["note_text"]);
 
 		$database->execute("
-				INSERT INTO notes
-				(enable, image_id, user_id, user_ip, date, x1, y1, height, width, note)
-				VALUES
-				(?, ?, ?, ?, now(), ?, ?, ?, ?, ?)",
+				INSERT INTO notes (enable, image_id, user_id, user_ip, date, x1, y1, height, width, note)
+				VALUES (?, ?, ?, ?, now(), ?, ?, ?, ?, ?)",
 				array(1, $imageID, $user_id, $_SERVER['REMOTE_ADDR'], $noteX1, $noteY1, $noteHeight, $noteWidth, $noteText));
 
 		$noteID = $database->get_last_insert_id('notes_id_seq');
 
 		log_info("notes", "Note added {$noteID} by {$user->name}");
 
-		$database->Execute("UPDATE images SET notes=(SELECT COUNT(*) FROM notes WHERE image_id=?) WHERE id=?", array($imageID, $imageID));
+		$database->execute("UPDATE images SET notes=(SELECT COUNT(*) FROM notes WHERE image_id=?) WHERE id=?", array($imageID, $imageID));
 
 		$this->add_history(1, $noteID, $imageID, $noteX1, $noteY1, $noteHeight, $noteWidth, $noteText);
 	}
-	
-	
-	
+
+
+
 	/*
 	 * HERE WE ADD A REQUEST TO DATABASE
 	 */
@@ -297,80 +268,68 @@ private function add_note_request() {
 		$user_id = $user->id;
 
 		$database->execute("
-				INSERT INTO note_request
-				(image_id, user_id, date)
-				VALUES
-				(?, ?, now())",
+				INSERT INTO note_request (image_id, user_id, date)
+				VALUES (?, ?, now())",
 				array($image_id, $user_id));
 
 		$resultID = $database->get_last_insert_id('note_request_id_seq');
 
-		log_info("notes", "Note requested {$requestID} by {$user->name}");
+		log_info("notes", "Note requested {$resultID} by {$user->name}");
 	}
-	
-	
-	
+
+
+
 	/*
 	* HERE WE EDIT THE NOTE
 	*/
-	private function update_note()
-	{
-		$imageID = int_escape($_POST["image_id"]);
-		$noteID  = int_escape($_POST["note_id"]);
-		$noteX1 = int_escape($_POST["note_x1"]);
-		$noteY1 = int_escape($_POST["note_y1"]);
-		$noteHeight = int_escape($_POST["note_height"]);
-		$noteWidth = int_escape($_POST["note_width"]);
-		$noteText = sql_escape(html_escape($_POST["note_text"]));
+	private function update_note() {
+		global $database;
+
+		$note = array(
+			"noteX1"     => int_escape($_POST["note_x1"]),
+			"noteY1"     => int_escape($_POST["note_y1"]),
+			"noteHeight" => int_escape($_POST["note_height"]),
+			"noteWidth"  => int_escape($_POST["note_width"]),
+			"noteText"   => sql_escape(html_escape($_POST["note_text"])),
+			"imageID"    => int_escape($_POST["image_id"]),
+			"noteID"     => int_escape($_POST["note_id"])
+		);
 
 		// validate parameters
-		if (is_null($imageID)    || !is_numeric($imageID)        ||
-			is_null($noteID)     || !is_numeric($noteID)         ||
-			is_null($noteX1)     || !is_numeric($noteX1)         ||
-			is_null($noteY1)     || !is_numeric($noteY1)         ||
-			is_null($noteHeight) || !is_numeric($noteHeight)     ||
-			is_null($noteWidth)  || !is_numeric($noteWidth)      ||
-			is_null($noteText)   || strlen($noteText) == 0)
-		{
+		if (array_search(NULL, $note)|| strlen($note['noteText']) == 0) {
 			return;
 		}
 
-		global $database;
 		$database->execute("UPDATE notes ".
-			"SET x1 = ?, ".
-			"y1 = ?, ".
-			"height = ?, ".
-			"width = ?,".
-			"note = ? ".
-			"WHERE image_id = ? AND id = ?", array($noteX1, $noteY1, $noteHeight, $noteWidth, $noteText, $imageID, $noteID));
-			
-		$this->add_history(1, $noteID, $imageID, $noteX1, $noteY1, $noteHeight, $noteWidth, $noteText);
+		                   "SET x1 = ?, ".
+		                   "y1 = ?, ".
+		                   "height = ?, ".
+		                   "width = ?,".
+		                   "note = ? ".
+		                   "WHERE image_id = ? AND id = ?", array_values($note));
+
+		$this->add_history(1, $note['noteID'], $note['imageID'], $note['noteX1'], $note['noteY1'], $note['noteHeight'], $note['noteWidth'], $note['noteText']);
 	}
 
 
 	/*
 	* HERE WE DELETE THE NOTE
 	*/
-	private function delete_note()
-	{
-		global $user;
+	private function delete_note() {
+		global $user, $database;
 
 		$imageID = int_escape($_POST["image_id"]);
 		$noteID = int_escape($_POST["note_id"]);
 
 		// validate parameters
-		if( is_null($imageID) || !is_numeric($imageID) ||
-			is_null($noteID)  || !is_numeric($noteID))
-		{
+		if(is_null($imageID) || !is_numeric($imageID) || is_null($noteID)  || !is_numeric($noteID)) {
 			return;
 		}
 
-		global $database;
-		
 		$database->execute("UPDATE notes ".
-			"SET enable = ? ".
-			"WHERE image_id = ? AND id = ?", array(0, $imageID, $noteID));
-		
+		                   "SET enable = ? ".
+		                   "WHERE image_id = ? AND id = ?", array(0, $imageID, $noteID));
+
 		log_info("notes", "Note deleted {$noteID} by {$user->name}");
 	}
 
@@ -385,9 +344,9 @@ private function nuke_notes() {
 		$database->execute("DELETE FROM notes WHERE image_id = ?", array($image_id));
 		log_info("notes", "Notes deleted from {$image_id} by {$user->name}");
 	}
-	
-	
-	
+
+
+
 	/*
 	* HERE WE DELETE ALL REQUESTS FOR IMAGE
 	*/
@@ -408,35 +367,28 @@ private function get_notes_list(PageRequestEvent $event) {
 		global $database, $config;
 
 		$pageNumber = $event->get_arg(1);
-
-		if(is_null($pageNumber) || !is_numeric($pageNumber))
-		$pageNumber = 0;
-		else if ($pageNumber <= 0)
-		$pageNumber = 0;
-		else
-		$pageNumber--;
+		if(is_null($pageNumber) || !is_numeric($pageNumber) || $pageNumber <= 0) {
+			$pageNumber = 0;
+		} else {
+			$pageNumber--;
+		}
 
 		$notesPerPage = $config->get_int('notesNotesPerPage');
-	
+
 		//$result = $database->get_all("SELECT * FROM pool_images WHERE pool_id=?", array($poolID));
+		$result = $database->execute("SELECT DISTINCT image_id".
+		                             "FROM notes ".
+		                             "WHERE enable = ? ".
+		                             "ORDER BY date DESC LIMIT ?, ?",
+		                             array(1, $pageNumber * $notesPerPage, $notesPerPage));
 
-		$get_notes = "
-			SELECT DISTINCT image_id ".
-			"FROM notes ".
-			"WHERE enable = ? ".
-			"ORDER BY date DESC LIMIT ?, ?";
-			
-		$result = $database->Execute($get_notes, array(1, $pageNumber * $notesPerPage, $notesPerPage));
-		
 		$totalPages = ceil($database->get_one("SELECT COUNT(DISTINCT image_id) FROM notes") / $notesPerPage);
-		
+
 		$images = array();
-		while(!$result->EOF) {
-			$image = Image::by_id($result->fields["image_id"]);
-			$images[] = array($image);
-			$result->MoveNext();
+		while($row = $result->fetch()) {
+			$images[] = array(Image::by_id($row["image_id"]));
 		}
-		
+
 		$this->theme->display_note_list($images, $pageNumber + 1, $totalPages);
 	}
 
@@ -445,60 +397,52 @@ private function get_notes_list(PageRequestEvent $event) {
 	 * @param PageRequestEvent $event
 	 */
 	private function get_notes_requests(PageRequestEvent $event) {
-		global $config;
+		global $config, $database;
 
 		$pageNumber = $event->get_arg(1);
-
-		if(is_null($pageNumber) || !is_numeric($pageNumber))
-			$pageNumber = 0;
-		else if ($pageNumber <= 0)
+		if(is_null($pageNumber) || !is_numeric($pageNumber) || $pageNumber <= 0) {
 			$pageNumber = 0;
-		else
+		} else {
 			$pageNumber--;
+		}
 
 		$requestsPerPage = $config->get_int('notesRequestsPerPage');
 
 
 		//$result = $database->get_all("SELECT * FROM pool_images WHERE pool_id=?", array($poolID));
-		global $database;
-		$get_requests = "
-			SELECT DISTINCT image_id ".
-			"FROM note_request ".
-			"ORDER BY date DESC LIMIT ?, ?";
-			
-		$result = $database->Execute($get_requests, array($pageNumber * $requestsPerPage, $requestsPerPage));
-		
+
+
+		$result = $database->execute("
+						SELECT DISTINCT image_id
+						FROM note_request
+						ORDER BY date DESC LIMIT ?, ?",
+						array($pageNumber * $requestsPerPage, $requestsPerPage));
+
 		$totalPages = ceil($database->get_one("SELECT COUNT(*) FROM note_request") / $requestsPerPage);
-		
+
 		$images = array();
-		while(!$result->EOF) {
-			$image = Image::by_id($result->fields["image_id"]);
-			$images[] = array($image);
-			$result->MoveNext();
+		while($row = $result->fetch()) {
+			$images[] = array(Image::by_id($row["image_id"]));
 		}
-		
+
 		$this->theme->display_note_requests($images, $pageNumber + 1, $totalPages);
 	}
-	
-	
-	
+
+
+
 	/*
 	* HERE WE ADD HISTORY TO TRACK THE CHANGES OF THE NOTES FOR THE IMAGES.
 	*/
 	private function add_history($noteEnable, $noteID, $imageID, $noteX1, $noteY1, $noteHeight, $noteWidth, $noteText){
 		global $user, $database;
-		
-		$userID = $user->id;
-		
+
 		$reviewID = $database->get_one("SELECT COUNT(*) FROM note_histories WHERE note_id = ?", array($noteID));
 		$reviewID = $reviewID + 1;
-	
+
 		$database->execute("
-							INSERT INTO note_histories
-								(note_enable, note_id, review_id, image_id, user_id, user_ip, date, x1, y1, height, width, note)
-							VALUES
-								(?, ?, ?, ?, ?, ?, now(), ?, ?, ?, ?, ?)",
-							array($noteEnable, $noteID, $reviewID, $imageID, $userID, $_SERVER['REMOTE_ADDR'], $noteX1, $noteY1, $noteHeight, $noteWidth, $noteText));
+				INSERT INTO note_histories (note_enable, note_id, review_id, image_id, user_id, user_ip, date, x1, y1, height, width, note)
+				VALUES (?, ?, ?, ?, ?, ?, now(), ?, ?, ?, ?, ?)",
+				array($noteEnable, $noteID, $reviewID, $imageID, $user->id, $_SERVER['REMOTE_ADDR'], $noteX1, $noteY1, $noteHeight, $noteWidth, $noteText));
 	}
 
 
@@ -507,29 +451,27 @@ private function add_history($noteEnable, $noteID, $imageID, $noteX1, $noteY1, $
 	 * @param PageRequestEvent $event
 	 */
 	private function get_histories(PageRequestEvent $event){
+		global $config, $database;
+
 		$pageNumber = $event->get_arg(1);
-            if(is_null($pageNumber) || !is_numeric($pageNumber))
-                $pageNumber = 0;
-            else if ($pageNumber <= 0)
-                $pageNumber = 0;
-            else
-                $pageNumber--;
-
-            global $config;
-            
-		$histiriesPerPage = $config->get_int('notesHistoriesPerPage');
-		
+		if (is_null($pageNumber) || !is_numeric($pageNumber) || $pageNumber <= 0) {
+			$pageNumber = 0;
+		} else {
+			$pageNumber--;
+		}
+
+		$historiesPerPage = $config->get_int('notesHistoriesPerPage');
+
 		//ORDER BY IMAGE & DATE
-		global $database;
 		$histories = $database->get_all("SELECT h.note_id, h.review_id, h.image_id, h.date, h.note, u.name AS user_name ".
-										"FROM note_histories AS h ".
-										"INNER JOIN users AS u ".
-										"ON u.id = h.user_id ".
-										"ORDER BY date DESC LIMIT ?, ?",
-										array($pageNumber * $histiriesPerPage, $histiriesPerPage));
-		
-		$totalPages = ceil($database->get_one("SELECT COUNT(*) FROM note_histories") / $histiriesPerPage);
-		
+		                                "FROM note_histories AS h ".
+		                                "INNER JOIN users AS u ".
+		                                "ON u.id = h.user_id ".
+		                                "ORDER BY date DESC LIMIT ?, ?",
+		                                array($pageNumber * $historiesPerPage, $historiesPerPage));
+
+		$totalPages = ceil($database->get_one("SELECT COUNT(*) FROM note_histories") / $historiesPerPage);
+
 		$this->theme->display_histories($histories, $pageNumber + 1, $totalPages);
 	}
 
@@ -539,30 +481,29 @@ private function get_histories(PageRequestEvent $event){
 	 * @param PageRequestEvent $event
 	 */
 	private function get_history(PageRequestEvent $event){
+		global $config, $database;
+
 		$noteID = $event->get_arg(1);
+
 		$pageNumber = $event->get_arg(2);
-            if(is_null($pageNumber) || !is_numeric($pageNumber))
-                $pageNumber = 0;
-            else if ($pageNumber <= 0)
-                $pageNumber = 0;
-            else
-                $pageNumber--;
-
-            global $config;
-            
-		$histiriesPerPage = $config->get_int('notesHistoriesPerPage');
-		
-		global $database;
+		if (is_null($pageNumber) || !is_numeric($pageNumber) || $pageNumber <= 0) {
+			$pageNumber = 0;
+		} else {
+			$pageNumber--;
+		}
+
+		$historiesPerPage = $config->get_int('notesHistoriesPerPage');
+
 		$histories = $database->get_all("SELECT h.note_id, h.review_id, h.image_id, h.date, h.note, u.name AS user_name ".
-										"FROM note_histories AS h ".
-										"INNER JOIN users AS u ".
-										"ON u.id = h.user_id ".
-										"WHERE note_id = ? ".
-										"ORDER BY date DESC LIMIT ?, ?",
-										array($noteID, $pageNumber * $histiriesPerPage, $histiriesPerPage));
-					
-		$totalPages = ceil($database->get_one("SELECT COUNT(*) FROM note_histories WHERE note_id = ?", array($noteID)) / $histiriesPerPage);
-		
+		                                "FROM note_histories AS h ".
+		                                "INNER JOIN users AS u ".
+		                                "ON u.id = h.user_id ".
+		                                "WHERE note_id = ? ".
+		                                "ORDER BY date DESC LIMIT ?, ?",
+		                                array($noteID, $pageNumber * $historiesPerPage, $historiesPerPage));
+
+		$totalPages = ceil($database->get_one("SELECT COUNT(*) FROM note_histories WHERE note_id = ?", array($noteID)) / $historiesPerPage);
+
 		$this->theme->display_history($histories, $pageNumber + 1, $totalPages);
 	}
 
@@ -573,28 +514,23 @@ private function get_history(PageRequestEvent $event){
 	 */
 	private function revert_history($noteID, $reviewID){
 		global $database;
-		
-		$history = $database->get_row("SELECT * FROM note_histories WHERE note_id = ? AND review_id = ?",array($noteID, $reviewID));
-		
+
+		$history = $database->get_row("SELECT * FROM note_histories WHERE note_id = ? AND review_id = ?", array($noteID, $reviewID));
+
 		$noteEnable = $history['note_enable'];
-		$noteID = $history['note_id'];
-		$imageID = $history['image_id'];
-		$noteX1 = $history['x1'];
-		$noteY1 = $history['y1'];
+		$noteID     = $history['note_id'];
+		$imageID    = $history['image_id'];
+		$noteX1     = $history['x1'];
+		$noteY1     = $history['y1'];
 		$noteHeight = $history['height'];
-		$noteWidth = $history['width'];
-		$noteText = $history['note'];
-		
+		$noteWidth  = $history['width'];
+		$noteText   = $history['note'];
+
 		$database->execute("UPDATE notes ".
-						   "SET enable = ?, ".
-						   "x1 = ?, ".
-						   "y1 = ?, ".
-						   "height = ?, ".
-						   "width = ?,".
-						   "note = ? ".
-						   "WHERE image_id = ? AND id = ?", array(1, $noteX1, $noteY1, $noteHeight, $noteWidth, $noteText, $imageID, $noteID));
-								  
+		                   "SET enable = ?, x1 = ?, y1 = ?, height = ?, width = ?, note = ? ".
+		                   "WHERE image_id = ? AND id = ?",
+		                   array(1, $noteX1, $noteY1, $noteHeight, $noteWidth, $noteText, $imageID, $noteID));
+
 		$this->add_history($noteEnable, $noteID, $imageID, $noteX1, $noteY1, $noteHeight, $noteWidth, $noteText);
 	}
 }
-
diff --git a/ext/notes/theme.php b/ext/notes/theme.php
index 38e7a9684..4d792901a 100644
--- a/ext/notes/theme.php
+++ b/ext/notes/theme.php
@@ -1,7 +1,7 @@
 <?php
 class NotesTheme extends Themelet {
 	public function note_button($image_id) {
-		return '		
+		return '
 			<!-- <a href="#" id="addnotelink" >Add a note</a> -->
 			<form action="" method="">
 			<input type="button" id="addnote" value="Add Note">
@@ -30,42 +30,39 @@ public function nuke_requests_button($image_id) {
 							</form>
 						';
 	}
-	
+
 	public function search_notes_page(Page $page) { //IN DEVELOPMENT, NOT FULLY WORKING
 		$html = '<form method="GET" action="'.make_link("post/list/note=").'">
 		<input placeholder="Search Notes" type="text" name="search"/>
 		<input type="submit" style="display: none;" value="Find"/>
 		</form>';
-	
+
 		$page->set_title(html_escape("Search Note"));
 		$page->set_heading(html_escape("Search Note"));
 		$page->add_block(new Block("Search Note", $html, "main", 10));
 	}
-		
+
 	// check action POST on form
-	public function display_note_system(Page $page, $image_id, $recovered_notes, $adminOptions)
-	{
+	public function display_note_system(Page $page, $image_id, $recovered_notes, $adminOptions) {
 		$to_json = array();
-		foreach($recovered_notes as $note)
-		{
+		foreach($recovered_notes as $note) {
 			$parsedNote = $note["note"];
 			$parsedNote = str_replace("\n", "\\n", $parsedNote);
 			$parsedNote = str_replace("\r", "\\r", $parsedNote);
 
 			$to_json[] = array(
-				'x1' => $note["x1"],
-				'y1' => $note["y1"],
-				'height' => $note["height"],
-				'width' => $note["width"],
-				'note' => $parsedNote,
+				'x1'      => $note["x1"],
+				'y1'      => $note["y1"],
+				'height'  => $note["height"],
+				'width'   => $note["width"],
+				'note'    => $parsedNote,
 				'note_id' => $note["id"],
 			);
 		}
 
-		$html = "<script type='text/javascript'>";
-		$html .= "notes = " . json_encode($to_json);
-		$html .= "</script>
-	
+		$html = "<script type='text/javascript'>notes = ".json_encode($to_json)."</script>";
+
+		$html .= "
 	<div id='noteform'>
 		".make_form(make_link("note/add_note"))."
 			<input type='hidden' name='image_id' value='".$image_id."' />
@@ -73,7 +70,7 @@ public function display_note_system(Page $page, $image_id, $recovered_notes, $ad
 			<input name='note_y1' type='hidden' value='' id='NoteY1' />
 			<input name='note_height' type='hidden' value='' id='NoteHeight' />
 			<input name='note_width' type='hidden' value='' id='NoteWidth' />
-			
+
 			<table>
 				<tr>
 					<td colspan='2'>
@@ -85,7 +82,7 @@ public function display_note_system(Page $page, $image_id, $recovered_notes, $ad
 					<td><input type='button' value='Cancel' id='cancelnote' /></td>
 			  	</tr>
 			</table>
-			
+
 		</form>
 	</div>
 		<div id='noteEditForm'>
@@ -126,8 +123,8 @@ public function display_note_system(Page $page, $image_id, $recovered_notes, $ad
 
 		$page->add_block(new Block(null, $html, "main", 1));
 	}
-		
-	
+
+
 	public function display_note_list($images, $pageNumber, $totalPages) {
 		global $page;
 		$pool_images = '';
@@ -137,20 +134,21 @@ public function display_note_list($images, $pageNumber, $totalPages) {
 			$thumb_html = $this->build_thumb_html($image);
 
 			$pool_images .= '<span class="thumb">'.
-					   		'<a href="$image_link">'.$thumb_html.'</a>'.
-					   '</span>';
+			                '    <a href="$image_link">'.$thumb_html.'</a>'.
+			                '</span>';
+
 
-			
 		}
 		$this->display_paginator($page, "note/list", null, $pageNumber, $totalPages);
-		
+
 		$page->set_title("Notes");
 		$page->set_heading("Notes");
 		$page->add_block(new Block("Notes", $pool_images, "main", 20));
 	}
-	
+
 	public function display_note_requests($images, $pageNumber, $totalPages) {
 		global $page;
+
 		$pool_images = '';
 		foreach($images as $pair) {
 			$image = $pair[0];
@@ -158,13 +156,13 @@ public function display_note_requests($images, $pageNumber, $totalPages) {
 			$thumb_html = $this->build_thumb_html($image);
 
 			$pool_images .= '<span class="thumb">'.
-					   		'<a href="$image_link">'.$thumb_html.'</a>'.
-					   '</span>';
+			                '    <a href="$image_link">'.$thumb_html.'</a>'.
+			                '</span>';
+
 
-			
 		}
 		$this->display_paginator($page, "requests/list", null, $pageNumber, $totalPages);
-		
+
 		$page->set_title("Note Requests");
 		$page->set_heading("Note Requests");
 		$page->add_block(new Block("Note Requests", $pool_images, "main", 20));
@@ -174,19 +172,19 @@ private function get_history($histories) {
 		global $user;
 
 		$html = "<table id='poolsList' class='zebra'>".
-			"<thead><tr>".
-			"<th>Image</th>".
-			"<th>Note</th>".
-			"<th>Body</th>".
-			"<th>Updater</th>".
-			"<th>Date</th>";
+		        "<thead><tr>".
+		        "<th>Image</th>".
+		        "<th>Note</th>".
+		        "<th>Body</th>".
+		        "<th>Updater</th>".
+		        "<th>Date</th>";
 
 		if(!$user->is_anonymous()){
 			$html .= "<th>Action</th>";
 		}
 
 		$html .= "</tr></thead>".
-			"<tbody>";
+		         "<tbody>";
 
 		foreach($histories as $history) {
 			$image_link = "<a href='".make_link("post/view/".$history['image_id'])."'>".$history['image_id']."</a>";
@@ -195,11 +193,11 @@ private function get_history($histories) {
 			$revert_link = "<a href='".make_link("note/revert/".$history['note_id']."/".$history['review_id'])."'>Revert</a>";
 
 			$html .= "<tr>".
-				"<td>".$image_link."</td>".
-				"<td>".$history_link."</td>".
-				"<td style='text-align:left;'>".$history['note']."</td>".
-				"<td>".$user_link."</td>".
-				"<td>".autodate($history['date'])."</td>";
+			         "<td>".$image_link."</td>".
+			         "<td>".$history_link."</td>".
+			         "<td style='text-align:left;'>".$history['note']."</td>".
+			         "<td>".$user_link."</td>".
+			         "<td>".autodate($history['date'])."</td>";
 
 			if(!$user->is_anonymous()){
 				$html .= "<td>".$revert_link."</td>";
@@ -223,7 +221,7 @@ public function display_histories($histories, $pageNumber, $totalPages) {
 
 		$this->display_paginator($page, "note/updated", null, $pageNumber, $totalPages);
 	}
-	
+
 	public function display_history($histories, $pageNumber, $totalPages) {
 		global $page;
 
@@ -232,8 +230,7 @@ public function display_history($histories, $pageNumber, $totalPages) {
 		$page->set_title("Note History");
 		$page->set_heading("Note History");
 		$page->add_block(new Block("Note History", $html, "main", 10));
-		
+
 		$this->display_paginator($page, "note/updated", null, $pageNumber, $totalPages);
 	}
 }
-

From 3ebf78e25247181754a878cbf9255c2a114cb808 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Wed, 18 May 2016 14:50:38 +0100
Subject: [PATCH 082/250] make sure lib/vendor folder is cleared on composer
 update this stops old libs from still being cached by mistake

---
 composer.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/composer.json b/composer.json
index 84bb6c8cb..dfe1776ea 100644
--- a/composer.json
+++ b/composer.json
@@ -43,6 +43,13 @@
 	},
 
 	"scripts": {
+		"pre-install-cmd" : [
+			"php -r \"array_map('unlink', array_merge(glob('lib/vendor/js/*.{js,map}', GLOB_BRACE), glob('lib/vendor/css/*.css'), glob('lib/vendor/swf/*.swf')));\""
+		],
+		"pre-update-cmd" : [
+			"php -r \"array_map('unlink', array_merge(glob('lib/vendor/js/*.{js,map}', GLOB_BRACE), glob('lib/vendor/css/*.css'), glob('lib/vendor/swf/*.swf')));\""
+		],
+
 		"post-install-cmd" : [
 			"php -r \"array_map('copy', array_keys(json_decode(file_get_contents('composer.json'), TRUE)['vendor-copy']), json_decode(file_get_contents('composer.json'), TRUE)['vendor-copy']);\""
 		],

From f6e1da349b033ec62a32d1c6e782956736155024 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 19 May 2016 15:15:02 +0100
Subject: [PATCH 083/250] added composer setup instructions this assumes that
 all new releases will already have all vendor files downloaded

---
 README.markdown | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.markdown b/README.markdown
index ed7ce9e80..dd8065703 100644
--- a/README.markdown
+++ b/README.markdown
@@ -26,6 +26,7 @@ check out one of the versioned branches.
 
 # Installation
 
+0. Download the latest release under [Releases](https://github.com/shish/shimmie2/releases).
 1. Create a blank database
 2. Unzip shimmie into a folder on the web host
 3. Visit the folder with a web browser
@@ -33,6 +34,14 @@ check out one of the versioned branches.
 5. Click "install". Hopefully you'll end up at the welcome screen; if
    not, you should be given instructions on how to fix any errors~
 
+# Installation (Development)
+
+0.
+1. Install [Composer](https://getcomposer.org/). (If you don't already have it)
+2. Run `composer global require "fxp/composer-asset-plugin:~1.1" --no-plugins`. (This is installed globally due to a known composer bug)
+3. Run `composer install`
+4. Follow instructions noted in "Installation" (Excluding 0).
+
 ## Upgrade from 2.3.X
 
 1. Backup your current files and database!

From 5c3236c0ef538eb631451279493e5b6fa23fef73 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 19 May 2016 15:40:44 +0100
Subject: [PATCH 084/250] installer css is only used once, so let's just inline
 it instead

---
 install.php     | 36 ++++++++++++++++++++++++++++++++++--
 lib/shimmie.css | 33 ---------------------------------
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/install.php b/install.php
index fc76bfbd3..0306b43b9 100644
--- a/install.php
+++ b/install.php
@@ -11,7 +11,7 @@
  * Initialise the database, check that folder
  * permissions are set properly.
  *
- * This file should be independant of the database
+ * This file should be independent of the database
  * and other such things that aren't ready yet
  */
 
@@ -26,7 +26,39 @@
 	<head>
 		<title>Shimmie Installation</title>
 		<link rel="shortcut icon" href="favicon.ico" />
-		<link rel='stylesheet' href='lib/shimmie.css' type='text/css'>
+		<style>
+			#installer {
+				background: #EEE;
+				font-family: "Arial", sans-serif;
+				font-size: 14px;
+				width: 512px;
+				margin: auto;
+				margin-top: 16px;
+				border: 1px solid black;
+				border-radius: 16px;
+			}
+			#installer A {
+				text-decoration: none;
+			}
+			#installer A:hover {
+				text-decoration: underline;
+			}
+			#installer H1, #installer H3 {
+				background: #DDD;
+				text-align: center;
+				margin: 0px;
+				padding: 2px;
+			}
+			#installer H1 {
+				border-bottom: 1px solid black;
+				border-radius: 16px 16px 0px 0px;
+			}
+			#installer H3 {
+				border-bottom: 1px solid black;
+				border-top: 1px solid black;
+				margin-top: 32px;
+			}
+		</style>
 		<script type="text/javascript" src="lib/vendor/js/jquery-1.12.3.min.js"></script>
 	</head>
 	<body>
diff --git a/lib/shimmie.css b/lib/shimmie.css
index 8b3507834..813f87cac 100644
--- a/lib/shimmie.css
+++ b/lib/shimmie.css
@@ -30,36 +30,3 @@ IMG.lazy {display: none;}
 	margin: 8px;
 	border: 1px solid #882;
 }
-
-
-#installer {
-	background: #EEE;
-	font-family: "Arial", sans-serif;
-	font-size: 14px;
-	width: 512px;
-	margin: auto;
-	margin-top: 16px;
-	border: 1px solid black;
-	border-radius: 16px;
-}
-#installer A {
-	text-decoration: none;
-}
-#installer A:hover {
-	text-decoration: underline;
-}
-#installer H1, #installer H3 {
-	background: #DDD;
-	text-align: center;
-	margin: 0px;
-	padding: 2px;
-}
-#installer H1 {
-	border-bottom: 1px solid black;
-	border-radius: 16px 16px 0px 0px;
-}
-#installer H3 {
-	border-bottom: 1px solid black;
-	border-top: 1px solid black;
-	margin-top: 32px;
-}

From 394acce635f9f8d51a59c1d47559150d48b55234 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 19 May 2016 15:45:14 +0100
Subject: [PATCH 085/250] use base64 favicon to avoid being cached it's also
 unlike that ./favicon.ico will even exist yet during a new install

---
 install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.php b/install.php
index 0306b43b9..7d1c9f0fc 100644
--- a/install.php
+++ b/install.php
@@ -25,7 +25,7 @@
 <html>
 	<head>
 		<title>Shimmie Installation</title>
-		<link rel="shortcut icon" href="favicon.ico" />
+		<link rel="shortcut icon" href="data:image/x-icon;base64,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AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAREREREREREREREREREREREQAAAAAAAAAAAAAAEREREREAAQEBAQEBAQEBAAARERERAAEBAQEBAQEBAQABABEREQABAQEBAQEBAQEAAQEAEREAAQEBAQEBAQEBAAEBABERAAYGBQQDAgEBAQACAQAREQAMDAwLCwoJCQcACQgAEREAEBAQEBAQDg4MAA0NABERABAQEBAQEBAQEAAQEAAREQAQEBAQEBAQEBAAEBAAEREAAAAAAAAAAAAAABAQABEREQAQEA8QEBAQEBAAEAARERERABAQEBAQEA8QEAAAEREREREAAAAAAAAAAAAAABERERERERERERERERERERER//8AAIAPAACABwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAwAEAAOABAADwAQAA//8AAA==" />
 		<style>
 			#installer {
 				background: #EEE;

From d17de45965d017ba6c5540a560ab1e16ee202ae1 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 19 May 2016 16:07:20 +0100
Subject: [PATCH 086/250] don't use < or > to avoid showing broken comment if
 PHP isn't loaded

---
 install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.php b/install.php
index 7d1c9f0fc..c3dc4fdb1 100644
--- a/install.php
+++ b/install.php
@@ -4,7 +4,7 @@
  *
  * @package    Shimmie
  * @copyright  Copyright (c) 2007-2015, Shish et al.
- * @author     Shish <webmaster at shishnet.org>, jgen <jeffgenovy at gmail.com>
+ * @author     Shish [webmaster at shishnet.org], jgen [jeffgenovy at gmail.com]
  * @link       http://code.shishnet.org/shimmie2/
  * @license    http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
  * 

From b161bbcf1baa293c25e7f085030926d71703dbd5 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 19 May 2016 16:29:55 +0100
Subject: [PATCH 087/250] use a container div for padding + handle_db_errors
 function

---
 install.php | 229 ++++++++++++++++++++++++----------------------------
 1 file changed, 107 insertions(+), 122 deletions(-)

diff --git a/install.php b/install.php
index c3dc4fdb1..595a2e79f 100644
--- a/install.php
+++ b/install.php
@@ -37,6 +37,9 @@
 				border: 1px solid black;
 				border-radius: 16px;
 			}
+			#installer > .container {
+				padding: 5px;
+			}
 			#installer A {
 				text-decoration: none;
 			}
@@ -65,12 +68,14 @@
 <?php if(false) { ?>
 		<div id="installer">
 			<h1>Install Error</h1>
-			<p>Shimmie needs to be run via a web server with PHP support -- you
-			appear to be either opening the file from your hard disk, or your
-			web server is mis-configured and doesn't know how to handle PHP files.</p>
-			<p>If you've installed a web server on your desktop PC, you probably
-			want to visit <a href="http://localhost/">the local web server</a>.<br/><br/>
-			</p>
+			<div class="container">
+				<p>Shimmie needs to be run via a web server with PHP support -- you
+				appear to be either opening the file from your hard disk, or your
+				web server is mis-configured and doesn't know how to handle PHP files.</p>
+				<p>If you've installed a web server on your desktop PC, you probably
+				want to visit <a href="http://localhost/">the local web server</a>.<br/><br/>
+				</p>
+			</div>
 		</div>
 		<div style="display: none;">
 			<PLAINTEXT>
@@ -207,67 +212,68 @@ function ask_questions() { // {{{
 		<div id="installer">
 			<h1>Shimmie Installer</h1>
 
-			$warn_msg
-			$err_msg
-
-			<h3>Database Install</h3>
-			<form action="install.php" method="POST">
-				<center>
-					<table class='form'>
-						<tr>
-							<th>Type:</th>
-							<td><select name="database_type" id="database_type" onchange="update_qs();">
-								$db_m
-								$db_p
-								$db_s
-							</select></td>
-						</tr>
-						<tr class="dbconf mysql pgsql">
-							<th>Host:</th>
-							<td><input type="text" name="database_host" size="40" value="localhost"></td>
-						</tr>
-						<tr class="dbconf mysql pgsql">
-							<th>Username:</th>
-							<td><input type="text" name="database_user" size="40"></td>
-						</tr>
-						<tr class="dbconf mysql pgsql">
-							<th>Password:</th>
-							<td><input type="password" name="database_password" size="40"></td>
-						</tr>
-						<tr class="dbconf mysql pgsql sqlite">
-							<th>DB&nbsp;Name:</th>
-							<td><input type="text" name="database_name" size="40" value="shimmie"></td>
-						</tr>
-						<tr><td colspan="2"><input type="submit" value="Go!"></td></tr>
-					</table>
-				</center>
-				<script>
-				$(function() {
-					update_qs();
-				});
-				function update_qs() {
-					$(".dbconf").hide();
-					var seldb = $("#database_type").val() || "none";
-					$("."+seldb).show();
-				}
-				</script>
-			</form>
-
-			<h3>Help</h3>
-
-			<p class="dbconf mysql pgsql">
-				Please make sure the database you have chosen exists and is empty.<br>
-				The username provided must have access to create tables within the database.
-			</p>
-			<p class="dbconf sqlite">
-				For SQLite the database name will be a filename on disk, relative to
-				where shimmie was installed.
-			</p>
-			<p class="dbconf none">
-				Drivers can generally be downloaded with your OS package manager;
-				for Debian / Ubuntu you want php5-pgsql, php5-mysql, or php5-sqlite.
-			</p>
-
+			<div class="container">
+				$warn_msg
+				$err_msg
+
+				<h3>Database Install</h3>
+				<form action="install.php" method="POST">
+					<center>
+						<table class='form'>
+							<tr>
+								<th>Type:</th>
+								<td><select name="database_type" id="database_type" onchange="update_qs();">
+									$db_m
+									$db_p
+									$db_s
+								</select></td>
+							</tr>
+							<tr class="dbconf mysql pgsql">
+								<th>Host:</th>
+								<td><input type="text" name="database_host" size="40" value="localhost"></td>
+							</tr>
+							<tr class="dbconf mysql pgsql">
+								<th>Username:</th>
+								<td><input type="text" name="database_user" size="40"></td>
+							</tr>
+							<tr class="dbconf mysql pgsql">
+								<th>Password:</th>
+								<td><input type="password" name="database_password" size="40"></td>
+							</tr>
+							<tr class="dbconf mysql pgsql sqlite">
+								<th>DB&nbsp;Name:</th>
+								<td><input type="text" name="database_name" size="40" value="shimmie"></td>
+							</tr>
+							<tr><td colspan="2"><input type="submit" value="Go!"></td></tr>
+						</table>
+					</center>
+					<script>
+					$(function() {
+						update_qs();
+					});
+					function update_qs() {
+						$(".dbconf").hide();
+						var seldb = $("#database_type").val() || "none";
+						$("."+seldb).show();
+					}
+					</script>
+				</form>
+
+				<h3>Help</h3>
+
+				<p class="dbconf mysql pgsql">
+					Please make sure the database you have chosen exists and is empty.<br>
+					The username provided must have access to create tables within the database.
+				</p>
+				<p class="dbconf sqlite">
+					For SQLite the database name will be a filename on disk, relative to
+					where shimmie was installed.
+				</p>
+				<p class="dbconf none">
+					Drivers can generally be downloaded with your OS package manager;
+					for Debian / Ubuntu you want php5-pgsql, php5-mysql, or php5-sqlite.
+				</p>
+			</div>
 		</div>
 EOD;
 } // }}}
@@ -290,10 +296,12 @@ function create_tables() { // {{{
 			print <<<EOD
 			<div id="installer">
 				<h1>Shimmie Installer</h1>
-				<h3>Warning: The Database schema is not empty!</h3>
-				<p>Please ensure that the database you are installing Shimmie with is empty before continuing.</p>
-				<p>Once you have emptied the database of any tables, please hit 'refresh' to continue.</p>
-				<br/><br/>
+				<div class="container">
+					<h3>Warning: The Database schema is not empty!</h3>
+					<p>Please ensure that the database you are installing Shimmie with is empty before continuing.</p>
+					<p>Once you have emptied the database of any tables, please hit 'refresh' to continue.</p>
+					<br/><br/>
+				</div>
 			</div>
 EOD;
 			exit(2);
@@ -305,7 +313,7 @@ function create_tables() { // {{{
 			PRIMARY KEY (oldtag)
 		");
 		$db->execute("CREATE INDEX aliases_newtag_idx ON aliases(newtag)", array());
-		
+
 		$db->create_table("config", "
 			name VARCHAR(128) NOT NULL,
 			value TEXT,
@@ -320,7 +328,7 @@ class VARCHAR(32) NOT NULL DEFAULT 'user',
 			email VARCHAR(128)
 		");
 		$db->execute("CREATE INDEX users_name_idx ON users(name)", array());
-		
+
 		$db->create_table("images", "
 			id SCORE_AIPK,
 			owner_id INTEGER NOT NULL,
@@ -340,14 +348,14 @@ class VARCHAR(32) NOT NULL DEFAULT 'user',
 		$db->execute("CREATE INDEX images_width_idx ON images(width)", array());
 		$db->execute("CREATE INDEX images_height_idx ON images(height)", array());
 		$db->execute("CREATE INDEX images_hash_idx ON images(hash)", array());
-		
+
 		$db->create_table("tags", "
 			id SCORE_AIPK,
 			tag VARCHAR(64) UNIQUE NOT NULL,
 			count INTEGER NOT NULL DEFAULT 0
 		");
 		$db->execute("CREATE INDEX tags_tag_idx ON tags(tag)", array());
-		
+
 		$db->create_table("image_tags", "
 			image_id INTEGER NOT NULL,
 			tag_id INTEGER NOT NULL,
@@ -357,33 +365,14 @@ class VARCHAR(32) NOT NULL DEFAULT 'user',
 		");
 		$db->execute("CREATE INDEX images_tags_image_id_idx ON image_tags(image_id)", array());
 		$db->execute("CREATE INDEX images_tags_tag_id_idx ON image_tags(tag_id)", array());
-		
+
 		$db->execute("INSERT INTO config(name, value) VALUES('db_version', 11)");
 		$db->commit();
 	}
 	catch(PDOException $e) {
-		print <<<EOD
-			<div id="installer">
-				<h1>Shimmie Installer</h1>
-				<h3>Database Error:</h3>
-				<p>An error occured while trying to create the database tables necessary for Shimmie.</p>
-				<p>Please check and ensure that the database configuration options are all correct.</p>
-				<p>{$e->getMessage()}</p>
-			</div>
-EOD;
-		exit(3);
-	}
-	catch (Exception $e) {
-		print <<<EOD
-			<div id="installer">
-				<h1>Shimmie Installer</h1>
-				<h3>Unknown Error:</h3>
-				<p>An unknown error occured while trying to create the database tables necessary for Shimmie.</p>
-				<p>Please check the server log files for more information.</p>
-				<p>{$e->getMessage()}</p>
-			</div>
-EOD;
-		exit(4);
+		handle_db_errors(TRUE, "An error occurred while trying to create the database tables necessary for Shimmie.", $e->getMessage(), 3);
+	} catch (Exception $e) {
+		handle_db_errors(FALSE, "An unknown error occurred while trying to insert data into the database.", $e->getMessage(), 4);
 	}
 } // }}}
 
@@ -399,31 +388,11 @@ function insert_defaults() { // {{{
 		}
 		$db->commit();
 	}
-	catch(PDOException $e)
-	{
-		print <<<EOD
-		<div id="installer">
-			<h1>Shimmie Installer</h1>
-			<h3>Database Error:</h3>
-			<p>An error occured while trying to insert data into the database.</p>
-			<p>Please check and ensure that the database configuration options are all correct.</p>
-			<p>{$e->getMessage()}</p>
-		</div>
-EOD;
-		exit(5);
+	catch(PDOException $e) {
+		handle_db_errors(TRUE, "An error occurred while trying to insert data into the database.", $e->getMessage(), 5);
 	}
-	catch (Exception $e)
-	{
-		print <<<EOD
-		<div id="installer">
-			<h1>Shimmie Installer</h1>
-			<h3>Unknown Error:</h3>
-			<p>An unknown error occured while trying to insert data into the database.</p>
-			<p>Please check the server log files for more information.</p>
-			<p>{$e->getMessage()}</p>
-		</div>
-EOD;
-		exit(6);
+	catch (Exception $e) {
+		handle_db_errors(FALSE, "An unknown error occurred while trying to insert data into the database.", $e->getMessage(), 6);
 	}
 } // }}}
 
@@ -498,6 +467,22 @@ function write_config() { // {{{
 	}
 	echo "\n";
 } // }}}
+
+function handle_db_errors(/*bool*/ $isPDO, /*str*/ $errorMessage1,  /*str*/ $errorMessage2, /*int*/ $exitCode) {
+	$errorMessage1Extra = ($isPDO ? "Please check and ensure that the database configuration options are all correct." : "Please check the server log files for more information.");
+	print <<<EOD
+		<div id="installer">
+			<h1>Shimmie Installer</h1>
+			<div class="container">
+				<h3>Unknown Error:</h3>
+				<p>{$errorMessage1}</p>
+				<p>{$errorMessage1Extra}</p>
+				<p>{$errorMessage2}</p>
+			</div>
+		</div>
+EOD;
+	exit($exitCode);
+}
 ?>
 	</body>
 </html>

From abababc57a1de65f1defb5b98184715343e9db2e Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 19 May 2016 16:50:05 +0100
Subject: [PATCH 088/250] use <pre> instead of <plaintext> since it's been
 deprecated since HTML2 SEE:
 https://developer.mozilla.org/en-US/docs/Web/HTML/Element/plaintext

---
 install.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/install.php b/install.php
index 595a2e79f..25dd0dd1f 100644
--- a/install.php
+++ b/install.php
@@ -65,7 +65,7 @@
 		<script type="text/javascript" src="lib/vendor/js/jquery-1.12.3.min.js"></script>
 	</head>
 	<body>
-<?php if(false) { ?>
+<?php if(FALSE) { ?>
 		<div id="installer">
 			<h1>Install Error</h1>
 			<div class="container">
@@ -77,8 +77,7 @@
 				</p>
 			</div>
 		</div>
-		<div style="display: none;">
-			<PLAINTEXT>
+		<pre style="display:none">
 <?php }
 assert_options(ASSERT_ACTIVE, 1);
 assert_options(ASSERT_BAIL, 1);

From f28e78b6f0385229bd900d072c3b661c1e3f4f2c Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 19 May 2016 17:11:03 +0100
Subject: [PATCH 089/250] show install error if vendor folder does not exist
 this should help deter non-dev users from installing shimmie from the
 master/dev branches

---
 install.php | 54 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/install.php b/install.php
index 25dd0dd1f..358a2ea8c 100644
--- a/install.php
+++ b/install.php
@@ -58,8 +58,6 @@
 			}
 			#installer H3 {
 				border-bottom: 1px solid black;
-				border-top: 1px solid black;
-				margin-top: 32px;
 			}
 		</style>
 		<script type="text/javascript" src="lib/vendor/js/jquery-1.12.3.min.js"></script>
@@ -78,6 +76,18 @@
 			</div>
 		</div>
 		<pre style="display:none">
+<?php } elseif(!file_exists("vendor/")) { ?>
+		<div id="installer">
+			<h1>Install Error</h1>
+			<h3>Warning: Composer vendor folder does not exist!</h3>
+			<div class="container">
+				<p>Shimmie is unable to find the composer vendor directory.<br>
+				Have you followed the composer setup instructions found in the <a href="https://github.com/shish/shimmie2#installation-development">README</a>?</>
+
+				<p>If you are not intending to do any development with Shimmie, it is highly recommend you use one of the pre-packaged releases found on <a href="https://github.com/shish/shimmie2/releases">Github</a> instead.</p>
+			</div>
+		</div>
+		<pre style="display:none">
 <?php }
 assert_options(ASSERT_ACTIVE, 1);
 assert_options(ASSERT_BAIL, 1);
@@ -295,8 +305,8 @@ function create_tables() { // {{{
 			print <<<EOD
 			<div id="installer">
 				<h1>Shimmie Installer</h1>
+				<h3>Warning: The Database schema is not empty!</h3>
 				<div class="container">
-					<h3>Warning: The Database schema is not empty!</h3>
 					<p>Please ensure that the database you are installing Shimmie with is empty before continuing.</p>
 					<p>Once you have emptied the database of any tables, please hit 'refresh' to continue.</p>
 					<br/><br/>
@@ -416,11 +426,13 @@ function build_dirs() { // {{{
 		<div id='installer'>
 			<h1>Shimmie Installer</h1>
 			<h3>Directory Permissions Error:</h3>
-			<p>Shimmie needs to make three folders in it's directory, '<i>images</i>', '<i>thumbs</i>', and '<i>data</i>', and they need to be writable by the PHP user.</p>
-			<p>If you see this error, if probably means the folders are owned by you, and they need to be writable by the web server.</p>
-			<p>PHP reports that it is currently running as user: ".$_ENV["USER"]." (". $_SERVER["USER"] .")</p>
-			<p>Once you have created these folders and / or changed the ownership of the shimmie folder, hit 'refresh' to continue.</p>
-			<br/><br/>
+			<div class='container'>
+				<p>Shimmie needs to make three folders in it's directory, '<i>images</i>', '<i>thumbs</i>', and '<i>data</i>', and they need to be writable by the PHP user.</p>
+				<p>If you see this error, if probably means the folders are owned by you, and they need to be writable by the web server.</p>
+				<p>PHP reports that it is currently running as user: ".$_ENV["USER"]." (". $_SERVER["USER"] .")</p>
+				<p>Once you have created these folders and / or changed the ownership of the shimmie folder, hit 'refresh' to continue.</p>
+				<br/><br/>
+			</div>
 		</div>
 		";
 		exit(7);
@@ -442,7 +454,9 @@ function write_config() { // {{{
 		<div id="installer">
 			<h1>Shimmie Installer</h1>
 			<h3>Things are OK \o/</h3>
-			<p>If you aren't redirected, <a href="index.php">click here to Continue</a>.
+			<div class="container">
+				<p>If you aren't redirected, <a href="index.php">click here to Continue</a>.
+			</div>
 		</div>
 EOD;
 	}
@@ -452,15 +466,17 @@ function write_config() { // {{{
 		<div id="installer">
 			<h1>Shimmie Installer</h1>
 			<h3>File Permissions Error:</h3>
-		    The web server isn't allowed to write to the config file; please copy
-		    the text below, save it as 'data/config/shimmie.conf.php', and upload it into the shimmie
-		    folder manually. Make sure that when you save it, there is no whitespace
-		    before the "&lt;?php" or after the "?&gt;"
-
-		    <p><textarea cols="80" rows="2">$h_file_content</textarea>
-
-		    <p>Once done, <a href="index.php">click here to Continue</a>.
-			<br/><br/>
+			<div class="container">
+				The web server isn't allowed to write to the config file; please copy
+				the text below, save it as 'data/config/shimmie.conf.php', and upload it into the shimmie
+				folder manually. Make sure that when you save it, there is no whitespace
+				before the "&lt;?php" or after the "?&gt;"
+				
+				<p><textarea cols="80" rows="2">$h_file_content</textarea>
+				
+				<p>Once done, <a href="index.php">click here to Continue</a>.
+				<br/><br/>
+			</div>
 		</div>
 EOD;
 	}
@@ -472,8 +488,8 @@ function handle_db_errors(/*bool*/ $isPDO, /*str*/ $errorMessage1,  /*str*/ $err
 	print <<<EOD
 		<div id="installer">
 			<h1>Shimmie Installer</h1>
+			<h3>Unknown Error:</h3>
 			<div class="container">
-				<h3>Unknown Error:</h3>
 				<p>{$errorMessage1}</p>
 				<p>{$errorMessage1Extra}</p>
 				<p>{$errorMessage2}</p>

From 7eca12b495d8667972f94f7854c03af3dc5cc81a Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 19 May 2016 17:14:06 +0100
Subject: [PATCH 090/250] replace remove_trailing_slash with a simple rtrim

---
 install.php | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/install.php b/install.php
index 358a2ea8c..4390ff0f9 100644
--- a/install.php
+++ b/install.php
@@ -100,7 +100,7 @@
  *	__SHIMMIE_ROOT__ = '/var/www/shimmie2/'
  *
  */
-define('__SHIMMIE_ROOT__', trim(remove_trailing_slash(dirname(__FILE__))) . '/');
+define('__SHIMMIE_ROOT__', trim(rtrim(dirname(__FILE__), '/\\')) . '/');
 
 // Pull in necessary files
 require_once __SHIMMIE_ROOT__."core/util.inc.php";
@@ -114,19 +114,6 @@
 // utilities {{{
 	// TODO: Can some of these be pushed into "core/util.inc.php" ?
 
-/**
-  * Strips off any kind of slash at the end so as to normalise the path.
-  * @param string $path    Path to normalise.
-  * @return string         Path without trailing slash.
-  */
-function remove_trailing_slash($path) {
-	if ((substr($path, -1) === '/') || (substr($path, -1) === '\\')) {
-		return substr($path, 0, -1);
-	} else {
-		return $path;
-	}
-}
-
 function check_gd_version() {
 	$gdversion = 0;
 

From d42a792e8b7c00d3c6356ee66919dd81932003b0 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 19 May 2016 17:17:04 +0100
Subject: [PATCH 091/250] safe_mode was removed in php 5.4

---
 install.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/install.php b/install.php
index 4390ff0f9..4b2eda3d9 100644
--- a/install.php
+++ b/install.php
@@ -130,9 +130,8 @@ function check_gd_version() {
 }
 
 function check_im_version() {
-	if(!ini_get('safe_mode')) {
-		$convert_check = exec("convert");
-	}
+	$convert_check = exec("convert");
+
 	return (empty($convert_check) ? 0 : 1);
 }
 

From acfed13634d251a5b8f0911a284b2b21218c6182 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Thu, 19 May 2016 17:49:35 +0100
Subject: [PATCH 092/250] <font> is deprecated

---
 install.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/install.php b/install.php
index 4b2eda3d9..2db9cb12c 100644
--- a/install.php
+++ b/install.php
@@ -138,10 +138,10 @@ function check_im_version() {
 function eok($name, $value) {
 	echo "<br>$name ... ";
 	if($value) {
-		echo "<font color='green'>ok</font>\n";
+		echo "<span style='color: green'>ok</span>\n";
 	}
 	else {
-		echo "<font color='red'>failed</font>\n";
+		echo "<span style='color: green'>failed</span>\n";
 	}
 }
 // }}}
@@ -171,7 +171,7 @@ function ask_questions() { // {{{
 
 	if(check_gd_version() == 0 && check_im_version() == 0) {
 		$errors[] = "
-			No thumbnailers cound be found - install the imagemagick
+			No thumbnailers could be found - install the imagemagick
 			tools (or the PHP-GD library, of imagemagick is unavailable).
 		";
 	}

From 543600dc0edfa17ae6ffbdc789eb92eddb84a78f Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 20 May 2016 05:01:59 +0100
Subject: [PATCH 093/250] make sure main css/js files are always loaded after
 libs

---
 core/page.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/page.class.php b/core/page.class.php
index 011f70250..d5a356984 100644
--- a/core/page.class.php
+++ b/core/page.class.php
@@ -382,7 +382,7 @@ public function add_auto_html_headers() {
 			}
 			file_put_contents($css_cache_file, $css_data);
 		}
-		$this->add_html_header("<link rel='stylesheet' href='$data_href/$css_cache_file' type='text/css'>", 44);
+		$this->add_html_header("<link rel='stylesheet' href='$data_href/$css_cache_file' type='text/css'>", 100);
 
 		/*** Generate JS cache files ***/
 		$js_lib_latest = $config_latest;
@@ -415,7 +415,7 @@ public function add_auto_html_headers() {
 			}
 			file_put_contents($js_cache_file, $js_data);
 		}
-		$this->add_html_header("<script src='$data_href/$js_cache_file' type='text/javascript'></script>", 45);
+		$this->add_html_header("<script src='$data_href/$js_cache_file' type='text/javascript'></script>", 100);
 	}
 }
 

From 78c2731a1237f8f6fcc569361c411e434d4b5068 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 20 May 2016 05:24:31 +0100
Subject: [PATCH 094/250] move notes libs to ext folder, fix a few bugs it
 would be nice to take this out of beta, but it still has major issues with
 image resizing / unable to edit or delete notes

---
 .../jquery.imgareaselect-1.0.0-rc1.min.js     |   0
 .../notes/lib}/jquery.imgnotes-1.0.min.css    |   0
 .../notes/lib}/jquery.imgnotes-1.0.min.js     |   0
 {lib => ext/notes/lib}/spacer.gif             | Bin
 ext/notes/script.js                           |   3 +++
 ext/notes/style.css                           |  18 ++++++++++++++----
 ext/notes/theme.php                           |   8 +++++++-
 7 files changed, 24 insertions(+), 5 deletions(-)
 rename {lib => ext/notes/lib}/jquery.imgareaselect-1.0.0-rc1.min.js (100%)
 rename {lib => ext/notes/lib}/jquery.imgnotes-1.0.min.css (100%)
 rename {lib => ext/notes/lib}/jquery.imgnotes-1.0.min.js (100%)
 rename {lib => ext/notes/lib}/spacer.gif (100%)

diff --git a/lib/jquery.imgareaselect-1.0.0-rc1.min.js b/ext/notes/lib/jquery.imgareaselect-1.0.0-rc1.min.js
similarity index 100%
rename from lib/jquery.imgareaselect-1.0.0-rc1.min.js
rename to ext/notes/lib/jquery.imgareaselect-1.0.0-rc1.min.js
diff --git a/lib/jquery.imgnotes-1.0.min.css b/ext/notes/lib/jquery.imgnotes-1.0.min.css
similarity index 100%
rename from lib/jquery.imgnotes-1.0.min.css
rename to ext/notes/lib/jquery.imgnotes-1.0.min.css
diff --git a/lib/jquery.imgnotes-1.0.min.js b/ext/notes/lib/jquery.imgnotes-1.0.min.js
similarity index 100%
rename from lib/jquery.imgnotes-1.0.min.js
rename to ext/notes/lib/jquery.imgnotes-1.0.min.js
diff --git a/lib/spacer.gif b/ext/notes/lib/spacer.gif
similarity index 100%
rename from lib/spacer.gif
rename to ext/notes/lib/spacer.gif
diff --git a/ext/notes/script.js b/ext/notes/script.js
index 6a90f0f78..c8726e247 100644
--- a/ext/notes/script.js
+++ b/ext/notes/script.js
@@ -4,6 +4,9 @@ $(function() {
 	if(window.notes) {
 		$('#main_image').load(function(){
 			$('#main_image').imgNotes({notes: window.notes});
+
+			//Make sure notes are always shown
+			$('#main_image').off('mouseenter mouseleave');
 		});
 	}
 
diff --git a/ext/notes/style.css b/ext/notes/style.css
index 111d8971e..c4b00f4fc 100644
--- a/ext/notes/style.css
+++ b/ext/notes/style.css
@@ -1,7 +1,8 @@
 .note {
-	display: none;
-	background-color: #fffdef; 
-	border: #412a21 1px solid; 
+	display: block;
+
+	background-color: #FFE;
+	border: 1px dashed black;
 	overflow: hidden; 
 	position: absolute; 
 	z-index: 0;
@@ -74,4 +75,13 @@
 }
 
 .imgareaselect-selection {  
-}
\ No newline at end of file
+}
+
+/* Makes sure the note block is hidden */
+section#note_system {
+	height: 0;
+}
+section#note_system > .blockbody {
+	padding: 0;
+	border: 0;
+}
diff --git a/ext/notes/theme.php b/ext/notes/theme.php
index 4d792901a..ec8d7f357 100644
--- a/ext/notes/theme.php
+++ b/ext/notes/theme.php
@@ -44,6 +44,12 @@ public function search_notes_page(Page $page) { //IN DEVELOPMENT, NOT FULLY WORK
 
 	// check action POST on form
 	public function display_note_system(Page $page, $image_id, $recovered_notes, $adminOptions) {
+		$base_href = get_base_href();
+
+		$page->add_html_header("<script src='$base_href/ext/notes/lib/jquery.imgnotes-1.0.min.js' type='text/javascript'></script>");
+		$page->add_html_header("<script src='$base_href/ext/notes/lib/jquery.imgareaselect-1.0.0-rc1.min.js' type='text/javascript'></script>");
+		$page->add_html_header("<link rel='stylesheet' type='text/css' href='$base_href/ext/notes/lib/jquery.imgnotes-1.0.min.css' />");
+
 		$to_json = array();
 		foreach($recovered_notes as $note) {
 			$parsedNote = $note["note"];
@@ -121,7 +127,7 @@ public function display_note_system(Page $page, $image_id, $recovered_notes, $ad
 
 		$html .= "</div>";
 
-		$page->add_block(new Block(null, $html, "main", 1));
+		$page->add_block(new Block(null, $html, "main", 1, 'note_system'));
 	}
 
 

From 4c9bddd4960919627b33d8e095690d038e0a1212 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 20 May 2016 05:29:52 +0100
Subject: [PATCH 095/250] modernizr lib sadly this can't installed via composer
 since we'd end up getting a bunch of functions that will never be used

---
 lib/modernizr-2.7.1.min.js              | 4 ----
 lib/vendor/js/modernizr-3.3.1.custom.js | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 lib/modernizr-2.7.1.min.js
 create mode 100644 lib/vendor/js/modernizr-3.3.1.custom.js

diff --git a/lib/modernizr-2.7.1.min.js b/lib/modernizr-2.7.1.min.js
deleted file mode 100644
index 58c6829ba..000000000
--- a/lib/modernizr-2.7.1.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Modernizr 2.7.1 (Custom Build) | MIT & BSD
- * Build: http://modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-webgl-shiv-mq-cssclasses-addtest-prefixed-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
- */
-;window.Modernizr=function(a,b,c){function D(a){j.cssText=a}function E(a,b){return D(n.join(a+";")+(b||""))}function F(a,b){return typeof a===b}function G(a,b){return!!~(""+a).indexOf(b)}function H(a,b){for(var d in a){var e=a[d];if(!G(e,"-")&&j[e]!==c)return b=="pfx"?e:!0}return!1}function I(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:F(f,"function")?f.bind(d||b):f}return!1}function J(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+p.join(d+" ")+d).split(" ");return F(b,"string")||F(b,"undefined")?H(e,b):(e=(a+" "+q.join(d+" ")+d).split(" "),I(e,b,c))}function K(){e.input=function(c){for(var d=0,e=c.length;d<e;d++)u[c[d]]=c[d]in k;return u.list&&(u.list=!!b.createElement("datalist")&&!!a.HTMLDataListElement),u}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,f,h,i=a.length;d<i;d++)k.setAttribute("type",f=a[d]),e=k.type!=="text",e&&(k.value=l,k.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(f)&&k.style.WebkitAppearance!==c?(g.appendChild(k),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(k,null).WebkitAppearance!=="textfield"&&k.offsetHeight!==0,g.removeChild(k)):/^(search|tel)$/.test(f)||(/^(url|email)$/.test(f)?e=k.checkValidity&&k.checkValidity()===!1:e=k.value!=l)),t[a[d]]=!!e;return t}("search tel url email datetime date month week time datetime-local number range color".split(" "))}var d="2.7.1",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k=b.createElement("input"),l=":)",m={}.toString,n=" -webkit- -moz- -o- -ms- ".split(" "),o="Webkit Moz O ms",p=o.split(" "),q=o.toLowerCase().split(" "),r={svg:"http://www.w3.org/2000/svg"},s={},t={},u={},v=[],w=v.slice,x,y=function(a,c,d,e){var f,i,j,k,l=b.createElement("div"),m=b.body,n=m||b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:h+(d+1),l.appendChild(j);return f=["&#173;",'<style id="s',h,'">',a,"</style>"].join(""),l.id=h,(m?l:n).innerHTML+=f,n.appendChild(l),m||(n.style.background="",n.style.overflow="hidden",k=g.style.overflow,g.style.overflow="hidden",g.appendChild(n)),i=c(l,a),m?l.parentNode.removeChild(l):(n.parentNode.removeChild(n),g.style.overflow=k),!!i},z=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return y("@media "+b+" { #"+h+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},A=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;return f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=F(e[d],"function"),F(e[d],"undefined")||(e[d]=c),e.removeAttribute(d))),e=null,f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),B={}.hasOwnProperty,C;!F(B,"undefined")&&!F(B.call,"undefined")?C=function(a,b){return B.call(a,b)}:C=function(a,b){return b in a&&F(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=w.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(w.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(w.call(arguments)))};return e}),s.flexbox=function(){return J("flexWrap")},s.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},s.canvastext=function(){return!!e.canvas&&!!F(b.createElement("canvas").getContext("2d").fillText,"function")},s.webgl=function(){return!!a.WebGLRenderingContext},s.touch=function(){var c;return"ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch?c=!0:y(["@media (",n.join("touch-enabled),("),h,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(a){c=a.offsetTop===9}),c},s.geolocation=function(){return"geolocation"in navigator},s.postmessage=function(){return!!a.postMessage},s.websqldatabase=function(){return!!a.openDatabase},s.indexedDB=function(){return!!J("indexedDB",a)},s.hashchange=function(){return A("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},s.history=function(){return!!a.history&&!!history.pushState},s.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},s.websockets=function(){return"WebSocket"in a||"MozWebSocket"in a},s.rgba=function(){return D("background-color:rgba(150,255,150,.5)"),G(j.backgroundColor,"rgba")},s.hsla=function(){return D("background-color:hsla(120,40%,100%,.5)"),G(j.backgroundColor,"rgba")||G(j.backgroundColor,"hsla")},s.multiplebgs=function(){return D("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(j.background)},s.backgroundsize=function(){return J("backgroundSize")},s.borderimage=function(){return J("borderImage")},s.borderradius=function(){return J("borderRadius")},s.boxshadow=function(){return J("boxShadow")},s.textshadow=function(){return b.createElement("div").style.textShadow===""},s.opacity=function(){return E("opacity:.55"),/^0.55$/.test(j.opacity)},s.cssanimations=function(){return J("animationName")},s.csscolumns=function(){return J("columnCount")},s.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return D((a+"-webkit- ".split(" ").join(b+a)+n.join(c+a)).slice(0,-a.length)),G(j.backgroundImage,"gradient")},s.cssreflections=function(){return J("boxReflect")},s.csstransforms=function(){return!!J("transform")},s.csstransforms3d=function(){var a=!!J("perspective");return a&&"webkitPerspective"in g.style&&y("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(b,c){a=b.offsetLeft===9&&b.offsetHeight===3}),a},s.csstransitions=function(){return J("transition")},s.fontface=function(){var a;return y('@font-face {font-family:"font";src:url("https://")}',function(c,d){var e=b.getElementById("smodernizr"),f=e.sheet||e.styleSheet,g=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"";a=/src/i.test(g)&&g.indexOf(d.split(" ")[0])===0}),a},s.generatedcontent=function(){var a;return y(["#",h,"{font:0/0 a}#",h,':after{content:"',l,'";visibility:hidden;font:3px/1 a}'].join(""),function(b){a=b.offsetHeight>=3}),a},s.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),c.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}catch(d){}return c},s.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),c.mp3=a.canPlayType("audio/mpeg;").replace(/^no$/,""),c.wav=a.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),c.m4a=(a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")).replace(/^no$/,"")}catch(d){}return c},s.localstorage=function(){try{return localStorage.setItem(h,h),localStorage.removeItem(h),!0}catch(a){return!1}},s.sessionstorage=function(){try{return sessionStorage.setItem(h,h),sessionStorage.removeItem(h),!0}catch(a){return!1}},s.webworkers=function(){return!!a.Worker},s.applicationcache=function(){return!!a.applicationCache},s.svg=function(){return!!b.createElementNS&&!!b.createElementNS(r.svg,"svg").createSVGRect},s.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="<svg/>",(a.firstChild&&a.firstChild.namespaceURI)==r.svg},s.smil=function(){return!!b.createElementNS&&/SVGAnimate/.test(m.call(b.createElementNS(r.svg,"animate")))},s.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.test(m.call(b.createElementNS(r.svg,"clipPath")))};for(var L in s)C(s,L)&&(x=L.toLowerCase(),e[x]=s[L](),v.push((e[x]?"":"no-")+x));return e.input||K(),e.addTest=function(a,b){if(typeof a=="object")for(var d in a)C(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},D(""),i=k=null,function(a,b){function l(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function m(){var a=s.elements;return typeof a=="string"?a.split(" "):a}function n(a){var b=j[a[h]];return b||(b={},i++,a[h]=i,j[i]=b),b}function o(a,c,d){c||(c=b);if(k)return c.createElement(a);d||(d=n(c));var g;return d.cache[a]?g=d.cache[a].cloneNode():f.test(a)?g=(d.cache[a]=d.createElem(a)).cloneNode():g=d.createElem(a),g.canHaveChildren&&!e.test(a)&&!g.tagUrn?d.frag.appendChild(g):g}function p(a,c){a||(a=b);if(k)return a.createDocumentFragment();c=c||n(a);var d=c.frag.cloneNode(),e=0,f=m(),g=f.length;for(;e<g;e++)d.createElement(f[e]);return d}function q(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return s.shivMethods?o(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(s,b.frag)}function r(a){a||(a=b);var c=n(a);return s.shivCSS&&!g&&!c.hasCSS&&(c.hasCSS=!!l(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),k||q(a,c),a}var c="3.7.0",d=a.html5||{},e=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,f=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,g,h="_html5shiv",i=0,j={},k;(function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",g="hidden"in a,k=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){g=!0,k=!0}})();var s={elements:d.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:c,shivCSS:d.shivCSS!==!1,supportsUnknownElements:k,shivMethods:d.shivMethods!==!1,type:"default",shivDocument:r,createElement:o,createDocumentFragment:p};a.html5=s,r(b)}(this,b),e._version=d,e._prefixes=n,e._domPrefixes=q,e._cssomPrefixes=p,e.mq=z,e.hasEvent=A,e.testProp=function(a){return H([a])},e.testAllProps=J,e.testStyles=y,e.prefixed=function(a,b,c){return b?J(a,b,c):J(a,"pfx")},g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+v.join(" "):""),e}(this,this.document),function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,h){var i=b(a),j=i.autoCallback;i.url.split(".").pop().split("?").shift(),i.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]),i.instead?i.instead(a,e,f,g,h):(y[i.url]?i.noexec=!0:y[i.url]=1,f.load(i.url,i.forceCSS||!i.forceJS&&"css"==i.url.split(".").pop().split("?").shift()?"c":c,i.noexec,i.attrs,i.timeout),(d(e)||d(j))&&f.load(function(){k(),e&&e(i.origUrl,h,g),j&&j(i.origUrl,h,g),y[i.url]=2})))}function h(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var i,j,l=this.yepnope.loader;if(e(a))g(a,0,l,0);else if(w(a))for(i=0;i<a.length;i++)j=a[i],e(j)?g(j,0,l,0):w(j)?B(j):Object(j)===j&&h(j,l);else Object(a)===a&&h(a,l)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,null==b.readyState&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}}(this,document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
diff --git a/lib/vendor/js/modernizr-3.3.1.custom.js b/lib/vendor/js/modernizr-3.3.1.custom.js
new file mode 100644
index 000000000..f5e084df4
--- /dev/null
+++ b/lib/vendor/js/modernizr-3.3.1.custom.js
@@ -0,0 +1,3 @@
+/*! modernizr 3.3.1 (Custom Build) | MIT *
+ * https://modernizr.com/download/?-applicationcache-audio-backgroundsize-borderimage-borderradius-boxshadow-canvas-canvastext-cssanimations-csscolumns-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-flexbox-fontface-generatedcontent-hashchange-history-hsla-indexeddb-inlinesvg-input-inputtypes-localstorage-multiplebgs-opacity-postmessage-rgba-sessionstorage-smil-svg-svgclippaths-textshadow-video-webgl-websockets-websqldatabase-addtest-mq-setclasses-shiv !*/
+!function(e,t,n){function r(e,t){return typeof e===t}function a(){var e,t,n,a,o,i,s;for(var c in x)if(x.hasOwnProperty(c)){if(e=[],t=x[c],t.name&&(e.push(t.name.toLowerCase()),t.options&&t.options.aliases&&t.options.aliases.length))for(n=0;n<t.options.aliases.length;n++)e.push(t.options.aliases[n].toLowerCase());for(a=r(t.fn,"function")?t.fn():t.fn,o=0;o<e.length;o++)i=e[o],s=i.split("."),1===s.length?Modernizr[s[0]]=a:(!Modernizr[s[0]]||Modernizr[s[0]]instanceof Boolean||(Modernizr[s[0]]=new Boolean(Modernizr[s[0]])),Modernizr[s[0]][s[1]]=a),b.push((a?"":"no-")+s.join("-"))}}function o(e){var t=C.className,n=Modernizr._config.classPrefix||"";if(E&&(t=t.baseVal),Modernizr._config.enableJSClass){var r=new RegExp("(^|\\s)"+n+"no-js(\\s|$)");t=t.replace(r,"$1"+n+"js$2")}Modernizr._config.enableClasses&&(t+=" "+n+e.join(" "+n),E?C.className.baseVal=t:C.className=t)}function i(e,t){if("object"==typeof e)for(var n in e)k(e,n)&&i(n,e[n]);else{e=e.toLowerCase();var r=e.split("."),a=Modernizr[r[0]];if(2==r.length&&(a=a[r[1]]),"undefined"!=typeof a)return Modernizr;t="function"==typeof t?t():t,1==r.length?Modernizr[r[0]]=t:(!Modernizr[r[0]]||Modernizr[r[0]]instanceof Boolean||(Modernizr[r[0]]=new Boolean(Modernizr[r[0]])),Modernizr[r[0]][r[1]]=t),o([(t&&0!=t?"":"no-")+r.join("-")]),Modernizr._trigger(e,t)}return Modernizr}function s(){return"function"!=typeof t.createElement?t.createElement(arguments[0]):E?t.createElementNS.call(t,"http://www.w3.org/2000/svg",arguments[0]):t.createElement.apply(t,arguments)}function c(e,t){return!!~(""+e).indexOf(t)}function l(){var e=t.body;return e||(e=s(E?"svg":"body"),e.fake=!0),e}function d(e,n,r,a){var o,i,c,d,u="modernizr",f=s("div"),p=l();if(parseInt(r,10))for(;r--;)c=s("div"),c.id=a?a[r]:u+(r+1),f.appendChild(c);return o=s("style"),o.type="text/css",o.id="s"+u,(p.fake?p:f).appendChild(o),p.appendChild(f),o.styleSheet?o.styleSheet.cssText=e:o.appendChild(t.createTextNode(e)),f.id=u,p.fake&&(p.style.background="",p.style.overflow="hidden",d=C.style.overflow,C.style.overflow="hidden",C.appendChild(p)),i=n(f,e),p.fake?(p.parentNode.removeChild(p),C.style.overflow=d,C.offsetHeight):f.parentNode.removeChild(f),!!i}function u(e){return e.replace(/([a-z])-([a-z])/g,function(e,t,n){return t+n.toUpperCase()}).replace(/^-/,"")}function f(e,t){return function(){return e.apply(t,arguments)}}function p(e,t,n){var a;for(var o in e)if(e[o]in t)return n===!1?e[o]:(a=t[e[o]],r(a,"function")?f(a,n||t):a);return!1}function m(e){return e.replace(/([A-Z])/g,function(e,t){return"-"+t.toLowerCase()}).replace(/^ms-/,"-ms-")}function h(t,r){var a=t.length;if("CSS"in e&&"supports"in e.CSS){for(;a--;)if(e.CSS.supports(m(t[a]),r))return!0;return!1}if("CSSSupportsRule"in e){for(var o=[];a--;)o.push("("+m(t[a])+":"+r+")");return o=o.join(" or "),d("@supports ("+o+") { #modernizr { position: absolute; } }",function(e){return"absolute"==getComputedStyle(e,null).position})}return n}function g(e,t,a,o){function i(){d&&(delete H.style,delete H.modElem)}if(o=r(o,"undefined")?!1:o,!r(a,"undefined")){var l=h(e,a);if(!r(l,"undefined"))return l}for(var d,f,p,m,g,v=["modernizr","tspan","samp"];!H.style&&v.length;)d=!0,H.modElem=s(v.shift()),H.style=H.modElem.style;for(p=e.length,f=0;p>f;f++)if(m=e[f],g=H.style[m],c(m,"-")&&(m=u(m)),H.style[m]!==n){if(o||r(a,"undefined"))return i(),"pfx"==t?m:!0;try{H.style[m]=a}catch(y){}if(H.style[m]!=g)return i(),"pfx"==t?m:!0}return i(),!1}function v(e,t,n,a,o){var i=e.charAt(0).toUpperCase()+e.slice(1),s=(e+" "+D.join(i+" ")+i).split(" ");return r(t,"string")||r(t,"undefined")?g(s,t,a,o):(s=(e+" "+V.join(i+" ")+i).split(" "),p(s,t,n))}function y(e,t,r){return v(e,n,n,t,r)}var b=[],x=[],T={_version:"3.3.1",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,t){var n=this;setTimeout(function(){t(n[e])},0)},addTest:function(e,t,n){x.push({name:e,fn:t,options:n})},addAsyncTest:function(e){x.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=T,Modernizr=new Modernizr,Modernizr.addTest("applicationcache","applicationCache"in e),Modernizr.addTest("history",function(){var t=navigator.userAgent;return-1===t.indexOf("Android 2.")&&-1===t.indexOf("Android 4.0")||-1===t.indexOf("Mobile Safari")||-1!==t.indexOf("Chrome")||-1!==t.indexOf("Windows Phone")?e.history&&"pushState"in e.history:!1}),Modernizr.addTest("postmessage","postMessage"in e),Modernizr.addTest("svg",!!t.createElementNS&&!!t.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect);var w=!1;try{w="WebSocket"in e&&2===e.WebSocket.CLOSING}catch(S){}Modernizr.addTest("websockets",w),Modernizr.addTest("localstorage",function(){var e="modernizr";try{return localStorage.setItem(e,e),localStorage.removeItem(e),!0}catch(t){return!1}}),Modernizr.addTest("sessionstorage",function(){var e="modernizr";try{return sessionStorage.setItem(e,e),sessionStorage.removeItem(e),!0}catch(t){return!1}}),Modernizr.addTest("websqldatabase","openDatabase"in e);var C=t.documentElement,E="svg"===C.nodeName.toLowerCase();E||!function(e,t){function n(e,t){var n=e.createElement("p"),r=e.getElementsByTagName("head")[0]||e.documentElement;return n.innerHTML="x<style>"+t+"</style>",r.insertBefore(n.lastChild,r.firstChild)}function r(){var e=b.elements;return"string"==typeof e?e.split(" "):e}function a(e,t){var n=b.elements;"string"!=typeof n&&(n=n.join(" ")),"string"!=typeof e&&(e=e.join(" ")),b.elements=n+" "+e,l(t)}function o(e){var t=y[e[g]];return t||(t={},v++,e[g]=v,y[v]=t),t}function i(e,n,r){if(n||(n=t),u)return n.createElement(e);r||(r=o(n));var a;return a=r.cache[e]?r.cache[e].cloneNode():h.test(e)?(r.cache[e]=r.createElem(e)).cloneNode():r.createElem(e),!a.canHaveChildren||m.test(e)||a.tagUrn?a:r.frag.appendChild(a)}function s(e,n){if(e||(e=t),u)return e.createDocumentFragment();n=n||o(e);for(var a=n.frag.cloneNode(),i=0,s=r(),c=s.length;c>i;i++)a.createElement(s[i]);return a}function c(e,t){t.cache||(t.cache={},t.createElem=e.createElement,t.createFrag=e.createDocumentFragment,t.frag=t.createFrag()),e.createElement=function(n){return b.shivMethods?i(n,e,t):t.createElem(n)},e.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+r().join().replace(/[\w\-:]+/g,function(e){return t.createElem(e),t.frag.createElement(e),'c("'+e+'")'})+");return n}")(b,t.frag)}function l(e){e||(e=t);var r=o(e);return!b.shivCSS||d||r.hasCSS||(r.hasCSS=!!n(e,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),u||c(e,r),e}var d,u,f="3.7.3",p=e.html5||{},m=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,h=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,g="_html5shiv",v=0,y={};!function(){try{var e=t.createElement("a");e.innerHTML="<xyz></xyz>",d="hidden"in e,u=1==e.childNodes.length||function(){t.createElement("a");var e=t.createDocumentFragment();return"undefined"==typeof e.cloneNode||"undefined"==typeof e.createDocumentFragment||"undefined"==typeof e.createElement}()}catch(n){d=!0,u=!0}}();var b={elements:p.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:f,shivCSS:p.shivCSS!==!1,supportsUnknownElements:u,shivMethods:p.shivMethods!==!1,type:"default",shivDocument:l,createElement:i,createDocumentFragment:s,addElements:a};e.html5=b,l(t),"object"==typeof module&&module.exports&&(module.exports=b)}("undefined"!=typeof e?e:this,t);var k;!function(){var e={}.hasOwnProperty;k=r(e,"undefined")||r(e.call,"undefined")?function(e,t){return t in e&&r(e.constructor.prototype[t],"undefined")}:function(t,n){return e.call(t,n)}}(),T._l={},T.on=function(e,t){this._l[e]||(this._l[e]=[]),this._l[e].push(t),Modernizr.hasOwnProperty(e)&&setTimeout(function(){Modernizr._trigger(e,Modernizr[e])},0)},T._trigger=function(e,t){if(this._l[e]){var n=this._l[e];setTimeout(function(){var e,r;for(e=0;e<n.length;e++)(r=n[e])(t)},0),delete this._l[e]}},Modernizr._q.push(function(){T.addTest=i}),Modernizr.addTest("audio",function(){var e=s("audio"),t=!1;try{(t=!!e.canPlayType)&&(t=new Boolean(t),t.ogg=e.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),t.mp3=e.canPlayType('audio/mpeg; codecs="mp3"').replace(/^no$/,""),t.opus=e.canPlayType('audio/ogg; codecs="opus"')||e.canPlayType('audio/webm; codecs="opus"').replace(/^no$/,""),t.wav=e.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),t.m4a=(e.canPlayType("audio/x-m4a;")||e.canPlayType("audio/aac;")).replace(/^no$/,""))}catch(n){}return t}),Modernizr.addTest("canvas",function(){var e=s("canvas");return!(!e.getContext||!e.getContext("2d"))}),Modernizr.addTest("canvastext",function(){return Modernizr.canvas===!1?!1:"function"==typeof s("canvas").getContext("2d").fillText}),Modernizr.addTest("video",function(){var e=s("video"),t=!1;try{(t=!!e.canPlayType)&&(t=new Boolean(t),t.ogg=e.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),t.h264=e.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),t.webm=e.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,""),t.vp9=e.canPlayType('video/webm; codecs="vp9"').replace(/^no$/,""),t.hls=e.canPlayType('application/x-mpegURL; codecs="avc1.42E01E"').replace(/^no$/,""))}catch(n){}return t}),Modernizr.addTest("webgl",function(){var t=s("canvas"),n="probablySupportsContext"in t?"probablySupportsContext":"supportsContext";return n in t?t[n]("webgl")||t[n]("experimental-webgl"):"WebGLRenderingContext"in e}),Modernizr.addTest("multiplebgs",function(){var e=s("a").style;return e.cssText="background:url(https://),url(https://),red url(https://)",/(url\s*\(.*?){3}/.test(e.background)}),Modernizr.addTest("rgba",function(){var e=s("a").style;return e.cssText="background-color:rgba(150,255,150,.5)",(""+e.backgroundColor).indexOf("rgba")>-1}),Modernizr.addTest("inlinesvg",function(){var e=s("div");return e.innerHTML="<svg/>","http://www.w3.org/2000/svg"==("undefined"!=typeof SVGRect&&e.firstChild&&e.firstChild.namespaceURI)});var _=function(){function e(e,t){var a;return e?(t&&"string"!=typeof t||(t=s(t||"div")),e="on"+e,a=e in t,!a&&r&&(t.setAttribute||(t=s("div")),t.setAttribute(e,""),a="function"==typeof t[e],t[e]!==n&&(t[e]=n),t.removeAttribute(e)),a):!1}var r=!("onblur"in t.documentElement);return e}();T.hasEvent=_,Modernizr.addTest("hashchange",function(){return _("hashchange",e)===!1?!1:t.documentMode===n||t.documentMode>7});var P=s("input"),N="autocomplete autofocus list placeholder max min multiple pattern required step".split(" "),z={};Modernizr.input=function(t){for(var n=0,r=t.length;r>n;n++)z[t[n]]=!!(t[n]in P);return z.list&&(z.list=!(!s("datalist")||!e.HTMLDataListElement)),z}(N);var R="search tel url email datetime date month week time datetime-local number range color".split(" "),$={};Modernizr.inputtypes=function(e){for(var r,a,o,i=e.length,s="1)",c=0;i>c;c++)P.setAttribute("type",r=e[c]),o="text"!==P.type&&"style"in P,o&&(P.value=s,P.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(r)&&P.style.WebkitAppearance!==n?(C.appendChild(P),a=t.defaultView,o=a.getComputedStyle&&"textfield"!==a.getComputedStyle(P,null).WebkitAppearance&&0!==P.offsetHeight,C.removeChild(P)):/^(search|tel)$/.test(r)||(o=/^(url|email)$/.test(r)?P.checkValidity&&P.checkValidity()===!1:P.value!=s)),$[e[c]]=!!o;return $}(R);var A=T._config.usePrefixes?" -webkit- -moz- -o- -ms- ".split(" "):["",""];T._prefixes=A,Modernizr.addTest("cssgradients",function(){for(var e,t="background-image:",n="gradient(linear,left top,right bottom,from(#9f9),to(white));",r="",a=0,o=A.length-1;o>a;a++)e=0===a?"to ":"",r+=t+A[a]+"linear-gradient("+e+"left top, #9f9, white);";Modernizr._config.usePrefixes&&(r+=t+"-webkit-"+n);var i=s("a"),c=i.style;return c.cssText=r,(""+c.backgroundImage).indexOf("gradient")>-1}),Modernizr.addTest("opacity",function(){var e=s("a").style;return e.cssText=A.join("opacity:.55;"),/^0.55$/.test(e.opacity)}),Modernizr.addTest("hsla",function(){var e=s("a").style;return e.cssText="background-color:hsla(120,40%,100%,.5)",c(e.backgroundColor,"rgba")||c(e.backgroundColor,"hsla")});var O="CSS"in e&&"supports"in e.CSS,L="supportsCSS"in e;Modernizr.addTest("supports",O||L);var M={}.toString;Modernizr.addTest("svgclippaths",function(){return!!t.createElementNS&&/SVGClipPath/.test(M.call(t.createElementNS("http://www.w3.org/2000/svg","clipPath")))}),Modernizr.addTest("smil",function(){return!!t.createElementNS&&/SVGAnimate/.test(M.call(t.createElementNS("http://www.w3.org/2000/svg","animate")))});var B=function(){var t=e.matchMedia||e.msMatchMedia;return t?function(e){var n=t(e);return n&&n.matches||!1}:function(t){var n=!1;return d("@media "+t+" { #modernizr { position: absolute; } }",function(t){n="absolute"==(e.getComputedStyle?e.getComputedStyle(t,null):t.currentStyle).position}),n}}();T.mq=B;var j=T.testStyles=d;j('#modernizr{font:0/0 a}#modernizr:after{content:":)";visibility:hidden;font:7px/1 a}',function(e){Modernizr.addTest("generatedcontent",e.offsetHeight>=7)});var F=function(){var e=navigator.userAgent,t=e.match(/applewebkit\/([0-9]+)/gi)&&parseFloat(RegExp.$1),n=e.match(/w(eb)?osbrowser/gi),r=e.match(/windows phone/gi)&&e.match(/iemobile\/([0-9])+/gi)&&parseFloat(RegExp.$1)>=9,a=533>t&&e.match(/android/gi);return n||a||r}();F?Modernizr.addTest("fontface",!1):j('@font-face {font-family:"font";src:url("https://")}',function(e,n){var r=t.getElementById("smodernizr"),a=r.sheet||r.styleSheet,o=a?a.cssRules&&a.cssRules[0]?a.cssRules[0].cssText:a.cssText||"":"",i=/src/i.test(o)&&0===o.indexOf(n.split(" ")[0]);Modernizr.addTest("fontface",i)});var I="Moz O ms Webkit",D=T._config.usePrefixes?I.split(" "):[];T._cssomPrefixes=D;var q=function(t){var r,a=A.length,o=e.CSSRule;if("undefined"==typeof o)return n;if(!t)return!1;if(t=t.replace(/^@/,""),r=t.replace(/-/g,"_").toUpperCase()+"_RULE",r in o)return"@"+t;for(var i=0;a>i;i++){var s=A[i],c=s.toUpperCase()+"_"+r;if(c in o)return"@-"+s.toLowerCase()+"-"+t}return!1};T.atRule=q;var V=T._config.usePrefixes?I.toLowerCase().split(" "):[];T._domPrefixes=V;var W={elem:s("modernizr")};Modernizr._q.push(function(){delete W.elem});var H={style:W.elem.style};Modernizr._q.unshift(function(){delete H.style});var U=T.testProp=function(e,t,r){return g([e],n,t,r)};Modernizr.addTest("textshadow",U("textShadow","1px 1px")),T.testAllProps=v;var G,J=T.prefixed=function(e,t,n){return 0===e.indexOf("@")?q(e):(-1!=e.indexOf("-")&&(e=u(e)),t?v(e,t,n):v(e,"pfx"))};try{G=J("indexedDB",e)}catch(S){}Modernizr.addTest("indexeddb",!!G),G&&Modernizr.addTest("indexeddb.deletedatabase","deleteDatabase"in G),T.testAllProps=y,Modernizr.addTest("cssanimations",y("animationName","a",!0)),Modernizr.addTest("backgroundsize",y("backgroundSize","100%",!0)),Modernizr.addTest("borderimage",y("borderImage","url() 1",!0)),Modernizr.addTest("borderradius",y("borderRadius","0px",!0)),Modernizr.addTest("boxshadow",y("boxShadow","1px 1px",!0)),Modernizr.addTest("flexbox",y("flexBasis","1px",!0)),function(){Modernizr.addTest("csscolumns",function(){var e=!1,t=y("columnCount");try{(e=!!t)&&(e=new Boolean(e))}catch(n){}return e});for(var e,t,n=["Width","Span","Fill","Gap","Rule","RuleColor","RuleStyle","RuleWidth","BreakBefore","BreakAfter","BreakInside"],r=0;r<n.length;r++)e=n[r].toLowerCase(),t=y("column"+n[r]),("breakbefore"===e||"breakafter"===e||"breakinside"==e)&&(t=t||y(n[r])),Modernizr.addTest("csscolumns."+e,t)}(),Modernizr.addTest("cssreflections",y("boxReflect","above",!0)),Modernizr.addTest("csstransforms3d",function(){var e=!!y("perspective","1px",!0),t=Modernizr._config.usePrefixes;if(e&&(!t||"webkitPerspective"in C.style)){var n,r="#modernizr{width:0;height:0}";Modernizr.supports?n="@supports (perspective: 1px)":(n="@media (transform-3d)",t&&(n+=",(-webkit-transform-3d)")),n+="{#modernizr{width:7px;height:18px;margin:0;padding:0;border:0}}",j(r+n,function(t){e=7===t.offsetWidth&&18===t.offsetHeight})}return e}),Modernizr.addTest("csstransforms",function(){return-1===navigator.userAgent.indexOf("Android 2.")&&y("transform","scale(1)",!0)}),Modernizr.addTest("csstransitions",y("transition","all",!0)),a(),o(b),delete T.addTest,delete T.addAsyncTest;for(var Z=0;Z<Modernizr._q.length;Z++)Modernizr._q[Z]();e.Modernizr=Modernizr}(window,document);
\ No newline at end of file

From 861862a3e10c4d43cb85336b330e1a7669d056eb Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 20 May 2016 05:39:01 +0100
Subject: [PATCH 096/250] password compat lib is now autoloaded with composer

---
 composer.json       |   9 +-
 core/user.class.php |   1 -
 lib/password.php    | 279 --------------------------------------------
 3 files changed, 5 insertions(+), 284 deletions(-)
 delete mode 100644 lib/password.php

diff --git a/composer.json b/composer.json
index dfe1776ea..df58c9e3f 100644
--- a/composer.json
+++ b/composer.json
@@ -21,10 +21,11 @@
 	"require" : {
 		"php" : ">=5.4.8",
 
-		"flexihash/flexihash" : "^2.0.0",
-		"ifixit/php-akismet"  : "1.*",
-		"google/recaptcha"    : "~1.1",
-		"dapphp/securimage"   : "3.6.*",
+		"flexihash/flexihash"       : "^2.0.0",
+		"ifixit/php-akismet"        : "1.*",
+		"google/recaptcha"          : "~1.1",
+		"dapphp/securimage"         : "3.6.*",
+		"ircmaxell/password-compat" : "1.0.4",
 
 		"bower-asset/jquery"         : "1.12.3",
 		"bower-asset/jquery-timeago" : "1.5.2",
diff --git a/core/user.class.php b/core/user.class.php
index 531456333..6d73c5c00 100644
--- a/core/user.class.php
+++ b/core/user.class.php
@@ -1,5 +1,4 @@
 <?php
-require_once "lib/password.php";
 
 /** @private */
 function _new_user($row) {
diff --git a/lib/password.php b/lib/password.php
deleted file mode 100644
index e8ec02885..000000000
--- a/lib/password.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-/**
- * A Compatibility library with PHP 5.5's simplified password hashing API.
- *
- * @author Anthony Ferrara <ircmaxell@php.net>
- * @license http://www.opensource.org/licenses/mit-license.html MIT License
- * @copyright 2012 The Authors
- */
-
-namespace {
-
-if (!defined('PASSWORD_DEFAULT')) {
-
-    define('PASSWORD_BCRYPT', 1);
-    define('PASSWORD_DEFAULT', PASSWORD_BCRYPT);
-
-    /**
-     * Hash the password using the specified algorithm
-     *
-     * @param string $password The password to hash
-     * @param int    $algo     The algorithm to use (Defined by PASSWORD_* constants)
-     * @param array  $options  The options for the algorithm to use
-     *
-     * @return string|false The hashed password, or false on error.
-     */
-    function password_hash($password, $algo, array $options = array()) {
-        if (!function_exists('crypt')) {
-            trigger_error("Crypt must be loaded for password_hash to function", E_USER_WARNING);
-            return null;
-        }
-        if (!is_string($password)) {
-            trigger_error("password_hash(): Password must be a string", E_USER_WARNING);
-            return null;
-        }
-        if (!is_int($algo)) {
-            trigger_error("password_hash() expects parameter 2 to be long, " . gettype($algo) . " given", E_USER_WARNING);
-            return null;
-        }
-        $resultLength = 0;
-        switch ($algo) {
-            case PASSWORD_BCRYPT:
-                // Note that this is a C constant, but not exposed to PHP, so we don't define it here.
-                $cost = 10;
-                if (isset($options['cost'])) {
-                    $cost = $options['cost'];
-                    if ($cost < 4 || $cost > 31) {
-                        trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
-                        return null;
-                    }
-                }
-                // The length of salt to generate
-                $raw_salt_len = 16;
-                // The length required in the final serialization
-                $required_salt_len = 22;
-                $hash_format = sprintf("$2y$%02d$", $cost);
-                // The expected length of the final crypt() output
-                $resultLength = 60;
-                break;
-            default:
-                trigger_error(sprintf("password_hash(): Unknown password hashing algorithm: %s", $algo), E_USER_WARNING);
-                return null;
-        }
-        $salt_requires_encoding = false;
-        if (isset($options['salt'])) {
-            switch (gettype($options['salt'])) {
-                case 'NULL':
-                case 'boolean':
-                case 'integer':
-                case 'double':
-                case 'string':
-                    $salt = (string) $options['salt'];
-                    break;
-                case 'object':
-                    if (method_exists($options['salt'], '__tostring')) {
-                        $salt = (string) $options['salt'];
-                        break;
-                    }
-                case 'array':
-                case 'resource':
-                default:
-                    trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING);
-                    return null;
-            }
-            if (PasswordCompat\binary\_strlen($salt) < $required_salt_len) {
-                trigger_error(sprintf("password_hash(): Provided salt is too short: %d expecting %d", PasswordCompat\binary\_strlen($salt), $required_salt_len), E_USER_WARNING);
-                return null;
-            } elseif (0 == preg_match('#^[a-zA-Z0-9./]+$#D', $salt)) {
-                $salt_requires_encoding = true;
-            }
-        } else {
-            $buffer = '';
-            $buffer_valid = false;
-            if (function_exists('mcrypt_create_iv') && !defined('PHALANGER')) {
-                $buffer = mcrypt_create_iv($raw_salt_len, MCRYPT_DEV_URANDOM);
-                if ($buffer) {
-                    $buffer_valid = true;
-                }
-            }
-            if (!$buffer_valid && function_exists('openssl_random_pseudo_bytes')) {
-                $buffer = openssl_random_pseudo_bytes($raw_salt_len);
-                if ($buffer) {
-                    $buffer_valid = true;
-                }
-            }
-            if (!$buffer_valid && @is_readable('/dev/urandom')) {
-                $f = fopen('/dev/urandom', 'r');
-                $read = PasswordCompat\binary\_strlen($buffer);
-                while ($read < $raw_salt_len) {
-                    $buffer .= fread($f, $raw_salt_len - $read);
-                    $read = PasswordCompat\binary\_strlen($buffer);
-                }
-                fclose($f);
-                if ($read >= $raw_salt_len) {
-                    $buffer_valid = true;
-                }
-            }
-            if (!$buffer_valid || PasswordCompat\binary\_strlen($buffer) < $raw_salt_len) {
-                $bl = PasswordCompat\binary\_strlen($buffer);
-                for ($i = 0; $i < $raw_salt_len; $i++) {
-                    if ($i < $bl) {
-                        $buffer[$i] = $buffer[$i] ^ chr(mt_rand(0, 255));
-                    } else {
-                        $buffer .= chr(mt_rand(0, 255));
-                    }
-                }
-            }
-            $salt = $buffer;
-            $salt_requires_encoding = true;
-        }
-        if ($salt_requires_encoding) {
-            // encode string with the Base64 variant used by crypt
-            $base64_digits =
-                'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-            $bcrypt64_digits =
-                './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-
-            $base64_string = base64_encode($salt);
-            $salt = strtr(rtrim($base64_string, '='), $base64_digits, $bcrypt64_digits);
-        }
-        $salt = PasswordCompat\binary\_substr($salt, 0, $required_salt_len);
-
-        $hash = $hash_format . $salt;
-
-        $ret = crypt($password, $hash);
-
-        if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != $resultLength) {
-            return false;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Get information about the password hash. Returns an array of the information
-     * that was used to generate the password hash.
-     *
-     * array(
-     *    'algo' => 1,
-     *    'algoName' => 'bcrypt',
-     *    'options' => array(
-     *        'cost' => 10,
-     *    ),
-     * )
-     *
-     * @param string $hash The password hash to extract info from
-     *
-     * @return array The array of information about the hash.
-     */
-    function password_get_info($hash) {
-        $return = array(
-            'algo' => 0,
-            'algoName' => 'unknown',
-            'options' => array(),
-        );
-        if (PasswordCompat\binary\_substr($hash, 0, 4) == '$2y$' && PasswordCompat\binary\_strlen($hash) == 60) {
-            $return['algo'] = PASSWORD_BCRYPT;
-            $return['algoName'] = 'bcrypt';
-            list($cost) = sscanf($hash, "$2y$%d$");
-            $return['options']['cost'] = $cost;
-        }
-        return $return;
-    }
-
-    /**
-     * Determine if the password hash needs to be rehashed according to the options provided
-     *
-     * If the answer is true, after validating the password using password_verify, rehash it.
-     *
-     * @param string $hash    The hash to test
-     * @param int    $algo    The algorithm used for new password hashes
-     * @param array  $options The options array passed to password_hash
-     *
-     * @return boolean True if the password needs to be rehashed.
-     */
-    function password_needs_rehash($hash, $algo, array $options = array()) {
-        $info = password_get_info($hash);
-        if ($info['algo'] != $algo) {
-            return true;
-        }
-        switch ($algo) {
-            case PASSWORD_BCRYPT:
-                $cost = isset($options['cost']) ? $options['cost'] : 10;
-                if ($cost != $info['options']['cost']) {
-                    return true;
-                }
-                break;
-        }
-        return false;
-    }
-
-    /**
-     * Verify a password against a hash using a timing attack resistant approach
-     *
-     * @param string $password The password to verify
-     * @param string $hash     The hash to verify against
-     *
-     * @return boolean If the password matches the hash
-     */
-    function password_verify($password, $hash) {
-        if (!function_exists('crypt')) {
-            trigger_error("Crypt must be loaded for password_verify to function", E_USER_WARNING);
-            return false;
-        }
-        $ret = crypt($password, $hash);
-        if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != PasswordCompat\binary\_strlen($hash) || PasswordCompat\binary\_strlen($ret) <= 13) {
-            return false;
-        }
-
-        $status = 0;
-        for ($i = 0; $i < PasswordCompat\binary\_strlen($ret); $i++) {
-            $status |= (ord($ret[$i]) ^ ord($hash[$i]));
-        }
-
-        return $status === 0;
-    }
-}
-
-}
-
-namespace PasswordCompat\binary {
-    /**
-     * Count the number of bytes in a string
-     *
-     * We cannot simply use strlen() for this, because it might be overwritten by the mbstring extension.
-     * In this case, strlen() will count the number of *characters* based on the internal encoding. A
-     * sequence of bytes might be regarded as a single multibyte character.
-     *
-     * @param string $binary_string The input string
-     *
-     * @internal
-     * @return int The number of bytes
-     */
-    function _strlen($binary_string) {
-           if (function_exists('mb_strlen')) {
-               return mb_strlen($binary_string, '8bit');
-           }
-           return strlen($binary_string);
-    }
-
-    /**
-     * Get a substring based on byte limits
-     *
-     * @see _strlen()
-     *
-     * @param string $binary_string The input string
-     * @param int    $start
-     * @param int    $length
-     *
-     * @internal
-     * @return string The substring
-     */
-    function _substr($binary_string, $start, $length) {
-       if (function_exists('mb_substr')) {
-           return mb_substr($binary_string, $start, $length, '8bit');
-       }
-       return substr($binary_string, $start, $length);
-   }
-
-}

From d73b6275eb19283d565c0ed95cd130580793a231 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 20 May 2016 05:39:14 +0100
Subject: [PATCH 097/250] leftover gif from old lib

---
 lib/indicator.gif | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 lib/indicator.gif

diff --git a/lib/indicator.gif b/lib/indicator.gif
deleted file mode 100644
index e69de29bb..000000000

From 60dd9eeb908c88e494ecf77d047aa1dbc1b5e717 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 20 May 2016 05:39:38 +0100
Subject: [PATCH 098/250] temp solution to avoid removing modernizr lib

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index df58c9e3f..3bcd42188 100644
--- a/composer.json
+++ b/composer.json
@@ -45,10 +45,10 @@
 
 	"scripts": {
 		"pre-install-cmd" : [
-			"php -r \"array_map('unlink', array_merge(glob('lib/vendor/js/*.{js,map}', GLOB_BRACE), glob('lib/vendor/css/*.css'), glob('lib/vendor/swf/*.swf')));\""
+			"php -r \"array_map('unlink', array_merge(glob('lib/vendor/js/j*.{js,map}', GLOB_BRACE), glob('lib/vendor/css/*.css'), glob('lib/vendor/swf/*.swf')));\""
 		],
 		"pre-update-cmd" : [
-			"php -r \"array_map('unlink', array_merge(glob('lib/vendor/js/*.{js,map}', GLOB_BRACE), glob('lib/vendor/css/*.css'), glob('lib/vendor/swf/*.swf')));\""
+			"php -r \"array_map('unlink', array_merge(glob('lib/vendor/js/j*.{js,map}', GLOB_BRACE), glob('lib/vendor/css/*.css'), glob('lib/vendor/swf/*.swf')));\""
 		],
 
 		"post-install-cmd" : [

From 4e163a3027c7a76d7ba49b1cbcc7612741cbd5b5 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 20 May 2016 05:43:58 +0100
Subject: [PATCH 099/250] check against 7.0 rather than nightly (since 7.0 is
 out now)

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 549af4385..4c2934ed2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ php:
 - 5.4
 - 5.5
 - 5.6
-- nightly
+- 7.0
 
 env:
   matrix:

From 4aa6278a58cdc6f102b2ac4fd2b178b5beaa29c7 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 20 May 2016 05:44:29 +0100
Subject: [PATCH 100/250] indent

---
 .travis.yml | 56 ++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4c2934ed2..d5078bee9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,42 +2,42 @@ language: php
 sudo: false
 
 php:
-- 5.4
-- 5.5
-- 5.6
-- 7.0
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
 
 env:
   matrix:
-  - DB=mysql
-  - DB=pgsql
-  - DB=sqlite
+    - DB=mysql
+    - DB=pgsql
+    - DB=sqlite
 
 install:
-- mkdir -p data/config
-- if [[ "$DB" == "pgsql" ]]; then psql -c "SELECT set_config('log_statement', 'all', false);" -U postgres; fi
-- if [[ "$DB" == "pgsql" ]]; then psql -c "CREATE DATABASE shimmie;" -U postgres; fi
-- if [[ "$DB" == "pgsql" ]]; then echo '<?php define("DATABASE_DSN", "pgsql:user=postgres;password=;host=;dbname=shimmie");' > data/config/auto_install.conf.php ; fi
-- if [[ "$DB" == "mysql" ]]; then mysql -e "SET GLOBAL general_log = 'ON';" -uroot; fi
-- if [[ "$DB" == "mysql" ]]; then mysql -e "CREATE DATABASE shimmie;" -uroot; fi
-- if [[ "$DB" == "mysql" ]]; then echo '<?php define("DATABASE_DSN", "mysql:user=root;password=;host=localhost;dbname=shimmie");' > data/config/auto_install.conf.php ; fi
-- if [[ "$DB" == "sqlite" ]]; then echo '<?php define("DATABASE_DSN", "sqlite:shimmie.sqlite");' > data/config/auto_install.conf.php ; fi
-- wget https://scrutinizer-ci.com/ocular.phar
+  - mkdir -p data/config
+  - if [[ "$DB" == "pgsql" ]]; then psql -c "SELECT set_config('log_statement', 'all', false);" -U postgres; fi
+  - if [[ "$DB" == "pgsql" ]]; then psql -c "CREATE DATABASE shimmie;" -U postgres; fi
+  - if [[ "$DB" == "pgsql" ]]; then echo '<?php define("DATABASE_DSN", "pgsql:user=postgres;password=;host=;dbname=shimmie");' > data/config/auto_install.conf.php ; fi
+  - if [[ "$DB" == "mysql" ]]; then mysql -e "SET GLOBAL general_log = 'ON';" -uroot; fi
+  - if [[ "$DB" == "mysql" ]]; then mysql -e "CREATE DATABASE shimmie;" -uroot; fi
+  - if [[ "$DB" == "mysql" ]]; then echo '<?php define("DATABASE_DSN", "mysql:user=root;password=;host=localhost;dbname=shimmie");' > data/config/auto_install.conf.php ; fi
+  - if [[ "$DB" == "sqlite" ]]; then echo '<?php define("DATABASE_DSN", "sqlite:shimmie.sqlite");' > data/config/auto_install.conf.php ; fi
+  - wget https://scrutinizer-ci.com/ocular.phar
 
 script:
-- php install.php
-- phpunit --configuration tests/phpunit.xml --coverage-clover=data/coverage.clover
+  - php install.php
+  - phpunit --configuration tests/phpunit.xml --coverage-clover=data/coverage.clover
 
 after_failure:
-- head -n 100 data/config/*
-- ls /var/run/mysql*
-- ls /var/log/*mysql*
-- cat /var/log/mysql.err
-- cat /var/log/mysql.log
-- cat /var/log/mysql/error.log
-- cat /var/log/mysql/slow.log
-- ls /var/log/postgresql
-- cat /var/log/postgresql/postgresql*
+  - head -n 100 data/config/*
+  - ls /var/run/mysql*
+  - ls /var/log/*mysql*
+  - cat /var/log/mysql.err
+  - cat /var/log/mysql.log
+  - cat /var/log/mysql/error.log
+  - cat /var/log/mysql/slow.log
+  - ls /var/log/postgresql
+  - cat /var/log/postgresql/postgresql*
 
 after_script:
-- php ocular.phar code-coverage:upload --format=php-clover data/coverage.clover
+  - php ocular.phar code-coverage:upload --format=php-clover data/coverage.clover

From 7673769621c46b95876553208448cc38937f4751 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 20 May 2016 05:49:26 +0100
Subject: [PATCH 101/250] composer install + moving some stuff about

---
 .travis.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d5078bee9..421c92954 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,27 @@
 language: php
-sudo: false
-
 php:
   - 5.4
   - 5.5
   - 5.6
   - 7.0
 
+sudo: false
+
 env:
   matrix:
     - DB=mysql
     - DB=pgsql
     - DB=sqlite
 
+cache:
+  directories:
+    - vendor
+    - $HOME/.composer/cache
+
+before_install:
+  - travis_retry composer self-update && composer --version #travis is bad at updating composer
+  - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
+
 install:
   - mkdir -p data/config
   - if [[ "$DB" == "pgsql" ]]; then psql -c "SELECT set_config('log_statement', 'all', false);" -U postgres; fi
@@ -22,10 +31,10 @@ install:
   - if [[ "$DB" == "mysql" ]]; then mysql -e "CREATE DATABASE shimmie;" -uroot; fi
   - if [[ "$DB" == "mysql" ]]; then echo '<?php define("DATABASE_DSN", "mysql:user=root;password=;host=localhost;dbname=shimmie");' > data/config/auto_install.conf.php ; fi
   - if [[ "$DB" == "sqlite" ]]; then echo '<?php define("DATABASE_DSN", "sqlite:shimmie.sqlite");' > data/config/auto_install.conf.php ; fi
-  - wget https://scrutinizer-ci.com/ocular.phar
+  - composer install
+  - php install.php
 
 script:
-  - php install.php
   - phpunit --configuration tests/phpunit.xml --coverage-clover=data/coverage.clover
 
 after_failure:
@@ -40,4 +49,5 @@ after_failure:
   - cat /var/log/postgresql/postgresql*
 
 after_script:
+  - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover data/coverage.clover

From f3d56f581004889d320ec0640bc8f6758c656e0e Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 20 May 2016 05:52:29 +0100
Subject: [PATCH 102/250] fix README

---
 README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index dd8065703..c9125d9dd 100644
--- a/README.markdown
+++ b/README.markdown
@@ -36,7 +36,7 @@ check out one of the versioned branches.
 
 # Installation (Development)
 
-0.
+0. Download the shimmie via the "Download Zip" button.
 1. Install [Composer](https://getcomposer.org/). (If you don't already have it)
 2. Run `composer global require "fxp/composer-asset-plugin:~1.1" --no-plugins`. (This is installed globally due to a known composer bug)
 3. Run `composer install`

From 9ed10799423cf4ba9101b84a83aff0c299ff8e58 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 20 May 2016 05:53:04 +0100
Subject: [PATCH 103/250] asset-plugin needs to be installed..

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 421c92954..7c83238fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,7 @@ install:
   - if [[ "$DB" == "mysql" ]]; then mysql -e "CREATE DATABASE shimmie;" -uroot; fi
   - if [[ "$DB" == "mysql" ]]; then echo '<?php define("DATABASE_DSN", "mysql:user=root;password=;host=localhost;dbname=shimmie");' > data/config/auto_install.conf.php ; fi
   - if [[ "$DB" == "sqlite" ]]; then echo '<?php define("DATABASE_DSN", "sqlite:shimmie.sqlite");' > data/config/auto_install.conf.php ; fi
+  - composer global require "fxp/composer-asset-plugin:~1.1" --no-plugins
   - composer install
   - php install.php
 

From 7f4e96240b0dba002beddfddd03e11bec1c925b5 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Jun 2016 06:42:52 +0100
Subject: [PATCH 104/250] throw error if vendor/ doesn't exist

---
 index.php | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/index.php b/index.php
index 76f4f8bb6..eff7317bc 100644
--- a/index.php
+++ b/index.php
@@ -48,6 +48,43 @@
 	exit;
 }
 
+if(!file_exists("vendor/")) {
+	//CHECK: Should we just point to install.php instead? Seems unsafe though.
+	print <<<EOD
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>Shimmie Error</title>
+		<link rel="shortcut icon" href="data:image/x-icon;base64,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AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAREREREREREREREREREREREQAAAAAAAAAAAAAAEREREREAAQEBAQEBAQEBAAARERERAAEBAQEBAQEBAQABABEREQABAQEBAQEBAQEAAQEAEREAAQEBAQEBAQEBAAEBABERAAYGBQQDAgEBAQACAQAREQAMDAwLCwoJCQcACQgAEREAEBAQEBAQDg4MAA0NABERABAQEBAQEBAQEAAQEAAREQAQEBAQEBAQEBAAEBAAEREAAAAAAAAAAAAAABAQABEREQAQEA8QEBAQEBAAEAARERERABAQEBAQEA8QEAAAEREREREAAAAAAAAAAAAAABERERERERERERERERERERER//8AAIAPAACABwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAwAEAAOABAADwAQAA//8AAA==" />
+		<style>
+			#installer { background: #EEE; font-family: "Arial", sans-serif; font-size: 14px; width: 512px; margin: auto; margin-top: 16px; border: 1px solid black; border-radius: 16px; }
+			#installer > .container { padding: 5px; }
+			#installer A { text-decoration: none; }
+			#installer A:hover { text-decoration: underline; }
+			#installer H1, #installer H3 { background: #DDD; text-align: center; margin: 0px; padding: 2px; }
+			#installer H1 { border-bottom: 1px solid black; border-radius: 16px 16px 0px 0px; }
+			#installer H3 { border-bottom: 1px solid black; }
+		</style>
+	</head>
+	<body>
+		<div id="installer">
+			<h1>Install Error</h1>
+			<h3>Warning: Composer vendor folder does not exist!</h3>
+			<div class="container">
+				<p>Shimmie is unable to find the composer vendor directory.<br>
+				Have you followed the composer setup instructions found in the <a href="https://github.com/shish/shimmie2#installation-development">README</a>?</>
+
+				<p>If you are not intending to do any development with Shimmie, it is highly recommend you use one of the pre-packaged releases found on <a href="https://github.com/shish/shimmie2/releases">Github</a> instead.</p>
+			</div>
+		</div>
+	</body>
+</html>
+EOD;
+	http_response_code(500);
+	exit;
+}
+
 try {
 	require_once "core/_bootstrap.inc.php";
 	ctx_log_start(@$_SERVER["REQUEST_URI"], true, true);

From 09aaf72e5aa89f44a1fe9c2face176a745def3d1 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 22 May 2016 19:40:19 +0100
Subject: [PATCH 105/250] vendor/swf should have a .gitkeep

---
 lib/vendor/swf/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 lib/vendor/swf/.gitkeep

diff --git a/lib/vendor/swf/.gitkeep b/lib/vendor/swf/.gitkeep
new file mode 100644
index 000000000..e69de29bb

From 1db62901becab4dc329ece9343ffb5f8c02f5c00 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Jun 2016 07:41:59 +0100
Subject: [PATCH 106/250] disallow spaces in tags

---
 ext/autocomplete/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/autocomplete/theme.php b/ext/autocomplete/theme.php
index e99935bfc..f05569286 100644
--- a/ext/autocomplete/theme.php
+++ b/ext/autocomplete/theme.php
@@ -51,7 +51,7 @@ public function build_autocomplete(Page $page) {
 				$('.ui-autocomplete-input').keydown(function(e) {
 					var keyCode = e.keyCode || e.which;
 
-					if (keyCode == 9) {
+					if (keyCode == 9 || keyCode == 32) {
 						e.preventDefault();
 
 						var tag = $('.tagit-autocomplete:not([style*=\"display: none\"]) > li:first').text();

From a9e3ef26be179c32f3039c5ff1efa8c89f06b1ba Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Jun 2016 08:06:59 +0100
Subject: [PATCH 107/250] space should always create new tag

---
 ext/autocomplete/theme.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ext/autocomplete/theme.php b/ext/autocomplete/theme.php
index f05569286..3b5a4af5c 100644
--- a/ext/autocomplete/theme.php
+++ b/ext/autocomplete/theme.php
@@ -51,13 +51,20 @@ public function build_autocomplete(Page $page) {
 				$('.ui-autocomplete-input').keydown(function(e) {
 					var keyCode = e.keyCode || e.which;
 
-					if (keyCode == 9 || keyCode == 32) {
+					//Stop tags containing space.
+					if(keyCode == 32) {
 						e.preventDefault();
 
-						var tag = $('.tagit-autocomplete:not([style*=\"display: none\"]) > li:first').text();
+						$('[name=search]').tagit('createTag', $(this).val());
+						$(this).autocomplete('close');
+					} else if (keyCode == 9) {
+						e.preventDefault();
+
+						var tag = $('.tagit-autocomplete[style*=\"display: block\"] > li:first').text();
 						if(tag){
 							$('[name=search]').tagit('createTag', tag);
 							$('.ui-autocomplete-input').autocomplete('close');
+							$('.ui-autocomplete-input').val(''); //If tag already exists, make sure to remove duplicate.
 						}
 					}
 				});

From 029e6def94b666fa63b0f3aef0bb21146ce2c990 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 18 Jun 2016 11:21:54 +0100
Subject: [PATCH 108/250] remove excess whitespace

---
 ext/notes/main.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ext/notes/main.php b/ext/notes/main.php
index 397432264..b1706c031 100644
--- a/ext/notes/main.php
+++ b/ext/notes/main.php
@@ -1,4 +1,3 @@
-
 <?php
 /**
  * Name: [Beta] Notes

From b6e181efb13f03008ca421fb389bb21a46f549a8 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Jun 2016 11:24:18 +0100
Subject: [PATCH 109/250] excess whitespace

---
 ext/notes/main.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ext/notes/main.php b/ext/notes/main.php
index 397432264..b1706c031 100644
--- a/ext/notes/main.php
+++ b/ext/notes/main.php
@@ -1,4 +1,3 @@
-
 <?php
 /**
  * Name: [Beta] Notes

From c59995c80779d15681b48e19d6f2e6fe2fa6031e Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Jun 2016 11:47:04 +0100
Subject: [PATCH 110/250] search button can sometimes be on same line as input

---
 ext/autocomplete/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/autocomplete/style.css b/ext/autocomplete/style.css
index 582af0023..019bb7fdf 100644
--- a/ext/autocomplete/style.css
+++ b/ext/autocomplete/style.css
@@ -2,7 +2,7 @@
 
 .tagit { background: white !important; border: 1px solid grey !important; cursor: text; }
 .tagit-choice { cursor: initial; }
-input[name=search] ~ input[type=submit] { display: block !important; }
+input[name=search] ~ input[type=submit] { display: inline-block !important; }
 
 .tag-negative { background: #ff8080 !important; }
 .tag-positive { background: #40bf40 !important; }
\ No newline at end of file

From 559a4c7e4000693d65a7715a0af4064c81ce9c29 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Jun 2016 11:58:41 +0100
Subject: [PATCH 111/250] move autocomplete js to script.js so it's cached

---
 ext/autocomplete/script.js | 58 +++++++++++++++++++++++++++++++++++
 ext/autocomplete/theme.php | 63 +-------------------------------------
 2 files changed, 59 insertions(+), 62 deletions(-)
 create mode 100644 ext/autocomplete/script.js

diff --git a/ext/autocomplete/script.js b/ext/autocomplete/script.js
new file mode 100644
index 000000000..b2f263849
--- /dev/null
+++ b/ext/autocomplete/script.js
@@ -0,0 +1,58 @@
+$(function(){
+	$('[name=search]').tagit({
+		singleFieldDelimiter: ' ',
+		beforeTagAdded: function(event, ui) {
+			// give special class to negative tags
+			if(ui.tagLabel[0] === '-') {
+				ui.tag.addClass('tag-negative');
+			}else{
+				ui.tag.addClass('tag-positive');
+			}
+		},
+		autocomplete : ({
+			source: function (request, response) {
+				var isNegative = (request.term[0] === '-');
+				$.ajax({
+					url: base_href + '/api/internal/autocomplete',
+					data: {'s': (isNegative ? request.term.substring(1) : request.term)},
+					dataType : 'json',
+					type : 'GET',
+					success : function (data) {
+						response($.map(data, function (item) {
+							item = (isNegative ? '-'+item : item);
+							return {
+								label : item,
+								value : item
+							}
+						}));
+					},
+					error : function (request, status, error) {
+						alert(error);
+					}
+				});
+			},
+			minLength: 1
+		})
+	});
+
+	$('.ui-autocomplete-input').keydown(function(e) {
+		var keyCode = e.keyCode || e.which;
+
+		//Stop tags containing space.
+		if(keyCode == 32) {
+			e.preventDefault();
+
+			$('[name=search]').tagit('createTag', $(this).val());
+			$(this).autocomplete('close');
+		} else if (keyCode == 9) {
+			e.preventDefault();
+
+			var tag = $('.tagit-autocomplete[style*=\"display: block\"] > li:first').text();
+			if(tag){
+				$('[name=search]').tagit('createTag', tag);
+				$('.ui-autocomplete-input').autocomplete('close');
+				$('.ui-autocomplete-input').val(''); //If tag already exists, make sure to remove duplicate.
+			}
+		}
+	});
+});
\ No newline at end of file
diff --git a/ext/autocomplete/theme.php b/ext/autocomplete/theme.php
index 3b5a4af5c..462d2bfd1 100644
--- a/ext/autocomplete/theme.php
+++ b/ext/autocomplete/theme.php
@@ -7,68 +7,7 @@ public function build_autocomplete(Page $page) {
 
 		$page->add_html_header("<script src='$base_href/ext/autocomplete/lib/jquery-ui.min.js' type='text/javascript'></script>");
 		$page->add_html_header("<script src='$base_href/ext/autocomplete/lib/tag-it.min.js' type='text/javascript'></script>");
-		$page->add_html_header('<link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1/themes/flick/jquery-ui.css">');
+		$page->add_html_header('<link rel="stylesheet" type="text/css" href="//ajax.googleapis.com/ajax/libs/jqueryui/1/themes/flick/jquery-ui.css">');
 		$page->add_html_header("<link rel='stylesheet' type='text/css' href='$base_href/ext/autocomplete/lib/jquery.tagit.css' />");
-
-		$page->add_html_header("<script>
-			$(function(){
-				$('[name=search]').tagit({
-					singleFieldDelimiter: ' ',
-					beforeTagAdded: function(event, ui) {
-						// give special class to negative tags
-						if(ui.tagLabel[0] === '-') {
-							ui.tag.addClass('tag-negative');
-						}else{
-							ui.tag.addClass('tag-positive');
-						}
-					},
-					autocomplete : ({
-						source: function (request, response) {
-							var isNegative = (request.term[0] === '-');
-							$.ajax({
-								url: base_href + '/api/internal/autocomplete',
-								data: {'s': (isNegative ? request.term.substring(1) : request.term)},
-								dataType : 'json',
-								type : 'GET',
-								success : function (data) {
-									response($.map(data, function (item) {
-										item = (isNegative ? '-'+item : item);
-										return {
-											label : item,
-											value : item
-										}
-									}));
-								},
-								error : function (request, status, error) {
-									alert(error);
-								}
-							});
-						},
-						minLength: 1
-					})
-				});
-
-				$('.ui-autocomplete-input').keydown(function(e) {
-					var keyCode = e.keyCode || e.which;
-
-					//Stop tags containing space.
-					if(keyCode == 32) {
-						e.preventDefault();
-
-						$('[name=search]').tagit('createTag', $(this).val());
-						$(this).autocomplete('close');
-					} else if (keyCode == 9) {
-						e.preventDefault();
-
-						var tag = $('.tagit-autocomplete[style*=\"display: block\"] > li:first').text();
-						if(tag){
-							$('[name=search]').tagit('createTag', tag);
-							$('.ui-autocomplete-input').autocomplete('close');
-							$('.ui-autocomplete-input').val(''); //If tag already exists, make sure to remove duplicate.
-						}
-					}
-				});
-			});
-		</script>");
 	}
 }

From 2a747c8f2b729a8dadc6df49370c97ce8f6e620d Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Jun 2016 12:10:37 +0100
Subject: [PATCH 112/250] move home css to style.css

---
 ext/home/style.css |  9 +++++++++
 ext/home/theme.php | 11 -----------
 2 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100644 ext/home/style.css

diff --git a/ext/home/style.css b/ext/home/style.css
new file mode 100644
index 000000000..fbf1bcf36
--- /dev/null
+++ b/ext/home/style.css
@@ -0,0 +1,9 @@
+div#front-page h1 {font-size: 4em; margin-top: 2em; margin-bottom: 0px; text-align: center; border: none; background: none; box-shadow: none; -webkit-box-shadow: none; -moz-box-shadow: none;}
+div#front-page {text-align:center;}
+.space {margin-bottom: 1em;}
+div#front-page div#links a {margin: 0 0.5em;}
+div#front-page li {list-style-type: none; margin: 0;}
+@media (max-width: 800px) {
+	div#front-page h1 {font-size: 3em; margin-top: 0.5em; margin-bottom: 0.5em;}
+	#counter {display: none;}
+}
\ No newline at end of file
diff --git a/ext/home/theme.php b/ext/home/theme.php
index 6c51c73d4..91e8ea5c5 100644
--- a/ext/home/theme.php
+++ b/ext/home/theme.php
@@ -14,17 +14,6 @@ public function display_page(Page $page, $sitename, $base_href, $theme_name, $bo
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 		$hh
 	</head>
-	<style>
-		div#front-page h1 {font-size: 4em; margin-top: 2em; margin-bottom: 0px; text-align: center; border: none; background: none; box-shadow: none; -webkit-box-shadow: none; -moz-box-shadow: none;}
-		div#front-page {text-align:center;}
-		.space {margin-bottom: 1em;}
-		div#front-page div#links a {margin: 0 0.5em;}
-		div#front-page li {list-style-type: none; margin: 0;}
-		@media (max-width: 800px) {
-			div#front-page h1 {font-size: 3em; margin-top: 0.5em; margin-bottom: 0.5em;}
-			#counter {display: none;}
-		}
-	</style>
 	<body>
 		$body
 	</body>

From 6b6e4f04b637687bbd8b0f75be671189acf60ad9 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Jun 2016 12:25:22 +0100
Subject: [PATCH 113/250] html_headers should be properly sorted

---
 ext/home/theme.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/home/theme.php b/ext/home/theme.php
index 91e8ea5c5..a833e9621 100644
--- a/ext/home/theme.php
+++ b/ext/home/theme.php
@@ -5,6 +5,7 @@ public function display_page(Page $page, $sitename, $base_href, $theme_name, $bo
 		$page->set_mode("data");
 		$hh = "";
 		$page->add_auto_html_headers();
+		ksort($page->html_headers);
 		foreach($page->html_headers as $h) {$hh .= $h;}
 		$page->set_data(<<<EOD
 <html>

From 4bd9ee1c7fb2d50e7b6b97d1cfedca38deeb1eaa Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Jun 2016 12:25:39 +0100
Subject: [PATCH 114/250] fix autocomplete search not looking correct on home
 page

---
 ext/home/style.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ext/home/style.css b/ext/home/style.css
index fbf1bcf36..dba7e8590 100644
--- a/ext/home/style.css
+++ b/ext/home/style.css
@@ -6,4 +6,8 @@ div#front-page li {list-style-type: none; margin: 0;}
 @media (max-width: 800px) {
 	div#front-page h1 {font-size: 3em; margin-top: 0.5em; margin-bottom: 0.5em;}
 	#counter {display: none;}
-}
\ No newline at end of file
+}
+
+div#front-page > #search > form { margin: 0 auto; }
+div#front-page > #search > form > ul { width: 225px; vertical-align: middle; display: inline-block; }
+div#front-page > #search > form > input[type=submit]{ padding: 4px 6px; }

From b76ee95c76e5c0c4101a805eb69fd22e0b0dc80b Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 18 Jun 2016 12:25:54 +0100
Subject: [PATCH 115/250] fix and use get_all_html_headers()

---
 core/page.class.php               | 3 ++-
 themes/danbooru/layout.class.php  | 8 +-------
 themes/danbooru2/layout.class.php | 8 +-------
 themes/default/layout.class.php   | 7 +------
 themes/futaba/layout.class.php    | 7 +------
 themes/lite/layout.class.php      | 7 +------
 themes/material/layout.class.php  | 9 ++-------
 themes/warm/layout.class.php      | 7 +------
 8 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/core/page.class.php b/core/page.class.php
index cca68f633..725630a55 100644
--- a/core/page.class.php
+++ b/core/page.class.php
@@ -225,8 +225,9 @@ public function get_cookie(/*string*/ $name) {
 	 */
 	public function get_all_html_headers() {
 		$data = '';
+		ksort($this->html_headers);
 		foreach ($this->html_headers as $line) {
-			$data .= $line . "\n";
+			$data .= "\t\t" . $line . "\n";
 		}
 		return $data;
 	}
diff --git a/themes/danbooru/layout.class.php b/themes/danbooru/layout.class.php
index afd13b56c..ce8fa61ed 100644
--- a/themes/danbooru/layout.class.php
+++ b/themes/danbooru/layout.class.php
@@ -50,13 +50,7 @@ public function display_page($page) {
 		//$base_href = $config->get_string('base_href');
 		$data_href = get_base_href();
 		$contact_link = contact_link();
-
-
-		$header_html = "";
-		ksort($page->html_headers);
-		foreach($page->html_headers as $line) {
-			$header_html .= "\t\t$line\n";
-		}
+		$header_html = $page->get_all_html_headers();
 
 		$left_block_html = "";
 		$user_block_html = "";
diff --git a/themes/danbooru2/layout.class.php b/themes/danbooru2/layout.class.php
index 588622210..73433c429 100644
--- a/themes/danbooru2/layout.class.php
+++ b/themes/danbooru2/layout.class.php
@@ -50,13 +50,7 @@ public function display_page($page) {
 		//$base_href = $config->get_string('base_href');
 		//$data_href = get_base_href();
 		$contact_link = contact_link();
-
-
-		$header_html = "";
-		ksort($page->html_headers);
-		foreach($page->html_headers as $line) {
-			$header_html .= "\t\t$line\n";
-		}
+		$header_html = $page->get_all_html_headers();
 
 		$left_block_html = "";
 		$user_block_html = "";
diff --git a/themes/default/layout.class.php b/themes/default/layout.class.php
index 27751a020..4dc947394 100644
--- a/themes/default/layout.class.php
+++ b/themes/default/layout.class.php
@@ -14,12 +14,7 @@ public function display_page(Page $page) {
 		//$theme_name = $config->get_string('theme', 'default');
 		//$data_href = get_base_href();
 		$contact_link = contact_link();
-
-		$header_html = "";
-		ksort($page->html_headers);
-		foreach($page->html_headers as $line) {
-			$header_html .= "\t\t$line\n";
-		}
+		$header_html = $page->get_all_html_headers();
 
 		$left_block_html = "";
 		$main_block_html = "";
diff --git a/themes/futaba/layout.class.php b/themes/futaba/layout.class.php
index 86082edac..cd79d6265 100644
--- a/themes/futaba/layout.class.php
+++ b/themes/futaba/layout.class.php
@@ -7,12 +7,7 @@ function display_page(Page $page) {
 		$theme_name = $config->get_string('theme', 'default');
 		$data_href = get_base_href();
 		$contact_link = contact_link();
-
-		$header_html = "";
-		ksort($page->html_headers);
-		foreach($page->html_headers as $line) {
-			$header_html .= "\t\t$line\n";
-		}
+		$header_html = $page->get_all_html_headers();
 
 		$left_block_html = "";
 		$main_block_html = "";
diff --git a/themes/lite/layout.class.php b/themes/lite/layout.class.php
index 6a0953e11..9606456a1 100644
--- a/themes/lite/layout.class.php
+++ b/themes/lite/layout.class.php
@@ -21,12 +21,7 @@ public function display_page(Page $page) {
 		$site_name = $config->get_string('title');
 		$data_href = get_base_href();
 		$contact_link = contact_link();
-
-		$header_html = "";
-		ksort($page->html_headers);
-		foreach($page->html_headers as $line) {
-			$header_html .= "\t\t{$line}\n";
-		}
+		$header_html = $page->get_all_html_headers();
 
 		$menu = "<div class='menu'>
 			<script type='text/javascript' src='{$data_href}/themes/{$theme_name}/wz_tooltip.js'></script>
diff --git a/themes/material/layout.class.php b/themes/material/layout.class.php
index 7d76a6156..35538ad1f 100644
--- a/themes/material/layout.class.php
+++ b/themes/material/layout.class.php
@@ -14,13 +14,8 @@ public function display_page(Page $page) {
 		$data_href = get_base_href();
 		$main_page = $config->get_string('main_page');
 		$contact_link = contact_link();
-    $site_link = make_link();
-
-		$header_html = "";
-		ksort($page->html_headers);
-		foreach($page->html_headers as $line) {
-			$header_html .= "\t\t$line\n";
-		}
+		$site_link = make_link();
+		$header_html = $page->get_all_html_headers();
 
 		$left_block_html = "";
 		$main_block_html = "";
diff --git a/themes/warm/layout.class.php b/themes/warm/layout.class.php
index a948b2304..917ede3e8 100644
--- a/themes/warm/layout.class.php
+++ b/themes/warm/layout.class.php
@@ -16,12 +16,7 @@ public function display_page(Page $page) {
 		$data_href = get_base_href();
 		$main_page = $config->get_string('main_page');
 		$contact_link = contact_link();
-
-		$header_html = "";
-		ksort($page->html_headers);
-		foreach($page->html_headers as $line) {
-			$header_html .= "\t\t$line\n";
-		}
+		$header_html = $page->get_all_html_headers();
 
 		$left_block_html = "";
 		$main_block_html = "";

From cfc126835482f1092317fbdbb796a441247f0c97 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 18 Jun 2016 12:49:46 +0100
Subject: [PATCH 116/250] update non-layout.class.php uses of html_headers too

---
 ext/home/theme.php             | 3 +--
 ext/site_description/test.php  | 4 ++--
 themes/material/home.theme.php | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ext/home/theme.php b/ext/home/theme.php
index 6c51c73d4..7c829d29e 100644
--- a/ext/home/theme.php
+++ b/ext/home/theme.php
@@ -3,9 +3,8 @@
 class HomeTheme extends Themelet {
 	public function display_page(Page $page, $sitename, $base_href, $theme_name, $body) {
 		$page->set_mode("data");
-		$hh = "";
 		$page->add_auto_html_headers();
-		foreach($page->html_headers as $h) {$hh .= $h;}
+		$hh = $page->get_all_html_headers();
 		$page->set_data(<<<EOD
 <html>
 	<head>
diff --git a/ext/site_description/test.php b/ext/site_description/test.php
index 0ebd3d68e..073252bea 100644
--- a/ext/site_description/test.php
+++ b/ext/site_description/test.php
@@ -6,7 +6,7 @@ public function testSiteDescription() {
 		$this->get_page("post/list");
 		$this->assertContains(
 			'<meta name="description" content="A Shimmie testbed">',
-			$page->html_headers
+			$page->get_all_html_headers()
 		);
 	}
 
@@ -16,7 +16,7 @@ public function testSiteKeywords() {
 		$this->get_page("post/list");
 		$this->assertContains(
 			'<meta name="keywords" content="foo,bar,baz">',
-			$page->html_headers
+			$page->get_all_html_headers()
 		);
 	}
 }
diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index a0cdf0eb3..b8d050b84 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -3,9 +3,8 @@
 class CustomHomeTheme extends HomeTheme {
 	public function display_page(Page $page, $sitename, $base_href, $theme_name, $body) {
 		$page->set_mode("data");
-		$hh = "";
 		$page->add_auto_html_headers();
-		foreach($page->html_headers as $h) {$hh .= $h;}
+		$hh = $page->get_all_html_headers();
 		$page->set_data(<<<EOD
 <html>
 	<head>

From 2546621c59d62a6c3147e879eee4b70e7a114524 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Jun 2016 13:18:59 +0100
Subject: [PATCH 117/250] sort autocomplete by score + show score

---
 ext/autocomplete/main.php  | 10 ++++++++--
 ext/autocomplete/script.js |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ext/autocomplete/main.php b/ext/autocomplete/main.php
index cd373c63b..1dfb81f42 100644
--- a/ext/autocomplete/main.php
+++ b/ext/autocomplete/main.php
@@ -20,8 +20,14 @@ public function onPageRequest(PageRequestEvent $event) {
 				$SQLarr['limit'] = $_GET["limit"];
 			}
 
-			$res = $database->get_col(
-					"SELECT tag FROM tags WHERE tag LIKE :search AND count > 0 $limitSQL", $SQLarr);
+			$res = $database->get_pairs("
+				SELECT tag, count
+				FROM tags
+				WHERE tag LIKE :search
+				AND count > 0
+				ORDER BY count DESC
+				$limitSQL", $SQLarr
+			);
 
 			$page->set_mode("data");
 			$page->set_type("application/json");
diff --git a/ext/autocomplete/script.js b/ext/autocomplete/script.js
index b2f263849..87ccbf93e 100644
--- a/ext/autocomplete/script.js
+++ b/ext/autocomplete/script.js
@@ -18,10 +18,10 @@ $(function(){
 					dataType : 'json',
 					type : 'GET',
 					success : function (data) {
-						response($.map(data, function (item) {
+						response($.map(data, function (count, item) {
 							item = (isNegative ? '-'+item : item);
 							return {
-								label : item,
+								label : item + ' ('+count+')',
 								value : item
 							}
 						}));

From 56e5348470a2ec660749ad97879df50097771c9c Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Jun 2016 13:19:25 +0100
Subject: [PATCH 118/250] autocomplete caching see
 7dce8da850d2b266ffc196a9e9c0aa9ee9314fe3

---
 ext/autocomplete/main.php | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/ext/autocomplete/main.php b/ext/autocomplete/main.php
index 1dfb81f42..6854f3e46 100644
--- a/ext/autocomplete/main.php
+++ b/ext/autocomplete/main.php
@@ -13,21 +13,28 @@ public function onPageRequest(PageRequestEvent $event) {
 			if(!isset($_GET["s"])) return;
 
 			//$limit = 0;
+			$cache_key = "autocomplete-" . strtolower($_GET["s"]);
 			$limitSQL = "";
 			$SQLarr = array("search"=>$_GET["s"]."%");
 			if(isset($_GET["limit"]) && $_GET["limit"] !== 0){
 				$limitSQL = "LIMIT :limit";
 				$SQLarr['limit'] = $_GET["limit"];
+				$cache_key .= "-" . $_GET["limit"];
 			}
 
-			$res = $database->get_pairs("
-				SELECT tag, count
-				FROM tags
-				WHERE tag LIKE :search
-				AND count > 0
-				ORDER BY count DESC
-				$limitSQL", $SQLarr
-			);
+			$res = null;
+			$database->cache->get($cache_key);
+			if(!$res) {
+				$res = $database->get_pairs("
+					SELECT tag, count
+					FROM tags
+					WHERE tag LIKE :search
+					AND count > 0
+					ORDER BY count DESC
+					$limitSQL", $SQLarr
+				);
+				$database->cache->set($cache_key, $res, 600);
+			}
 
 			$page->set_mode("data");
 			$page->set_type("application/json");

From 5d5b1d70599dedb4b7ac99b28e99c0d2cb1953f1 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Jun 2016 13:56:18 +0100
Subject: [PATCH 119/250] this should be set to $res

---
 ext/autocomplete/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/autocomplete/main.php b/ext/autocomplete/main.php
index 6854f3e46..d6656bcdb 100644
--- a/ext/autocomplete/main.php
+++ b/ext/autocomplete/main.php
@@ -23,7 +23,7 @@ public function onPageRequest(PageRequestEvent $event) {
 			}
 
 			$res = null;
-			$database->cache->get($cache_key);
+			$res = $database->cache->get($cache_key);
 			if(!$res) {
 				$res = $database->get_pairs("
 					SELECT tag, count

From b5d56214cdb5863a493e545629e46e9c0d0576d0 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Jun 2016 14:45:21 +0100
Subject: [PATCH 120/250] fix case-insensitive autocomplete on postgres

---
 ext/autocomplete/main.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ext/autocomplete/main.php b/ext/autocomplete/main.php
index d6656bcdb..918796a40 100644
--- a/ext/autocomplete/main.php
+++ b/ext/autocomplete/main.php
@@ -22,16 +22,15 @@ public function onPageRequest(PageRequestEvent $event) {
 				$cache_key .= "-" . $_GET["limit"];
 			}
 
-			$res = null;
 			$res = $database->cache->get($cache_key);
 			if(!$res) {
-				$res = $database->get_pairs("
+				$res = $database->get_pairs($database->scoreql_to_sql("
 					SELECT tag, count
 					FROM tags
-					WHERE tag LIKE :search
+					WHERE SCORE_STRNORM(tag) LIKE SCORE_STRNORM(:search)
 					AND count > 0
 					ORDER BY count DESC
-					$limitSQL", $SQLarr
+					$limitSQL"), $SQLarr
 				);
 				$database->cache->set($cache_key, $res, 600);
 			}

From 06ee5347c7e874dede10ceff3f9a2986e158403a Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 18 Jun 2016 15:56:24 +0100
Subject: [PATCH 121/250] https support for gravatars

---
 ext/comment/theme.php | 2 +-
 ext/user/main.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/comment/theme.php b/ext/comment/theme.php
index 217fc0bc4..3d1e3a1b1 100644
--- a/ext/comment/theme.php
+++ b/ext/comment/theme.php
@@ -276,7 +276,7 @@ protected function comment_to_html(Comment $comment, $trim=false) {
 			if(!empty($comment->owner_email)) {
 				$hash = md5(strtolower($comment->owner_email));
 				$cb = date("Y-m-d");
-				$h_avatar = "<img src=\"http://www.gravatar.com/avatar/$hash.jpg?cacheBreak=$cb\"><br>";
+				$h_avatar = "<img src=\"//www.gravatar.com/avatar/$hash.jpg?cacheBreak=$cb\"><br>";
 			}
 			$h_reply = " - <a href='javascript: replyTo($i_image_id, $i_comment_id, \"$h_name\")'>Reply</a>";
 			$h_ip = $user->can("view_ip") ? "<br>".show_ip($comment->poster_ip, "Comment posted {$comment->posted}") : "";
diff --git a/ext/user/main.php b/ext/user/main.php
index 32d31eaab..c5f57d702 100644
--- a/ext/user/main.php
+++ b/ext/user/main.php
@@ -216,7 +216,7 @@ public function onUserPageBuilding(UserPageBuildingEvent $event) {
 			($user->id == $event->display_user->id)
 		) {
 			$event->add_stats(
-				"No avatar? This gallery uses <a href='http://gravatar.com'>Gravatar</a> for avatar hosting, use the".
+				"No avatar? This gallery uses <a href='https://gravatar.com'>Gravatar</a> for avatar hosting, use the".
 				"<br>same email address here and there to have your avatar synced<br>",
 				0
 			);

From 0fd96fcdae3c3d78c74e9446f692c1f3d30d6b00 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 18 Jun 2016 18:26:11 +0100
Subject: [PATCH 122/250] remove incomplete and unmaintained bookmarks ext, see
 #532

---
 ext/bookmarks/main.php  | 68 -----------------------------------------
 ext/bookmarks/test.php  |  8 -----
 ext/bookmarks/theme.php |  5 ---
 3 files changed, 81 deletions(-)
 delete mode 100644 ext/bookmarks/main.php
 delete mode 100644 ext/bookmarks/test.php
 delete mode 100644 ext/bookmarks/theme.php

diff --git a/ext/bookmarks/main.php b/ext/bookmarks/main.php
deleted file mode 100644
index d864d92a8..000000000
--- a/ext/bookmarks/main.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Name: Bookmarks
- * Author: Shish <webmaster@shishnet.org>
- * Link: http://code.shishnet.org/shimmie2/
- * License: GPLv2
- * Description: Allow users to bookmark searches
- */
-
-class Bookmarks extends Extension {
-	public function onInitExt(InitExtEvent $event) {
-		$this->install();
-	}
-
-	public function onPageRequest(PageRequestEvent $event) {
-		global $page;
-
-		if($event->page_matches("bookmark")) {
-			if($event->get_arg(0) == "add") {
-				if(isset($_POST['url'])) {
-					$page->set_mode("redirect");
-					$page->set_redirect(make_link("user"));
-				}
-			}
-			else if($event->get_arg(0) == "remove") {
-				if(isset($_POST['id'])) {
-					$page->set_mode("redirect");
-					$page->set_redirect(make_link("user"));
-				}
-			}
-		}
-	}
-
-	protected function install() {
-		global $database, $config;
-
-		// shortcut to latest
-		if($config->get_int("ext_bookmarks_version") < 1) {
-			$database->create_table("bookmark", "
-				id SCORE_AIPK,
-				owner_id INTEGER NOT NULL,
-				url TEXT NOT NULL,
-				title TEXT NOT NULL,
-				FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE CASCADE
-			");
-			$database->execute("CREATE INDEX bookmark_owner_id_idx ON bookmark(owner_id)", array());
-			$config->set_int("ext_bookmarks_version", 1);
-		}
-	}
-
-	private function get_bookmarks() {
-		global $database;
-		$bms = $database->get_all("
-			SELECT *
-			FROM bookmark
-			WHERE bookmark.owner_id = ?
-		");
-		if($bms) {return $bms;}
-		else {return array();}
-	}
-
-	private function add_bookmark(/*string*/ $url, /*string*/ $title) {
-		global $database, $user;
-		$sql = "INSERT INTO bookmark(owner_id, url, title) VALUES (?, ?, ?)";
-		$database->Execute($sql, array($user->id, $url, $title));
-	}
-}
-
diff --git a/ext/bookmarks/test.php b/ext/bookmarks/test.php
deleted file mode 100644
index 02f99fec6..000000000
--- a/ext/bookmarks/test.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-class BookmarksTest extends ShimmiePHPUnitTestCase {
-	public function testBookmarks() {
-		$this->get_page("bookmark/add");
-		$this->get_page("bookmark/remove");
-	}
-}
-
diff --git a/ext/bookmarks/theme.php b/ext/bookmarks/theme.php
deleted file mode 100644
index a1cb7b423..000000000
--- a/ext/bookmarks/theme.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class BookmarksTheme extends Themelet {
-}
-

From 24973ada17cc72a59bc0a1cf4df7d550791e13af Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 18 Jun 2016 18:47:28 +0100
Subject: [PATCH 123/250] don't run linter on ext/*/lib/*

---
 .scrutinizer.yml               | 2 +-
 ext/amazon_s3/{ => lib}/S3.php | 0
 ext/amazon_s3/main.php         | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename ext/amazon_s3/{ => lib}/S3.php (100%)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index fe2bf80f6..3dba09a63 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -3,7 +3,7 @@ imports:
 - php
 
 filter:
-  excluded_paths: [lib/*,ext/tagger/script.js,ext/chatbox/*]
+  excluded_paths: [lib/*,ext/*/lib/*,ext/tagger/script.js,ext/chatbox/*]
 
 tools:
   external_code_coverage: true
diff --git a/ext/amazon_s3/S3.php b/ext/amazon_s3/lib/S3.php
similarity index 100%
rename from ext/amazon_s3/S3.php
rename to ext/amazon_s3/lib/S3.php
diff --git a/ext/amazon_s3/main.php b/ext/amazon_s3/main.php
index ff797faa2..a0fda3a4b 100644
--- a/ext/amazon_s3/main.php
+++ b/ext/amazon_s3/main.php
@@ -7,7 +7,7 @@
  * Documentation:
  */
 
-require_once "ext/amazon_s3/S3.php";
+require_once "ext/amazon_s3/lib/S3.php";
 
 class UploadS3 extends Extension {
 	public function onInitExt(InitExtEvent $event) {

From cfd3a9d2480a959c06a9d43ab6d1ac667bae15f9 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 18 Jun 2016 19:00:26 +0100
Subject: [PATCH 124/250] lint fixes

---
 core/user.class.php        | 12 +++++++++---
 ext/autocomplete/script.js |  4 ++--
 ext/handle_video/theme.php |  1 -
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/user.class.php b/core/user.class.php
index 6d73c5c00..3e375a8d6 100644
--- a/core/user.class.php
+++ b/core/user.class.php
@@ -221,9 +221,15 @@ public function set_name(/*string*/ $name) {
 	 */
 	public function set_password(/*string*/ $password) {
 		global $database;
-		$this->passhash = password_hash($password, PASSWORD_BCRYPT);
-		$database->Execute("UPDATE users SET pass=:hash WHERE id=:id", array("hash"=>$this->passhash, "id"=>$this->id));
-		log_info("core-user", 'Set password for '.$this->name);
+		$hash = password_hash($password, PASSWORD_BCRYPT);
+		if(is_string($hash)) {
+			$this->passhash = $hash;
+			$database->Execute("UPDATE users SET pass=:hash WHERE id=:id", array("hash"=>$this->passhash, "id"=>$this->id));
+			log_info("core-user", 'Set password for '.$this->name);
+		}
+		else {
+			throw new SCoreException("Failed to hash password");
+		}
 	}
 
 	/**
diff --git a/ext/autocomplete/script.js b/ext/autocomplete/script.js
index 87ccbf93e..301878ea2 100644
--- a/ext/autocomplete/script.js
+++ b/ext/autocomplete/script.js
@@ -23,7 +23,7 @@ $(function(){
 							return {
 								label : item + ' ('+count+')',
 								value : item
-							}
+							};
 						}));
 					},
 					error : function (request, status, error) {
@@ -55,4 +55,4 @@ $(function(){
 			}
 		}
 	});
-});
\ No newline at end of file
+});
diff --git a/ext/handle_video/theme.php b/ext/handle_video/theme.php
index 774ea55a7..1699f7cda 100644
--- a/ext/handle_video/theme.php
+++ b/ext/handle_video/theme.php
@@ -2,7 +2,6 @@
 
 class VideoFileHandlerTheme extends Themelet {
 	public function display_image(Page $page, Image $image) {
-		$data_href = get_base_href();
 		$ilink = $image->get_image_link();
 		$thumb_url = make_http($image->get_thumb_link()); //used as fallback image
 		$ext = strtolower($image->get_ext());

From 4577ff70efe37c978df6a48ff64ca1efcdcd7eb3 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 18 Jun 2016 19:26:56 +0100
Subject: [PATCH 125/250] more linty bits

---
 core/util.inc.php               |  12 +-
 ext/cron_uploader/main.php      |   4 +-
 ext/handle_ico/main.php         |   4 +-
 ext/image_view_counter/main.php | 200 ++++++++++++++++++--------------
 4 files changed, 123 insertions(+), 97 deletions(-)

diff --git a/core/util.inc.php b/core/util.inc.php
index c19e7fab3..12e72ee53 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -390,8 +390,8 @@ function show_ip($ip, $ban_reason) {
 /**
  * Checks if a given string contains another at the beginning.
  *
- * @param $haystack String to examine.
- * @param $needle String to look for.
+ * @param string $haystack String to examine.
+ * @param string $needle String to look for.
  * @return bool
  */
 function startsWith(/*string*/ $haystack, /*string*/ $needle) {
@@ -402,8 +402,8 @@ function startsWith(/*string*/ $haystack, /*string*/ $needle) {
 /**
  * Checks if a given string contains another at the end.
  *
- * @param $haystack String to examine.
- * @param $needle String to look for.
+ * @param string $haystack String to examine.
+ * @param string $needle String to look for.
  * @return bool
  */
 function endsWith(/*string*/ $haystack, /*string*/ $needle) {
@@ -695,7 +695,7 @@ function is_https_enabled() {
  * from the "Amazon S3 PHP class" which is Copyright (c) 2008, Donovan Schönknecht
  * and released under the 'Simplified BSD License'.
  *
- * @param string &$file File path
+ * @param string $file File path
  * @param string $ext
  * @param bool $list
  * @return string
@@ -1463,7 +1463,7 @@ function _dump_event_listeners($event_listeners, $path) {
 }
 
 /**
- * @param $ext_name string
+ * @param string $ext_name Main class name (eg ImageIO as opposed to ImageIOTheme or ImageIOTest)
  * @return bool
  */
 function ext_is_live($ext_name) {
diff --git a/ext/cron_uploader/main.php b/ext/cron_uploader/main.php
index 9fe1c35d7..182a18487 100644
--- a/ext/cron_uploader/main.php
+++ b/ext/cron_uploader/main.php
@@ -213,7 +213,7 @@ private function set_dir() {
 	
 	/**
 	 * Returns amount of files & total size of dir.
-	 * @param $path string
+	 * @param string $path directory name to scan
 	 * @return multitype:number
 	 */
 	function scan_dir($path){
@@ -234,7 +234,7 @@ function scan_dir($path){
 	
 	/**
 	 * Uploads the image & handles everything
-	 * @param $upload_count int to upload a non-config amount of imgs
+	 * @param int $upload_count to upload a non-config amount of imgs
 	 * @return boolean returns true if the upload was successful
 	 */
 	public function process_upload($upload_count = 0) {
diff --git a/ext/handle_ico/main.php b/ext/handle_ico/main.php
index c16fb64e9..00f1a54aa 100644
--- a/ext/handle_ico/main.php
+++ b/ext/handle_ico/main.php
@@ -86,7 +86,7 @@ private function create_image_from_data($filename, $metadata) {
 	}
 
 	/**
-	 * @param $file
+	 * @param string $file
 	 * @return bool
 	 */
 	private function check_contents($file) {
@@ -98,7 +98,7 @@ private function check_contents($file) {
 	}
 
 	/**
-	 * @param $hash
+	 * @param string $hash
 	 * @return bool
 	 */
 	private function create_thumb($hash) {
diff --git a/ext/image_view_counter/main.php b/ext/image_view_counter/main.php
index 4d8fa1cfd..8cd9d409a 100644
--- a/ext/image_view_counter/main.php
+++ b/ext/image_view_counter/main.php
@@ -11,98 +11,124 @@
  *  This is done to prevent duplicate views. 
  *  A person can only count as a view again 1 hour after viewing the image initially.
  */
-class image_view_counter extends Extension {    
-        private $view_interval = 3600; # allows views to be added each hour
+class ImageViewCounter extends Extension {    
+	private $view_interval = 3600; # allows views to be added each hour
     
-        # Add Setup Block with options for view counter
-        public function onSetupBuilding(SetupBuildingEvent $event) {
-            $sb = new SetupBlock("Image View Counter");
-            $sb->add_bool_option("image_viewcounter_adminonly", "Display view counter only to admin");
+	# Add Setup Block with options for view counter
+	public function onSetupBuilding(SetupBuildingEvent $event) {
+		$sb = new SetupBlock("Image View Counter");
+		$sb->add_bool_option("image_viewcounter_adminonly", "Display view counter only to admin");
 
-            $event->panel->add_block($sb);
+		$event->panel->add_block($sb);
 	}
         
-        # Adds view to database if needed
-        public function onDisplayingImage(DisplayingImageEvent $event) {
-            $imgid = $event->image->id; // determines image id
-            $this->addview($imgid); // adds a view
-        }
+	# Adds view to database if needed
+	public function onDisplayingImage(DisplayingImageEvent $event) {
+		$imgid = $event->image->id; // determines image id
+		$this->addview($imgid); // adds a view
+	}
         
-        # display views to user or admin below image if allowed
-        public function onImageInfoBoxBuilding(ImageInfoBoxBuildingEvent $event) {
+	# display views to user or admin below image if allowed
+	public function onImageInfoBoxBuilding(ImageInfoBoxBuildingEvent $event) {
 		global $user, $config;
-                
-                $adminonly = $config->get_bool("image_viewcounter_adminonly"); // todo0
-                if ($adminonly == false ||  ($adminonly && $user->is_admin()))
-                    $event->add_part("<tr><th>Views:</th><td>". 
-                        $this->get_view_count($event->image->id) ."</th></tr>", 38);
-        }
-        
-        # Installs DB table
-        public function onInitExt(InitExtEvent $event) {
-            global $database, $config;
-            
-            // if the sql table doesn't exist yet, create it
-            if($config->get_bool("image_viewcounter_installed") == false) { //todo
-                $database->create_table("image_views","
-                    id SCORE_AIPK,
-                    image_id INTEGER NOT NULL,
-                    user_id INTEGER NOT NULL,
-                    timestamp INTEGER NOT NULL,
-                    ipaddress SCORE_INET NOT NULL");
-                $config->set_bool("image_viewcounter_installed", true);
-            }
-        }
-        
-        # Adds a view to the item if needed
-        private function addview($imgid)
-        {
-            global $database, $user;
-            
-            // don't add view if person already viewed recently
-            if ($this->can_add_view($imgid) == false) return;
-            
-            // Add view for current IP
-            $database->execute("INSERT INTO image_views (image_id, user_id, timestamp, ipaddress)
-                VALUES (:image_id, :user_id, :timestamp, :ipaddress)", array(
-                    "image_id" => $imgid,  
-                    "user_id" => $user->id,
-                    "timestamp" => time(),
-                    "ipaddress" => $_SERVER['REMOTE_ADDR'],
-                ));
-        }
-        
-        # Returns true if this IP hasn't recently viewed this image
-        private function can_add_view($imgid)
-        {
-            global $database;
-            
-            // counts views from current IP in the last hour
-            $recent_from_ip = (int)$database->get_one("SELECT COUNT(*) FROM image_views WHERE
-                ipaddress=:ipaddress AND timestamp >:lasthour AND image_id =:image_id", 
-                    array(  "ipaddress" => $_SERVER['REMOTE_ADDR'],
-                            "lasthour" => time() - $this->view_interval,
-                            "image_id" => $imgid));
-            
-            // if no views were found with the set criteria, return true
-            if($recent_from_ip == 0) return true;
-            else return false;
-        }
-        
-        # Returns the int of the view count from the given image id
-        // $imgid - if not set or 0, return views of all images
-        private function get_view_count($imgid = 0)
-        {
-            global $database;
-            
-            if ($imgid == 0) // return view count of all images
-                $view_count = (int)$database->get_one("SELECT COUNT(*) FROM image_views");
-            else // return view count of specified image
-                $view_count = (int)$database->get_one("SELECT COUNT(*) FROM image_views WHERE ".
-                    "image_id =:image_id", array("image_id" => $imgid));
-            
-            // returns the count as int
-            return $view_count;
-        }
+
+		$adminonly = $config->get_bool("image_viewcounter_adminonly"); // todo
+		if ($adminonly == false || ($adminonly && $user->is_admin()))
+			$event->add_part(
+				"<tr><th>Views:</th><td>". 
+				$this->get_view_count($event->image->id) .
+				"</th></tr>", 38);
+	}
+
+	# Installs DB table
+	public function onInitExt(InitExtEvent $event) {
+		global $database, $config;
+
+		// if the sql table doesn't exist yet, create it
+		if($config->get_bool("image_viewcounter_installed") == false) { //todo
+			$database->create_table("image_views","
+					id SCORE_AIPK,
+					image_id INTEGER NOT NULL,
+					user_id INTEGER NOT NULL,
+					timestamp INTEGER NOT NULL,
+					ipaddress SCORE_INET NOT NULL");
+			$config->set_bool("image_viewcounter_installed", true);
+		}
+	}
+
+	/**
+	 * Adds a view to the item if needed
+	 * @param int $imgid
+	 */
+	private function addview($imgid)
+	{
+		global $database, $user;
+
+		// don't add view if person already viewed recently
+		if ($this->can_add_view($imgid) == false) return;
+
+		// Add view for current IP
+		$database->execute(
+			"
+				INSERT INTO image_views (image_id, user_id, timestamp, ipaddress)
+				VALUES (:image_id, :user_id, :timestamp, :ipaddress)
+			",
+			array(
+				"image_id" => $imgid,  
+				"user_id" => $user->id,
+				"timestamp" => time(),
+				"ipaddress" => $_SERVER['REMOTE_ADDR'],
+			)
+		);
+	}
+
+	/**
+	 * Returns true if this IP hasn't recently viewed this image
+	 * @param int $imgid
+	 */
+	private function can_add_view($imgid)
+	{
+		global $database;
+
+		// counts views from current IP in the last hour
+		$recent_from_ip = (int)$database->get_one(
+			"
+				SELECT COUNT(*)
+				FROM image_views
+				WHERE ipaddress=:ipaddress AND timestamp >:lasthour AND image_id =:image_id
+			",
+			array(
+				"ipaddress" => $_SERVER['REMOTE_ADDR'],
+				"lasthour" => time() - $this->view_interval,
+				"image_id" => $imgid
+			)
+		);
+
+		// if no views were found with the set criteria, return true
+		if($recent_from_ip == 0) return true;
+		else return false;
+	}
+
+	/**
+	 * Returns the int of the view count from the given image id
+	 * @param int $imgid - if not set or 0, return views of all images
+	 */
+	private function get_view_count($imgid = 0)
+	{
+		global $database;
+
+		if ($imgid == 0) // return view count of all images
+			$view_count = (int)$database->get_one(
+				"SELECT COUNT(*) FROM image_views"
+			);
+		else // return view count of specified image
+			$view_count = (int)$database->get_one(
+				"SELECT COUNT(*) FROM image_views WHERE image_id =:image_id",
+				array("image_id" => $imgid)
+			);
+
+		// returns the count as int
+		return $view_count;
+	}
 }
 

From 730c2659aec053c5979bb81534547fdb84152e4c Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 18 Jun 2016 18:33:56 +0100
Subject: [PATCH 126/250] add composer.lock for scrutinizer-ci

---
 composer.lock | 394 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 394 insertions(+)
 create mode 100644 composer.lock

diff --git a/composer.lock b/composer.lock
new file mode 100644
index 000000000..88b579e26
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,394 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "7f3cebcb4b5b802a6e34719d10bbafc7",
+    "content-hash": "1b9fd588bc2d86a26b1760a6b2041d21",
+    "packages": [
+        {
+            "name": "bower-asset/jquery",
+            "version": "1.12.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/jquery/jquery-dist.git",
+                "reference": "3a43d7e563314bf32970b773dd31ecf2b90813dd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/3a43d7e563314bf32970b773dd31ecf2b90813dd",
+                "reference": "3a43d7e563314bf32970b773dd31ecf2b90813dd",
+                "shasum": ""
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": "dist/jquery.js",
+                "bower-asset-ignore": [
+                    "package.json"
+                ]
+            },
+            "license": [
+                "MIT"
+            ],
+            "keywords": [
+                "browser",
+                "javascript",
+                "jquery",
+                "library"
+            ]
+        },
+        {
+            "name": "bower-asset/jquery-timeago",
+            "version": "v1.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/rmm5t/jquery-timeago.git",
+                "reference": "67c11951ae9b6020341c1056a42b5406162db40c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/rmm5t/jquery-timeago/zipball/67c11951ae9b6020341c1056a42b5406162db40c",
+                "reference": "67c11951ae9b6020341c1056a42b5406162db40c",
+                "shasum": ""
+            },
+            "require": {
+                "bower-asset/jquery": ">=1.4"
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": "jquery.timeago.js",
+                "bower-asset-ignore": [
+                    "test",
+                    "vendor"
+                ]
+            },
+            "license": [
+                "MIT"
+            ]
+        },
+        {
+            "name": "bower-asset/js-cookie",
+            "version": "v2.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/js-cookie/js-cookie.git",
+                "reference": "5c830fb71a2bd3acce9cb733d692e13316991891"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/js-cookie/js-cookie/zipball/5c830fb71a2bd3acce9cb733d692e13316991891",
+                "reference": "5c830fb71a2bd3acce9cb733d692e13316991891",
+                "shasum": ""
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": [
+                    "src/js.cookie.js"
+                ],
+                "bower-asset-ignore": [
+                    "travis.sh",
+                    "test",
+                    "Gruntfile.js",
+                    "package.json",
+                    ".gitignore",
+                    ".jshintignore",
+                    ".jshintrc",
+                    ".tm_properties",
+                    ".travis.yml"
+                ]
+            },
+            "license": [
+                "MIT"
+            ]
+        },
+        {
+            "name": "bower-asset/mediaelement",
+            "version": "2.21.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/johndyer/mediaelement.git",
+                "reference": "68ae308b2ac4ac6648c06f68db9f8902370a3249"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/johndyer/mediaelement/zipball/68ae308b2ac4ac6648c06f68db9f8902370a3249",
+                "reference": "68ae308b2ac4ac6648c06f68db9f8902370a3249",
+                "shasum": ""
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": [
+                    "./build/mediaelement-and-player.js",
+                    "./build/mediaelementplayer.css"
+                ],
+                "bower-asset-ignore": [
+                    "**",
+                    "!/build/**",
+                    "!/bower.json",
+                    "!/README*",
+                    "!/changelog*"
+                ]
+            },
+            "license": [
+                "MIT"
+            ],
+            "description": "HTML5 <video> and <audio> made easy.",
+            "keywords": [
+                "audio",
+                "html5",
+                "shim",
+                "video"
+            ]
+        },
+        {
+            "name": "bower-asset/tablesorter",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/christianbach/tablesorter.git",
+                "reference": "774576308e8a25aa9d68b7fe3069b79543992d7a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/christianbach/tablesorter/zipball/774576308e8a25aa9d68b7fe3069b79543992d7a",
+                "reference": "774576308e8a25aa9d68b7fe3069b79543992d7a",
+                "shasum": ""
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": [
+                    "jquery.metadata.js",
+                    "jquery.tablesorter.min.js"
+                ],
+                "bower-asset-ignore": [
+                    "**/.*",
+                    "node_modules",
+                    "bower_components",
+                    "test",
+                    "tests"
+                ],
+                "branch-alias": {
+                    "dev-master": "2.0.5-dev"
+                }
+            },
+            "license": [
+                "MIT,GPL"
+            ],
+            "description": "Flexible client-side table sorting",
+            "keywords": [
+                "client-side",
+                "sort",
+                "table"
+            ],
+            "time": "2015-12-03 01:22:52"
+        },
+        {
+            "name": "dapphp/securimage",
+            "version": "3.6.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dapphp/securimage.git",
+                "reference": "2ed50264ae5541fec8d8c79e4c9b6235a7cfd506"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dapphp/securimage/zipball/2ed50264ae5541fec8d8c79e4c9b6235a7cfd506",
+                "reference": "2ed50264ae5541fec8d8c79e4c9b6235a7cfd506",
+                "shasum": ""
+            },
+            "require": {
+                "ext-gd": "*",
+                "php": ">=5.2.0"
+            },
+            "suggest": {
+                "ext-pdo": "For database storage support",
+                "ext-pdo_mysql": "For MySQL database support",
+                "ext-pdo_sqlite": "For SQLite3 database support"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "securimage.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD"
+            ],
+            "authors": [
+                {
+                    "name": "Drew Phillips",
+                    "email": "drew@drew-phillips.com"
+                }
+            ],
+            "description": "PHP CAPTCHA Library",
+            "homepage": "https://www.phpcaptcha.org",
+            "keywords": [
+                "captcha",
+                "security"
+            ],
+            "time": "2016-03-04 21:08:00"
+        },
+        {
+            "name": "flexihash/flexihash",
+            "version": "v2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pda/flexihash.git",
+                "reference": "497ba5782606d998f8ab0b4e5942e3a799bec018"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pda/flexihash/zipball/497ba5782606d998f8ab0b4e5942e3a799bec018",
+                "reference": "497ba5782606d998f8ab0b4e5942e3a799bec018",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8",
+                "satooshi/php-coveralls": "~1.0",
+                "squizlabs/php_codesniffer": "^2.3",
+                "symfony/config": "^2.0.0",
+                "symfony/console": "^2.0.0",
+                "symfony/filesystem": "^2.0.0",
+                "symfony/stopwatch": "^2.0.0",
+                "symfony/yaml": "^2.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Flexihash\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paul Annesley",
+                    "email": "paul@annesley.cc",
+                    "homepage": "http://paul.annesley.cc"
+                },
+                {
+                    "name": "Dom Morgan",
+                    "email": "dom@d3r.com",
+                    "homepage": "https://d3r.com"
+                }
+            ],
+            "description": "Flexihash is a small PHP library which implements consistent hashing",
+            "homepage": "https://github.com/pda/flexihash",
+            "time": "2016-04-22 21:03:23"
+        },
+        {
+            "name": "google/recaptcha",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/google/recaptcha.git",
+                "reference": "f3390c376129f84d22734df1f94cc7db25006bbc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/google/recaptcha/zipball/f3390c376129f84d22734df1f94cc7db25006bbc",
+                "reference": "f3390c376129f84d22734df1f94cc7db25006bbc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.5.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "ReCaptcha\\": "src/ReCaptcha"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Client library for reCAPTCHA, a free service that protect websites from spam and abuse.",
+            "homepage": "http://www.google.com/recaptcha/",
+            "keywords": [
+                "Abuse",
+                "captcha",
+                "recaptcha",
+                "spam"
+            ],
+            "time": "2015-12-28 18:03:30"
+        },
+        {
+            "name": "ifixit/php-akismet",
+            "version": "1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/iFixit/php-akismet.git",
+                "reference": "126b4b9182230678a585338be4cfca24c9129dc9"
+            },
+            "type": "library"
+        },
+        {
+            "name": "ircmaxell/password-compat",
+            "version": "v1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ircmaxell/password_compat.git",
+                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
+                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
+                "shasum": ""
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/password.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Anthony Ferrara",
+                    "email": "ircmaxell@php.net",
+                    "homepage": "http://blog.ircmaxell.com"
+                }
+            ],
+            "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
+            "homepage": "https://github.com/ircmaxell/password_compat",
+            "keywords": [
+                "hashing",
+                "password"
+            ],
+            "time": "2014-11-20 16:49:30"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "dev",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=5.4.8"
+    },
+    "platform-dev": []
+}

From 43f108d095ffe1276b1272ce1b6703010aa9035f Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 19 Jun 2016 04:26:43 +0100
Subject: [PATCH 127/250] SQLite is currently experimental, move it to allowed
 failures

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 7c83238fc..3f107206d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,8 @@ env:
     - DB=mysql
     - DB=pgsql
     - DB=sqlite
+    allow_failures:
+      - DB=sqlite
 
 cache:
   directories:

From 311dd91a0970190be90876ff6bd2b6803671f20f Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 19 Jun 2016 04:45:33 +0100
Subject: [PATCH 128/250] disable travis logs since they don't work

---
 .travis.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3f107206d..c13a1f827 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,13 +43,15 @@ script:
 after_failure:
   - head -n 100 data/config/*
   - ls /var/run/mysql*
-  - ls /var/log/*mysql*
-  - cat /var/log/mysql.err
-  - cat /var/log/mysql.log
-  - cat /var/log/mysql/error.log
-  - cat /var/log/mysql/slow.log
-  - ls /var/log/postgresql
-  - cat /var/log/postgresql/postgresql*
+  # All of the below commands require sudo, which we can't use without losing some speed & caching.
+  # SEE: https://docs.travis-ci.com/user/workers/container-based-infrastructure/
+  # - ls /var/log/*mysql*
+  # - cat /var/log/mysql.err
+  # - cat /var/log/mysql.log
+  # - cat /var/log/mysql/error.log
+  # - cat /var/log/mysql/slow.log
+  # - ls /var/log/postgresql
+  # - cat /var/log/postgresql/postgresql*
 
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar

From b70e24acde685998ca1f8be460552e7c3d47fcb3 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 19 Jun 2016 04:51:48 +0100
Subject: [PATCH 129/250] github apparently auto-numbers rows and ignores ours

---
 README.markdown | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.markdown b/README.markdown
index c9125d9dd..01f104e72 100644
--- a/README.markdown
+++ b/README.markdown
@@ -26,21 +26,21 @@ check out one of the versioned branches.
 
 # Installation
 
-0. Download the latest release under [Releases](https://github.com/shish/shimmie2/releases).
-1. Create a blank database
-2. Unzip shimmie into a folder on the web host
-3. Visit the folder with a web browser
-4. Enter the location of the database
-5. Click "install". Hopefully you'll end up at the welcome screen; if
+1. Download the latest release under [Releases](https://github.com/shish/shimmie2/releases).
+2. Create a blank database
+3. Unzip shimmie into a folder on the web host
+4. Visit the folder with a web browser
+5. Enter the location of the database
+6. Click "install". Hopefully you'll end up at the welcome screen; if
    not, you should be given instructions on how to fix any errors~
 
 # Installation (Development)
 
-0. Download the shimmie via the "Download Zip" button.
-1. Install [Composer](https://getcomposer.org/). (If you don't already have it)
-2. Run `composer global require "fxp/composer-asset-plugin:~1.1" --no-plugins`. (This is installed globally due to a known composer bug)
-3. Run `composer install`
-4. Follow instructions noted in "Installation" (Excluding 0).
+1. Download the shimmie via the "Download Zip" button.
+2. Install [Composer](https://getcomposer.org/). (If you don't already have it)
+3. Run `composer global require "fxp/composer-asset-plugin:~1.1" --no-plugins`. (This is installed globally due to a known composer bug)
+4. Run `composer install`
+5. Follow instructions noted in "Installation" (Excluding 1.).
 
 ## Upgrade from 2.3.X
 

From d4793db6a58a6b2c61451c4f98cb887b3a851aff Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 19 Jun 2016 04:55:32 +0100
Subject: [PATCH 130/250] improve instructions

---
 README.markdown | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.markdown b/README.markdown
index 01f104e72..11b231d4d 100644
--- a/README.markdown
+++ b/README.markdown
@@ -36,11 +36,12 @@ check out one of the versioned branches.
 
 # Installation (Development)
 
-1. Download the shimmie via the "Download Zip" button.
-2. Install [Composer](https://getcomposer.org/). (If you don't already have it)
-3. Run `composer global require "fxp/composer-asset-plugin:~1.1" --no-plugins`. (This is installed globally due to a known composer bug)
-4. Run `composer install`
-5. Follow instructions noted in "Installation" (Excluding 1.).
+1. Download shimmie via the "Download Zip" button on the [develop](https://github.com/shish/shimmie2/tree/develop) branch.
+2. Unzip shimmie into a folder on the web host
+3. Install [Composer](https://getcomposer.org/). (If you don't already have it)
+4. Run `composer global require "fxp/composer-asset-plugin:~1.1" --no-plugins`. (This is installed globally due to a known composer bug)
+5. Run `composer install` in the shimmie folder.
+6. Follow instructions noted in "Installation" (Excluding 1 & 3).
 
 ## Upgrade from 2.3.X
 

From 66226b5ccfa869987dc17ed881a5cd8507158971 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 19 Jun 2016 04:56:27 +0100
Subject: [PATCH 131/250] include code quality, code coverage imgs in readme
 would be nice if this changed depending on the branch..

---
 README.markdown | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.markdown b/README.markdown
index 11b231d4d..3fa7052d5 100644
--- a/README.markdown
+++ b/README.markdown
@@ -11,6 +11,8 @@
 # Shimmie
 
 [![Build Status](https://travis-ci.org/shish/shimmie2.svg?branch=master)](https://travis-ci.org/shish/shimmie2)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/shish/shimmie2/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/shish/shimmie2/?branch=master)
+[![Code Coverage](https://scrutinizer-ci.com/g/shish/shimmie2/badges/coverage.png?b=develop)](https://scrutinizer-ci.com/g/shish/shimmie2/?branch=master)
 
 This is the main branch of Shimmie, if you know anything at all about running
 websites, this is the version to use.

From b75638cace775c5d293a627e11008657cd2f5fc8 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 19 Jun 2016 04:57:14 +0100
Subject: [PATCH 132/250] get_last_insert_id requires param for pgsql support

---
 ext/artists/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/artists/main.php b/ext/artists/main.php
index a2380120b..5276881fa 100644
--- a/ext/artists/main.php
+++ b/ext/artists/main.php
@@ -837,7 +837,7 @@ private function save_new_artist($name, $notes) {
             INSERT INTO artists (user_id, name, notes, created, updated)
             VALUES (?, ?, ?, now(), now())
         ", array($user->id, $name, $notes));
-        return $database->get_last_insert_id();
+        return $database->get_last_insert_id('artists_id_seq');
     }
 
     /**

From 6486a4757fb448b9edc7aceb5dbdf239262aecd7 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 19 Jun 2016 05:00:09 +0100
Subject: [PATCH 133/250] js scrutinizer fixes

---
 ext/tagger/script.js |  2 +-
 lib/shimmie.js       | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ext/tagger/script.js b/ext/tagger/script.js
index ba3fa66ec..49ad07c34 100644
--- a/ext/tagger/script.js
+++ b/ext/tagger/script.js
@@ -69,7 +69,7 @@ var Tagger = {
 	tag : {
 		submit : function () {
 			var l = this.list.childNodes.length;
-			var tags = Array();
+			var tags = [];
 			for(var i=0; i<l; i++) {
 				var s_tag = this.list.childNodes[i].firstChild.data;
 				tags.push(s_tag);
diff --git a/lib/shimmie.js b/lib/shimmie.js
index 909509169..e068a6ac4 100644
--- a/lib/shimmie.js
+++ b/lib/shimmie.js
@@ -89,11 +89,14 @@ $(document).ready(function() {
 	});
 
 	if(document.location.hash.length > 3) {
-		query = document.location.hash.substring(1);
-		a = document.getElementById("prevlink");
-		a.href = a.href + '?' + query;
-		a = document.getElementById("nextlink");
-		a.href = a.href + '?' + query;
+		var query = document.location.hash.substring(1);
+
+		$('#prevlink').attr('href', function(i, attr) {
+			return attr + '?' + query;
+		});
+		$('#nextlink').attr('href', function(i, attr) {
+			return attr + '?' + query;
+		});
 	}
 
 	/*

From 5ae10473e3134cafd20629b8dd2c01c31f38a794 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 19 Jun 2016 05:01:13 +0100
Subject: [PATCH 134/250] closing tag is unneeded

---
 ext/link_image/theme.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ext/link_image/theme.php b/ext/link_image/theme.php
index f92891c61..213311dce 100644
--- a/ext/link_image/theme.php
+++ b/ext/link_image/theme.php
@@ -85,8 +85,7 @@ protected function link_code(/*string*/ $label, /*string*/ $content, $id=NULL) {
 		return	"
 			<tr>
 				<td><label for='".$id."' title='Click to select the textbox'>$label</label></td>
-				<td><input type='text' readonly='readonly' id='".$id."' name='".$id."'
-						value='".html_escape($content)."' onfocus='this.select();'></input></td>
+				<td><input type='text' readonly='readonly' id='".$id."' name='".$id."' value='".html_escape($content)."' onfocus='this.select();' /></td>
 			</tr>
 		";
 	}

From c0601640bf71e436752548d4bd861028f7fedced Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 6 Mar 2016 23:41:46 +0000
Subject: [PATCH 135/250] only show link if extension actually has
 documentation

---
 ext/ext_manager/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ext_manager/theme.php b/ext/ext_manager/theme.php
index 7d6bd4360..06883e77d 100644
--- a/ext/ext_manager/theme.php
+++ b/ext/ext_manager/theme.php
@@ -25,7 +25,7 @@ public function display_table(Page $page, /*array*/ $extensions, /*bool*/ $edita
 			$html .= "
 				<tr>
 					$h_en
-					<td><a href='$h_link'>$h_name</a></td>
+					<td>".($extension->documentation ? "<a href='$h_link'>$h_name</a>" : $h_name)."</td>
 					<td style='text-align: left;'>$h_description</td>
 				</tr>";
 		}

From 862a84677fb4057d76365fb02e9c5a908dacea76 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Mon, 7 Mar 2016 01:37:53 +0000
Subject: [PATCH 136/250] add docs column, showing what extensions have
 documentation previously it made every ext name into a link to /ext_doc,
 regardless if it had docs or not

---
 ext/ext_manager/theme.php | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/ext/ext_manager/theme.php b/ext/ext_manager/theme.php
index 06883e77d..de939f651 100644
--- a/ext/ext_manager/theme.php
+++ b/ext/ext_manager/theme.php
@@ -7,26 +7,31 @@ public function display_table(Page $page, /*array*/ $extensions, /*bool*/ $edita
 			".make_form(make_link("ext_manager/set"))."
 				<table id='extensions' class='zebra sortable'>
 					<thead>
-						<tr>$h_en<th>Name</th><th>Description</th></tr>
+						<tr>
+							$h_en
+							<th>Name</th>
+							<th>Docs</th>
+							<th>Description</th>
+						</tr>
 					</thead>
 					<tbody>
 		";
 		foreach($extensions as $extension) {
 			if(!$editable && $extension->visibility == "admin") continue;
 
-			$h_name = html_escape(empty($extension->name) ? $extension->ext_name : $extension->name);
+			$h_name        = html_escape(empty($extension->name) ? $extension->ext_name : $extension->name);
 			$h_description = html_escape($extension->description);
-			if($extension->enabled === TRUE) $h_enabled = " checked='checked'";
-			else if($extension->enabled === FALSE) $h_enabled = "";
-			else $h_enabled = " disabled checked='checked'";
-			$h_link = make_link("ext_doc/".url_escape($extension->ext_name));
+			$h_link        = make_link("ext_doc/".url_escape($extension->ext_name));
+			$h_enabled     = ($extension->enabled === TRUE ? " checked='checked'" : ($extension->enabled === FALSE ? "" : " disabled checked='checked'"));
+			$h_enabled_box = $editable ? "<td><input type='checkbox' name='ext_".html_escape($extension->ext_name)."'$h_enabled></td>" : "";
+			$h_docs        = ($extension->documentation ? "<a href='$h_link'>■</a>" : ""); //TODO: A proper "docs" symbol would be preferred here.
 
-			$h_en = $editable ? "<td><input type='checkbox' name='ext_".html_escape($extension->ext_name)."'$h_enabled></td>" : "";
 			$html .= "
-				<tr>
-					$h_en
-					<td>".($extension->documentation ? "<a href='$h_link'>$h_name</a>" : $h_name)."</td>
-					<td style='text-align: left;'>$h_description</td>
+				<tr data-ext='{$extension->ext_name}'>
+					{$h_enabled_box}
+					<td>{$h_name}</td>
+					<td>{$h_docs}</td>
+					<td style='text-align: left;'>{$h_description}</td>
 				</tr>";
 		}
 		$h_set = $editable ? "<tfoot><tr><td colspan='5'><input type='submit' value='Set Extensions'></td></tr></tfoot>" : "";

From ce10831137972eb8de78b690f3a4bd811380a8e9 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 19 Jun 2016 05:25:40 +0100
Subject: [PATCH 137/250] this shouldn't be indented under matrix..

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c13a1f827..9edb54f00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,8 @@ env:
     - DB=mysql
     - DB=pgsql
     - DB=sqlite
-    allow_failures:
-      - DB=sqlite
+  allow_failures:
+    - DB=sqlite
 
 cache:
   directories:

From 03240220d4c6849e0a521d0c0523c41bdc25a28d Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 19 Jun 2016 09:49:55 +0100
Subject: [PATCH 138/250] make sure to get proper tag value + use selected tag
 if possible

---
 ext/autocomplete/script.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ext/autocomplete/script.js b/ext/autocomplete/script.js
index 301878ea2..dead05e6b 100644
--- a/ext/autocomplete/script.js
+++ b/ext/autocomplete/script.js
@@ -47,10 +47,9 @@ $(function(){
 		} else if (keyCode == 9) {
 			e.preventDefault();
 
-			var tag = $('.tagit-autocomplete[style*=\"display: block\"] > li:first').text();
-			if(tag){
-				$('[name=search]').tagit('createTag', tag);
-				$('.ui-autocomplete-input').autocomplete('close');
+			var tag = $('.tagit-autocomplete[style*=\"display: block\"] > li:focus, .tagit-autocomplete[style*=\"display: block\"] > li:first').first();
+			if(tag.length){
+				$(tag).click();
 				$('.ui-autocomplete-input').val(''); //If tag already exists, make sure to remove duplicate.
 			}
 		}

From f973fcc9fa3ea596bc92b9cc0cf39f281a402f43 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 19 Jun 2016 10:07:56 +0100
Subject: [PATCH 139/250] basic autocomplete support for metatags

---
 ext/autocomplete/script.js | 48 ++++++++++++++++++++++++++++----------
 ext/autocomplete/style.css |  3 ++-
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/ext/autocomplete/script.js b/ext/autocomplete/script.js
index dead05e6b..8fda1cf9e 100644
--- a/ext/autocomplete/script.js
+++ b/ext/autocomplete/script.js
@@ -1,16 +1,36 @@
 $(function(){
+	var metatags = ['order:id', 'order:width', 'order:height', 'order:filesize', 'order:filename'];
+
 	$('[name=search]').tagit({
 		singleFieldDelimiter: ' ',
 		beforeTagAdded: function(event, ui) {
-			// give special class to negative tags
-			if(ui.tagLabel[0] === '-') {
-				ui.tag.addClass('tag-negative');
-			}else{
-				ui.tag.addClass('tag-positive');
+			if(metatags.indexOf(ui.tagLabel) !== -1) {
+				ui.tag.addClass('tag-metatag');
+			} else {
+				console.log(ui.tagLabel);
+				// give special class to negative tags
+				if(ui.tagLabel[0] === '-') {
+					ui.tag.addClass('tag-negative');
+				}else{
+					ui.tag.addClass('tag-positive');
+				}
 			}
 		},
 		autocomplete : ({
 			source: function (request, response) {
+				var ac_metatags = $.map(
+					$.grep(metatags, function(s) {
+						// Only show metatags for strings longer than one character
+						return (request.term.length > 1 && s.indexOf(request.term) === 0);
+					}),
+					function(item) {
+						return {
+							label : item + ' [metatag]',
+							value : item
+						};
+					}
+				);
+
 				var isNegative = (request.term[0] === '-');
 				$.ajax({
 					url: base_href + '/api/internal/autocomplete',
@@ -18,13 +38,17 @@ $(function(){
 					dataType : 'json',
 					type : 'GET',
 					success : function (data) {
-						response($.map(data, function (count, item) {
-							item = (isNegative ? '-'+item : item);
-							return {
-								label : item + ' ('+count+')',
-								value : item
-							};
-						}));
+						response(
+							$.merge(ac_metatags,
+								$.map(data, function (count, item) {
+									item = (isNegative ? '-'+item : item);
+									return {
+										label : item + ' ('+count+')',
+										value : item
+									};
+								})
+							)
+						);
 					},
 					error : function (request, status, error) {
 						alert(error);
diff --git a/ext/autocomplete/style.css b/ext/autocomplete/style.css
index 019bb7fdf..7ff0f69bc 100644
--- a/ext/autocomplete/style.css
+++ b/ext/autocomplete/style.css
@@ -5,4 +5,5 @@
 input[name=search] ~ input[type=submit] { display: inline-block !important; }
 
 .tag-negative { background: #ff8080 !important; }
-.tag-positive { background: #40bf40 !important; }
\ No newline at end of file
+.tag-positive { background: #40bf40 !important; }
+.tag-metatag   { background: #eaa338 !important; }

From a8d9f8ce5b22ed25e0f40e2dfc0e4118b73f4194 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sun, 19 Jun 2016 11:56:41 +0100
Subject: [PATCH 140/250] make sure prev/next links aren't clipped outside the
 box

---
 ext/pools/theme.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/pools/theme.php b/ext/pools/theme.php
index 457eb7930..5edb3625e 100644
--- a/ext/pools/theme.php
+++ b/ext/pools/theme.php
@@ -21,6 +21,7 @@ public function pool_info(/*array*/ $navIDs) {
 					$navlinks .= '<a href="'.make_link('post/view/'.$pool['nav']['next']).'" class="pools_next_img">Next</a>';
 				}
 				if(!empty($navlinks)){
+					$navlinks .= "<div style='height: 5px'></div>";
 					$linksPools[] = $navlinks;
 				}
 			}

From e0d3d534795fe503e6551ff44340528289d8d57d Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 19 Jun 2016 11:57:01 +0100
Subject: [PATCH 141/250] stub mb_ functions

---
 core/imageboard.pack.php | 2 +-
 core/util.inc.php        | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 71badf09b..19a57ee6a 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -813,7 +813,7 @@ private static function build_search_querylet($terms) {
 		 */
 
 		// no tags, do a simple search
-		if($positive_tag_count + $negative_tag_count == 0) {
+		if($positive_tag_count === 0 && $negative_tag_count === 0) {
 			$query = new Querylet("
 				SELECT images.*
 				FROM images
diff --git a/core/util.inc.php b/core/util.inc.php
index 12e72ee53..2b1b6a734 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -412,6 +412,11 @@ function endsWith(/*string*/ $haystack, /*string*/ $needle) {
 	return (substr($haystack, $start) === $needle);
 }
 
+if(!function_exists("mb_strlen")) {  // D:
+	function mb_strlen($str) {return strlen($str);}
+	function mb_internal_encoding($enc) {}
+	function mb_strtolower($str) {return strtolower($str);}
+}
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * HTML Generation                                                           *

From d185fd354b93bb88f92d9dc07375d79121b322c5 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Tue, 7 Jun 2016 02:05:19 +0100
Subject: [PATCH 142/250] fix wildcard search for mysql

---
 core/imageboard.pack.php | 191 +++++++++++++++++++--------------------
 1 file changed, 94 insertions(+), 97 deletions(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 19a57ee6a..ddfdd1d6d 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -316,7 +316,13 @@ public function get_next($tags=array(), $next=true) {
 		}
 
 		if(count($tags) === 0) {
-			$row = $database->get_row('SELECT images.* FROM images WHERE images.id '.$gtlt.' '.$this->id.' ORDER BY images.id '.$dir.' LIMIT 1');
+			$row = $database->get_row('
+				SELECT images.*
+				FROM images
+				WHERE images.id '.$gtlt.' '.$this->id.'
+				ORDER BY images.id '.$dir.'
+				LIMIT 1
+			');
 		}
 		else {
 			$tags[] = 'id'. $gtlt . $this->id;
@@ -355,7 +361,11 @@ public function get_owner() {
 	public function set_owner(User $owner) {
 		global $database;
 		if($owner->id != $this->owner_id) {
-			$database->execute("UPDATE images SET owner_id=:owner_id WHERE id=:id", array("owner_id"=>$owner->id, "id"=>$this->id));
+			$database->execute("
+				UPDATE images
+				SET owner_id=:owner_id
+				WHERE id=:id
+			", array("owner_id"=>$owner->id, "id"=>$this->id));
 			log_info("core_image", "Owner for Image #{$this->id} set to {$owner->name}", false, array("image_id" => $this->id));
 		}
 	}
@@ -368,7 +378,13 @@ public function set_owner(User $owner) {
 	public function get_tag_array() {
 		global $database;
 		if(!isset($this->tag_array)) {
-			$this->tag_array = $database->get_col("SELECT tag FROM image_tags JOIN tags ON image_tags.tag_id = tags.id WHERE image_id=:id ORDER BY tag", array("id"=>$this->id));
+			$this->tag_array = $database->get_col("
+				SELECT tag
+				FROM image_tags
+				JOIN tags ON image_tags.tag_id = tags.id
+				WHERE image_id=:id
+				ORDER BY tag
+			", array("id"=>$this->id));
 		}
 		return $this->tag_array;
 	}
@@ -570,10 +586,18 @@ public function delete_tags_from_image() {
 			$database->execute("
 				UPDATE tags
 				SET count = count - 1
-				WHERE id IN (SELECT tag_id FROM image_tags WHERE image_id = :id)", array("id"=>$this->id)
-			);
+				WHERE id IN (
+					SELECT tag_id
+					FROM image_tags
+					WHERE image_id = :id
+				)
+			", array("id"=>$this->id));
 		}
-		$database->execute("DELETE FROM image_tags WHERE image_id=:id", array("id"=>$this->id));
+		$database->execute("
+			DELETE
+			FROM image_tags
+			WHERE image_id=:id
+		", array("id"=>$this->id));
 	}
 
 	/**
@@ -601,10 +625,13 @@ public function set_tags($tags) {
 				}
 
 				$id = $database->get_one(
-						$database->scoreql_to_sql(
-							"SELECT id FROM tags WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)"
-						),
-						array("tag"=>$tag));
+					$database->scoreql_to_sql("
+						SELECT id
+						FROM tags
+						WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)
+					"),
+					array("tag"=>$tag)
+				);
 				if(empty($id)) {
 					// a new tag
 					$database->execute(
@@ -617,15 +644,19 @@ public function set_tags($tags) {
 				}
 				else {
 					// user of an existing tag
-					$database->execute(
-							"INSERT INTO image_tags(image_id, tag_id) VALUES(:iid, :tid)",
-							array("iid"=>$this->id, "tid"=>$id));
+					$database->execute("
+						INSERT INTO image_tags(image_id, tag_id)
+						VALUES(:iid, :tid)
+					", array("iid"=>$this->id, "tid"=>$id));
 				}
 				$database->execute(
-						$database->scoreql_to_sql(
-							"UPDATE tags SET count = count + 1 WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)"
-						),
-						array("tag"=>$tag));
+					$database->scoreql_to_sql("
+						UPDATE tags
+						SET count = count + 1
+						WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)
+					"),
+					array("tag"=>$tag)
+				);
 			}
 
 			log_info("core_image", "Tags for Image #{$this->id} set to: ".implode(" ", $tags), null, array("image_id" => $this->id));
@@ -789,14 +820,9 @@ private static function build_search_querylet($terms) {
 					$img_querylets[] = new ImgQuerylet($querylet, $positive);
 				}
 			} else {
-				$expansions = Tag::resolve_wildcard($term);
-				if ($expansions) {
-					if ($positive) $positive_tag_count++;
-					else $negative_tag_count++;
-				}
-				foreach ($expansions as $expanded_term) {
-					$tag_querylets[] = new TagQuerylet($expanded_term, $positive);
-				}
+				$tag_querylets[] = new TagQuerylet(Tag::sanitise_wildcard($term), $positive);
+				if ($positive) $positive_tag_count++;
+				else $negative_tag_count++;
 			}
 		}
 
@@ -823,6 +849,7 @@ private static function build_search_querylet($terms) {
 
 		// one positive tag (a common case), do an optimised search
 		else if($positive_tag_count === 1 && $negative_tag_count === 0) {
+			# "LIKE" to account for wildcards
 			$query = new Querylet($database->scoreql_to_sql("
 				SELECT *
 				FROM (
@@ -840,15 +867,9 @@ private static function build_search_querylet($terms) {
 		// more than one positive tag, or more than zero negative tags
 		else {
 			if($database->get_driver_name() === "mysql")
-				$query = Image::build_ugly_search_querylet(
-					$tag_querylets,
-					$positive_tag_count
-				);
+				$query = Image::build_ugly_search_querylet($tag_querylets);
 			else
-				$query = Image::build_accurate_search_querylet(
-					$tag_querylets,
-					$positive_tag_count
-				);
+				$query = Image::build_accurate_search_querylet($tag_querylets);
 		}
 
 		/*
@@ -893,14 +914,10 @@ private static function build_search_querylet($terms) {
 	 *      All the subqueries are executed every time for every row in the
 	 *      images table. Yes, MySQL does suck this much.
 	 *
-	 * @param array $tag_querylets
-	 * @param int $positive_tag_count
+	 * @param TagQuerylet[] $tag_querylets
 	 * @return Querylet
 	 */
-	private static function build_accurate_search_querylet(
-		$tag_querylets,
-		$positive_tag_count
-	) {
+	private static function build_accurate_search_querylet($tag_querylets) {
 		global $database;
 
 		$positive_tag_id_array = array();
@@ -911,7 +928,7 @@ private static function build_accurate_search_querylet(
 				$database->scoreql_to_sql("
 					SELECT id
 					FROM tags
-					WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)
+					WHERE SCORE_STRNORM(tag) LIKE SCORE_STRNORM(:tag)
 				"),
 				array("tag" => $tq->tag)
 			);
@@ -931,52 +948,45 @@ private static function build_accurate_search_querylet(
 			}
 		}
 
-		$have_pos = count($positive_tag_id_array) > 0;
-		$have_neg = count($negative_tag_id_array) > 0;
-
-		$sql = "";
-		if ($have_pos) {
+		assert('$positive_tag_id_array || $negative_tag_id_array');
+		$wheres = array();
+		if ($positive_tag_id_array) {
 			$positive_tag_id_list = join(', ', $positive_tag_id_array);
-			$sql .= "
-				SELECT image_id
-				FROM image_tags
-				WHERE tag_id IN ($positive_tag_id_list)
-				GROUP BY image_id
-				HAVING COUNT(image_id)>=$positive_tag_count
-			";
-		}
-		if ($have_pos && $have_neg) {
-			$sql .= " EXCEPT ";
+			$wheres[] = "tag_id IN ($positive_tag_id_list)";
 		}
-		if ($have_neg) {
+		if ($negative_tag_id_array) {
 			$negative_tag_id_list = join(', ', $negative_tag_id_array);
-			$sql .= "
-				SELECT image_id
-				FROM image_tags
-				WHERE tag_id IN ($negative_tag_id_list)
-			";
+			$wheres[] = "tag_id NOT IN ($negative_tag_id_list)";
 		}
+		$wheres_str = join(" AND ", $wheres);
 		return new Querylet("
 			SELECT images.*
 			FROM images
-			WHERE images.id IN ($sql)
-		");
+			WHERE images.id IN (
+				SELECT image_id
+				FROM image_tags
+				WHERE $wheres_str
+				GROUP BY image_id
+				HAVING COUNT(image_id) >= :search_score
+			)
+		", array("search_score"=>count($positive_tag_id_array)));
 	}
 
 	/**
 	 * this function exists because mysql is a turd, see the docs for
 	 * build_accurate_search_querylet() for a full explanation
 	 *
-	 * @param array $tag_querylets
-	 * @param int $positive_tag_count
+	 * @param TagQuerylet[] $tag_querylets
 	 * @return Querylet
 	 */
-	private static function build_ugly_search_querylet(
-		$tag_querylets,
-		$positive_tag_count
-	) {
+	private static function build_ugly_search_querylet($tag_querylets) {
 		global $database;
 
+		$positive_tag_count = 0;
+		foreach($tag_querylets as $tq) {
+			if($tq->positive) $positive_tag_count++;
+		}
+
 		// only negative tags - shortcut to fail
 		if($positive_tag_count == 0) {
 			// TODO: This isn't currently implemented.
@@ -993,7 +1003,7 @@ private static function build_ugly_search_querylet(
 		$terms = array();
 		foreach($tag_querylets as $tq) {
 			$sign = $tq->positive ? "+" : "-";
-			$sql .= ' '.$sign.' IF(tag LIKE :tag'.Image::$tag_n.', 1, 0)';
+			$sql .= ' '.$sign.' IF(SUM(tag LIKE :tag'.Image::$tag_n.'), 1, 0)';
 			$terms['tag'.Image::$tag_n] = $tq->tag;
 			Image::$tag_n++;
 		}
@@ -1001,19 +1011,18 @@ private static function build_ugly_search_querylet(
 
 		$tag_id_array = array();
 
-		$x = 0;
-		foreach($tag_search->variables as $tag) {
+		foreach($tag_querylets as $tq) {
 			$tag_ids = $database->get_col(
 				$database->scoreql_to_sql("
 					SELECT id
 					FROM tags
-					WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)
+					WHERE SCORE_STRNORM(tag) LIKE SCORE_STRNORM(:tag)
 				"),
-				array("tag" => $tag)
+				array("tag" => $tq->tag)
 			);
 			$tag_id_array = array_merge($tag_id_array, $tag_ids);
 
-			if($tag_querylets[$x]->positive && count($tag_ids) == 0) {
+			if($tq->positive && count($tag_ids) == 0) {
 				# one of the positive tags had zero results, therefor there
 				# can be no results; "where 1=0" should shortcut things
 				return new Querylet("
@@ -1022,15 +1031,13 @@ private static function build_ugly_search_querylet(
 					WHERE 1=0
 				");
 			}
-
-			$x++;
 		}
 
 		Image::$tag_n = 0;
 		return new Querylet('
 			SELECT *
 			FROM (
-				SELECT images.*, SUM('.$tag_search->sql.') AS score
+				SELECT images.*, ('.$tag_search->sql.') AS score
 				FROM images
 				LEFT JOIN image_tags ON image_tags.image_id = images.id
 				JOIN tags ON image_tags.tag_id = tags.id
@@ -1154,34 +1161,24 @@ public static function resolve_alias($tag) {
 
 	/**
 	 * @param string $tag
-	 * @return array
+	 * @return string
 	 */
-	public static function resolve_wildcard($tag) {
+	public static function sanitise_wildcard($tag) {
 		// if there is no wildcard, return the tag
 		if(strpos($tag, "*") === false) {
-			return array($tag);
+			return $tag;
 		}
 
-		// if the whole match is wild, return null to save the database
+		// if the whole match is wild, save the database
 		else if(str_replace("*", "", $tag) == "") {
-			return array();
+			return "invalid-wildcard";
 		}
 
-		// else find some matches
+		// else translate to sql
 		else {
-			global $database;
-			$db_wild_tag = str_replace("%", "\%", $tag);
-			$db_wild_tag = str_replace("*", "%", $db_wild_tag);
-			$newtags = $database->get_col(
-				$database->scoreql_to_sql("SELECT tag FROM tags WHERE SCORE_STRNORM(tag) LIKE SCORE_STRNORM(?)"),
-				array($db_wild_tag)
-			);
-			if(count($newtags) > 0) {
-				$resolved = $newtags;
-			} else {
-				$resolved = array($tag);
-			}
-			return $resolved;
+			$tag = str_replace("%", "\%", $tag);
+			$tag = str_replace("*", "%", $tag);
+			return $tag;
 		}
 	}
 

From edd3e49a2fbcfb7bd6e2a37dc5b8042770dd6b58 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 19 Jun 2016 14:06:26 +0100
Subject: [PATCH 143/250] mark wildcard test incomplete on pgsql / sqlite

---
 ext/index/test.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ext/index/test.php b/ext/index/test.php
index 716ce59e2..682fb1cc5 100644
--- a/ext/index/test.php
+++ b/ext/index/test.php
@@ -142,6 +142,12 @@ public function testWildSearchNoResults() {
 	public function testWildSearchOneResult() {
 		$image_ids = $this->upload();
 
+		global $database;
+		$db = $database->get_driver_name();
+		if($db == "pgsql" || $db == "sqlite") {
+			$this->markTestIncomplete();
+		}
+
 		// Only the first image matches both the wildcard and the tag.
 		// This checks for https://github.com/shish/shimmie2/issues/547
 		// (comp* is expanded to "computer computing", then we searched

From dc10a1808653cff8916f2690645dabcdf7576192 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 19 Jun 2016 17:41:40 +0100
Subject: [PATCH 144/250] lots of minor doc tweaks, type hints, etc

---
 README.markdown                  |  26 +-
 core/util.inc.php                |  19 +-
 ext/ext_manager/theme.php        |   5 +
 ext/forum/main.php               | 649 ++++++++++++++++---------------
 ext/handle_svg/main.php          |   1 +
 ext/handle_video/main.php        |   2 +-
 ext/ouroboros_api/main.php       |  22 +-
 ext/resize/main.php              |  16 +-
 ext/shimmie_api/main.php         |   4 +-
 ext/statsd/main.php              |  16 +-
 ext/tag_edit/main.php            |   9 +
 ext/tag_history/main.php         |   6 +-
 ext/tagger/main.php              |   8 +
 themes/danbooru/index.theme.php  |   4 +-
 themes/danbooru/layout.class.php |  12 +-
 15 files changed, 437 insertions(+), 362 deletions(-)

diff --git a/README.markdown b/README.markdown
index 3fa7052d5..c5fabf2d0 100644
--- a/README.markdown
+++ b/README.markdown
@@ -11,8 +11,14 @@
 # Shimmie
 
 [![Build Status](https://travis-ci.org/shish/shimmie2.svg?branch=master)](https://travis-ci.org/shish/shimmie2)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/shish/shimmie2/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/shish/shimmie2/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/shish/shimmie2/badges/coverage.png?b=develop)](https://scrutinizer-ci.com/g/shish/shimmie2/?branch=master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/shish/shimmie2/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/shish/shimmie2/?branch=master)
+[![Code Coverage](https://scrutinizer-ci.com/g/shish/shimmie2/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/shish/shimmie2/?branch=master)
+(master)
+
+[![Build Status](https://travis-ci.org/shish/shimmie2.svg?branch=develop)](https://travis-ci.org/shish/shimmie2)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/shish/shimmie2/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/shish/shimmie2/?branch=develop)
+[![Code Coverage](https://scrutinizer-ci.com/g/shish/shimmie2/badges/coverage.png?b=develop)](https://scrutinizer-ci.com/g/shish/shimmie2/?branch=develop)
+(develop)
 
 This is the main branch of Shimmie, if you know anything at all about running
 websites, this is the version to use.
@@ -23,14 +29,14 @@ check out one of the versioned branches.
 # Requirements
 
 - MySQL/MariaDB 5.1+ (with experimental support for PostgreSQL 9+ and SQLite 3)
-- PHP 5.4.8+
+- Stable PHP ([5.5 as of writing](https://en.wikipedia.org/wiki/PHP#Release_history))
 - GD or ImageMagick
 
 # Installation
 
 1. Download the latest release under [Releases](https://github.com/shish/shimmie2/releases).
-2. Create a blank database
-3. Unzip shimmie into a folder on the web host
+2. Unzip shimmie into a folder on the web host
+3. Create a blank database
 4. Visit the folder with a web browser
 5. Enter the location of the database
 6. Click "install". Hopefully you'll end up at the welcome screen; if
@@ -43,7 +49,7 @@ check out one of the versioned branches.
 3. Install [Composer](https://getcomposer.org/). (If you don't already have it)
 4. Run `composer global require "fxp/composer-asset-plugin:~1.1" --no-plugins`. (This is installed globally due to a known composer bug)
 5. Run `composer install` in the shimmie folder.
-6. Follow instructions noted in "Installation" (Excluding 1 & 3).
+6. Follow instructions noted in "Installation" starting from step 3.
 
 ## Upgrade from 2.3.X
 
@@ -155,7 +161,7 @@ Issue/Bug tracker: http://github.com/shish/shimmie2/issues
 
 All code is released under the [GNU GPL Version 2](http://www.gnu.org/licenses/gpl-2.0.html) unless mentioned otherwise.
 
-If you give shimmie to someone else, you have to give them the source (which should be easy, as PHP
-is an interpreted language...). If you want to add customisations to your own
-site, then those customisations belong to you, and you can do what you want
-with them.
+If you give shimmie to someone else, you have to give them the source (which
+should be easy, as PHP is an interpreted language...). If you want to add
+customisations to your own site, then those customisations belong to you,
+and you can do what you want with them.
diff --git a/core/util.inc.php b/core/util.inc.php
index 2b1b6a734..0cb81ede5 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -166,8 +166,15 @@ function xml_tag($name, $attrs=array(), $children=array()) {
 	return $xml;
 }
 
-// Original PHP code by Chirp Internet: www.chirp.com.au
-// Please acknowledge use of this code by including this header.
+/**
+ * Original PHP code by Chirp Internet: www.chirp.com.au
+ * Please acknowledge use of this code by including this header.
+ *
+ * @param string $string input data
+ * @param int $limit how long the string should be
+ * @param string $break where to break the string
+ * @param string $pad what to add to the end of the string after truncating
+ */
 function truncate($string, $limit, $break=" ", $pad="...") {
 	// return with no change if string is shorter than $limit
 	if(strlen($string) <= $limit) return $string;
@@ -1031,8 +1038,8 @@ function http_parse_headers ($raw_headers){
  * In cases like these, we need to make sure to check for them if the camelcase version does not exist.
  * 
  * @param array $headers
- * @param mixed $name
- * @return mixed
+ * @param string $name
+ * @return string|bool
  */
 function findHeader ($headers, $name) {
 	if (!is_array($headers)) {
@@ -1441,6 +1448,10 @@ function _set_event_listeners() {
 	}
 }
 
+/**
+ * @param array $event_listeners
+ * @param string $path
+ */
 function _dump_event_listeners($event_listeners, $path) {
 	$p = "<"."?php\n";
 
diff --git a/ext/ext_manager/theme.php b/ext/ext_manager/theme.php
index de939f651..001ab05ba 100644
--- a/ext/ext_manager/theme.php
+++ b/ext/ext_manager/theme.php
@@ -1,6 +1,11 @@
 <?php
 
 class ExtManagerTheme extends Themelet {
+	/**
+	 * @param Page $page
+	 * @param Extension[] $extensions
+	 * @param bool $editable
+	 */
 	public function display_table(Page $page, /*array*/ $extensions, /*bool*/ $editable) {
 		$h_en = $editable ? "<th>Enabled</th>" : "";
 		$html = "
diff --git a/ext/forum/main.php b/ext/forum/main.php
index 8a263364d..7432225c5 100644
--- a/ext/forum/main.php
+++ b/ext/forum/main.php
@@ -87,328 +87,347 @@ public function onUserPageBuilding(UserPageBuildingEvent $event) {
 
 
 	public function onPageRequest(PageRequestEvent $event) {
-            global $page, $user;
-            
-            if($event->page_matches("forum")) {
-                switch($event->get_arg(0)) {
-                    case "index":
-                    {
-                        $this->show_last_threads($page, $event, $user->is_admin());
-                        if(!$user->is_anonymous()) $this->theme->display_new_thread_composer($page);
-                        break;
-                    }
-                    case "view":
-                    {
-						$threadID = int_escape($event->get_arg(1));
-						$pageNumber = int_escape($event->get_arg(2));
-						list($errors) = $this->sanity_check_viewed_thread($threadID);
-						
+		global $page, $user;
+
+		if($event->page_matches("forum")) {
+			switch($event->get_arg(0)) {
+				case "index":
+					$this->show_last_threads($page, $event, $user->is_admin());
+					if(!$user->is_anonymous()) $this->theme->display_new_thread_composer($page);
+					break;
+				case "view":
+					$threadID = int_escape($event->get_arg(1));
+					$pageNumber = int_escape($event->get_arg(2));
+					list($errors) = $this->sanity_check_viewed_thread($threadID);
+
+					if($errors!=null)
+					{
+						$this->theme->display_error(500, "Error", $errors);
+						break;
+					}
+
+					$this->show_posts($event, $user->is_admin());
+					if($user->is_admin()) $this->theme->add_actions_block($page, $threadID);
+					if(!$user->is_anonymous()) $this->theme->display_new_post_composer($page, $threadID);
+					break;
+				case "new":
+					global $page;
+					$this->theme->display_new_thread_composer($page);
+					break;
+				case "create":
+					$redirectTo = "forum/index";
+					if (!$user->is_anonymous())
+					{
+						list($errors) = $this->sanity_check_new_thread();
+
 						if($errors!=null)
-                        {
-                            $this->theme->display_error(500, "Error", $errors);
-                            break;
-                        }
-						
-						$this->show_posts($event, $user->is_admin());
-						if($user->is_admin()) $this->theme->add_actions_block($page, $threadID);
-						if(!$user->is_anonymous()) $this->theme->display_new_post_composer($page, $threadID);
-                        break;
-                    }
-                    case "new":
-                    {
-						global $page;
-                        $this->theme->display_new_thread_composer($page);
-                        break;
-                    }
-                    case "create":
-                    {
-                        $redirectTo = "forum/index";
-                        if (!$user->is_anonymous())
-                        {
-                            list($errors) = $this->sanity_check_new_thread();
-
-                            if($errors!=null)
-                            {
-                                $this->theme->display_error(500, "Error", $errors);
-                                break;
-                            }
-
-                            $newThreadID = $this->save_new_thread($user);
-                            $this->save_new_post($newThreadID, $user);
-                            $redirectTo = "forum/view/".$newThreadID."/1";
-                        }
-
-                        $page->set_mode("redirect");
-                        $page->set_redirect(make_link($redirectTo));
-
-                        break;
-                    }
-					case "delete":
-						$threadID = int_escape($event->get_arg(1));
-						$postID = int_escape($event->get_arg(2));
-
-                        if ($user->is_admin()) {$this->delete_post($postID);}
-
-                        $page->set_mode("redirect");
-                        $page->set_redirect(make_link("forum/view/".$threadID));
-                        break;
-                    case "nuke":
-                        $threadID = int_escape($event->get_arg(1));
-
-                        if ($user->is_admin())
-                            $this->delete_thread($threadID);
-
-                        $page->set_mode("redirect");
-                        $page->set_redirect(make_link("forum/index"));
-                        break;
-                    case "answer":
-						$threadID = int_escape($_POST["threadID"]);
-						$total_pages = $this->get_total_pages_for_thread($threadID);
-                        if (!$user->is_anonymous())
-                        {
-                            list($errors) = $this->sanity_check_new_post();
-
-                            if ($errors!=null)
-                            {
-                                $this->theme->display_error(500, "Error", $errors);
-                                break;
-                            }
-                            $this->save_new_post($threadID, $user);
-                        }
-                        $page->set_mode("redirect");
-                        $page->set_redirect(make_link("forum/view/".$threadID."/".$total_pages));
-                        break;
-                    default:
-                    {
-                        $page->set_mode("redirect");
-                        $page->set_redirect(make_link("forum/index"));
-                        //$this->theme->display_error(400, "Invalid action", "You should check forum/index.");
-                        break;
-                    }
-                }
-            }
+						{
+							$this->theme->display_error(500, "Error", $errors);
+							break;
+						}
+
+						$newThreadID = $this->save_new_thread($user);
+						$this->save_new_post($newThreadID, $user);
+						$redirectTo = "forum/view/".$newThreadID."/1";
+					}
+
+					$page->set_mode("redirect");
+					$page->set_redirect(make_link($redirectTo));
+
+					break;
+				case "delete":
+					$threadID = int_escape($event->get_arg(1));
+					$postID = int_escape($event->get_arg(2));
+
+					if ($user->is_admin()) {$this->delete_post($postID);}
+
+					$page->set_mode("redirect");
+					$page->set_redirect(make_link("forum/view/".$threadID));
+					break;
+				case "nuke":
+					$threadID = int_escape($event->get_arg(1));
+
+					if ($user->is_admin())
+						$this->delete_thread($threadID);
+
+					$page->set_mode("redirect");
+					$page->set_redirect(make_link("forum/index"));
+					break;
+				case "answer":
+					$threadID = int_escape($_POST["threadID"]);
+					$total_pages = $this->get_total_pages_for_thread($threadID);
+					if (!$user->is_anonymous())
+					{
+						list($errors) = $this->sanity_check_new_post();
+
+						if ($errors!=null)
+						{
+							$this->theme->display_error(500, "Error", $errors);
+							break;
+						}
+						$this->save_new_post($threadID, $user);
+					}
+					$page->set_mode("redirect");
+					$page->set_redirect(make_link("forum/view/".$threadID."/".$total_pages));
+					break;
+				default:
+					$page->set_mode("redirect");
+					$page->set_redirect(make_link("forum/index"));
+					//$this->theme->display_error(400, "Invalid action", "You should check forum/index.");
+					break;
+			}
+		}
 	}
 
-        private function get_total_pages_for_thread(/*int*/ $threadID)
-        {
-            global $database, $config;
-            $result = $database->get_row("SELECT COUNT(1) AS count FROM forum_posts WHERE thread_id = ?", array($threadID));
-
-            return ceil($result["count"] / $config->get_int("forumPostsPerPage"));
-        }
-
-        private function sanity_check_new_thread()
-        {
-            $errors = null;
-            if (!array_key_exists("title", $_POST))
-            {
-                $errors .= "<div id='error'>No title supplied.</div>";
-            }
-            else if (strlen($_POST["title"]) == 0)
-            {
-                $errors .= "<div id='error'>You cannot have an empty title.</div>";
-            }
-            else if (strlen(html_escape($_POST["title"])) > 255)
-            {
-                $errors .= "<div id='error'>Your title is too long.</div>";
-            }
-
-            if (!array_key_exists("message", $_POST))
-            {
-                $errors .= "<div id='error'>No message supplied.</div>";
-            }
-            else if (strlen($_POST["message"]) == 0)
-            {
-                $errors .= "<div id='error'>You cannot have an empty message.</div>";
-            }
-
-            return array($errors);
-        }
-        private function sanity_check_new_post()
-        {
-            $errors = null;
-            if (!array_key_exists("threadID", $_POST))
-            {
-                $errors = "<div id='error'>No thread ID supplied.</div>";
-            }
-            else if (strlen($_POST["threadID"]) == 0)
-            {
-                $errors = "<div id='error'>No thread ID supplied.</div>";
-            }
-            else if (is_numeric($_POST["threadID"]))
-
-            if (!array_key_exists("message", $_POST))
-            {
-                $errors .= "<div id='error'>No message supplied.</div>";
-            }
-            else if (strlen($_POST["message"]) == 0)
-            {
-                $errors .= "<div id='error'>You cannot have an empty message.</div>";
-            }
-            
-            return array($errors);
-        }
-		private function sanity_check_viewed_thread($threadID)
-        {
-            $errors = null;
-            if (!$this->threadExists($threadID))
-            {
-                $errors = "<div id='error'>Inexistent thread.</div>";
-            }            
-            return array($errors);
-        }
-        private function get_thread_title($threadID)
-        {
-            global $database;
-            $result = $database->get_row("SELECT t.title FROM forum_threads AS t WHERE t.id = ? ", array($threadID));
-            return $result["title"];
-        }
-		
-        private function show_last_threads(Page $page, $event, $showAdminOptions = false)
-        {
-			global $config, $database;
-            $pageNumber = $event->get_arg(1);
-			$threadsPerPage = $config->get_int('forumThreadsPerPage', 15);
-			$totalPages = ceil($database->get_one("SELECT COUNT(*) FROM forum_threads") / $threadsPerPage);
-			
-            if(is_null($pageNumber) || !is_numeric($pageNumber))
-                $pageNumber = 0;
-            else if ($pageNumber <= 0)
-                $pageNumber = 0;
-			else if ($pageNumber >= $totalPages)
-                $pageNumber = $totalPages - 1;
-            else
-                $pageNumber--;
-
-            $threads = $database->get_all(
-                "SELECT f.id, f.sticky, f.title, f.date, f.uptodate, u.name AS user_name, u.email AS user_email, u.class AS user_class, sum(1) - 1 AS response_count ".
-                "FROM forum_threads AS f ".
-                "INNER JOIN users AS u ".
-                "ON f.user_id = u.id ".
-                "INNER JOIN forum_posts AS p ".
-                "ON p.thread_id = f.id ".
-                "GROUP BY f.id, f.sticky, f.title, f.date, u.name, u.email, u.class ".
-                "ORDER BY f.sticky ASC, f.uptodate DESC LIMIT :limit OFFSET :offset"
-                , array("limit"=>$threadsPerPage, "offset"=>$pageNumber * $threadsPerPage)
-            );
-			
-            $this->theme->display_thread_list($page, $threads, $showAdminOptions, $pageNumber + 1, $totalPages);
-        }
+	/**
+	 * @param int $threadID
+	 */
+	private function get_total_pages_for_thread($threadID)
+	{
+		global $database, $config;
+		$result = $database->get_row("SELECT COUNT(1) AS count FROM forum_posts WHERE thread_id = ?", array($threadID));
+
+		return ceil($result["count"] / $config->get_int("forumPostsPerPage"));
+	}
+
+	private function sanity_check_new_thread()
+	{
+		$errors = null;
+		if (!array_key_exists("title", $_POST))
+		{
+			$errors .= "<div id='error'>No title supplied.</div>";
+		}
+		else if (strlen($_POST["title"]) == 0)
+		{
+			$errors .= "<div id='error'>You cannot have an empty title.</div>";
+		}
+		else if (strlen(html_escape($_POST["title"])) > 255)
+		{
+			$errors .= "<div id='error'>Your title is too long.</div>";
+		}
+
+		if (!array_key_exists("message", $_POST))
+		{
+			$errors .= "<div id='error'>No message supplied.</div>";
+		}
+		else if (strlen($_POST["message"]) == 0)
+		{
+			$errors .= "<div id='error'>You cannot have an empty message.</div>";
+		}
+
+		return array($errors);
+	}
+
+	private function sanity_check_new_post()
+	{
+		$errors = null;
+		if (!array_key_exists("threadID", $_POST))
+		{
+			$errors = "<div id='error'>No thread ID supplied.</div>";
+		}
+		else if (strlen($_POST["threadID"]) == 0)
+		{
+			$errors = "<div id='error'>No thread ID supplied.</div>";
+		}
+		else if (is_numeric($_POST["threadID"]))
+
+			if (!array_key_exists("message", $_POST))
+			{
+				$errors .= "<div id='error'>No message supplied.</div>";
+			}
+			else if (strlen($_POST["message"]) == 0)
+			{
+				$errors .= "<div id='error'>You cannot have an empty message.</div>";
+			}
+
+		return array($errors);
+	}
+
+	/**
+	 * @param int $threadID
+	 */
+	private function sanity_check_viewed_thread($threadID)
+	{
+		$errors = null;
+		if (!$this->threadExists($threadID))
+		{
+			$errors = "<div id='error'>Inexistent thread.</div>";
+		}            
+		return array($errors);
+	}
+
+	/**
+	 * @param int $threadID
+	 */
+	private function get_thread_title($threadID)
+	{
+		global $database;
+		$result = $database->get_row("SELECT t.title FROM forum_threads AS t WHERE t.id = ? ", array($threadID));
+		return $result["title"];
+	}
 		
-		private function show_posts($event, $showAdminOptions = false)
-        {
-			global $config, $database;
-			$threadID = $event->get_arg(1);
-            $pageNumber = $event->get_arg(2);
-			$postsPerPage = $config->get_int('forumPostsPerPage', 15);
-			$totalPages = ceil($database->get_one("SELECT COUNT(*) FROM forum_posts WHERE thread_id = ?", array($threadID)) / $postsPerPage);
-			$threadTitle = $this->get_thread_title($threadID);
-			
-            if(is_null($pageNumber) || !is_numeric($pageNumber))
-                $pageNumber = 0;
-            else if ($pageNumber <= 0)
-                $pageNumber = 0;
-			else if ($pageNumber >= $totalPages)
-				$pageNumber = $totalPages - 1;
-            else
-                $pageNumber--;
-
-            $posts = $database->get_all(
-                "SELECT p.id, p.date, p.message, u.name as user_name, u.email AS user_email, u.class AS user_class ".
-                "FROM forum_posts AS p ".
-                "INNER JOIN users AS u ".
-                "ON p.user_id = u.id ".
-                "WHERE thread_id = :thread_id ".
+	private function show_last_threads(Page $page, PageRequestEvent $event, $showAdminOptions = false)
+	{
+		global $config, $database;
+		$pageNumber = $event->get_arg(1);
+		$threadsPerPage = $config->get_int('forumThreadsPerPage', 15);
+		$totalPages = ceil($database->get_one("SELECT COUNT(*) FROM forum_threads") / $threadsPerPage);
+
+		if(is_null($pageNumber) || !is_numeric($pageNumber))
+			$pageNumber = 0;
+		else if ($pageNumber <= 0)
+			$pageNumber = 0;
+		else if ($pageNumber >= $totalPages)
+			$pageNumber = $totalPages - 1;
+		else
+			$pageNumber--;
+
+		$threads = $database->get_all(
+				"SELECT f.id, f.sticky, f.title, f.date, f.uptodate, u.name AS user_name, u.email AS user_email, u.class AS user_class, sum(1) - 1 AS response_count ".
+				"FROM forum_threads AS f ".
+				"INNER JOIN users AS u ".
+				"ON f.user_id = u.id ".
+				"INNER JOIN forum_posts AS p ".
+				"ON p.thread_id = f.id ".
+				"GROUP BY f.id, f.sticky, f.title, f.date, u.name, u.email, u.class ".
+				"ORDER BY f.sticky ASC, f.uptodate DESC LIMIT :limit OFFSET :offset"
+				, array("limit"=>$threadsPerPage, "offset"=>$pageNumber * $threadsPerPage)
+				);
+
+		$this->theme->display_thread_list($page, $threads, $showAdminOptions, $pageNumber + 1, $totalPages);
+	}
+
+	private function show_posts(PageRequestEvent $event, $showAdminOptions = false)
+	{
+		global $config, $database;
+		$threadID = $event->get_arg(1);
+		$pageNumber = $event->get_arg(2);
+		$postsPerPage = $config->get_int('forumPostsPerPage', 15);
+		$totalPages = ceil($database->get_one("SELECT COUNT(*) FROM forum_posts WHERE thread_id = ?", array($threadID)) / $postsPerPage);
+		$threadTitle = $this->get_thread_title($threadID);
+
+		if(is_null($pageNumber) || !is_numeric($pageNumber))
+			$pageNumber = 0;
+		else if ($pageNumber <= 0)
+			$pageNumber = 0;
+		else if ($pageNumber >= $totalPages)
+			$pageNumber = $totalPages - 1;
+		else
+			$pageNumber--;
+
+		$posts = $database->get_all(
+				"SELECT p.id, p.date, p.message, u.name as user_name, u.email AS user_email, u.class AS user_class ".
+				"FROM forum_posts AS p ".
+				"INNER JOIN users AS u ".
+				"ON p.user_id = u.id ".
+				"WHERE thread_id = :thread_id ".
 				"ORDER BY p.date ASC ".
-                "LIMIT :limit OFFSET :offset"
-                , array("thread_id"=>$threadID, "offset"=>$pageNumber * $postsPerPage, "limit"=>$postsPerPage)
-            );
-			$this->theme->display_thread($posts, $showAdminOptions, $threadTitle, $threadID, $pageNumber + 1, $totalPages);
-        }
-
-        private function save_new_thread($user)
-        {
-            $title = html_escape($_POST["title"]);
-			$sticky = !empty($_POST["sticky"]) ? html_escape($_POST["sticky"]) : "N";
-			
-			if($sticky == ""){
+				"LIMIT :limit OFFSET :offset"
+				, array("thread_id"=>$threadID, "offset"=>$pageNumber * $postsPerPage, "limit"=>$postsPerPage)
+				);
+		$this->theme->display_thread($posts, $showAdminOptions, $threadTitle, $threadID, $pageNumber + 1, $totalPages);
+	}
+
+	private function save_new_thread(User $user)
+	{
+		$title = html_escape($_POST["title"]);
+		$sticky = !empty($_POST["sticky"]) ? html_escape($_POST["sticky"]) : "N";
+
+		if($sticky == ""){
 			$sticky = "N";
-			}
+		}
 
-            global $database;
-            $database->execute("
-                INSERT INTO forum_threads
-                    (title, sticky, user_id, date, uptodate)
-                VALUES
-                    (?, ?, ?, now(), now())",
-                array($title, $sticky, $user->id));
-				
-            $threadID = $database->get_last_insert_id("forum_threads_id_seq");
-			
-			log_info("forum", "Thread {$threadID} created by {$user->name}");
-			
-            return $threadID;
-        }
-
-        private function save_new_post($threadID, $user)
-        {
-			global $config;
-            $userID = $user->id;
-            $message = html_escape($_POST["message"]);
-			
-			$max_characters = $config->get_int('forumMaxCharsPerPost');
-			$message = substr($message, 0, $max_characters);
-
-            global $database;
-            $database->execute("INSERT INTO forum_posts
-                    (thread_id, user_id, date, message)
-                VALUES
-                    (?, ?, now(), ?)"
-                , array($threadID, $userID, $message));
-			
-			$postID = $database->get_last_insert_id("forum_posts_id_seq");
-			
-			log_info("forum", "Post {$postID} created by {$user->name}");
-			
-			$database->execute("UPDATE forum_threads SET uptodate=now() WHERE id=?", array ($threadID));
-        }
-
-        private function retrieve_posts($threadID, $pageNumber)
-        {
-            global $database, $config;
-            $postsPerPage = $config->get_int('forumPostsPerPage', 15);
-
-            return $database->get_all(
-                "SELECT p.id, p.date, p.message, u.name as user_name, u.email AS user_email, u.class AS user_class ".
-                "FROM forum_posts AS p ".
-                "INNER JOIN users AS u ".
-                "ON p.user_id = u.id ".
-                "WHERE thread_id = :thread_id ".
+		global $database;
+		$database->execute("
+				INSERT INTO forum_threads
+				(title, sticky, user_id, date, uptodate)
+				VALUES
+				(?, ?, ?, now(), now())",
+				array($title, $sticky, $user->id));
+
+		$threadID = $database->get_last_insert_id("forum_threads_id_seq");
+
+		log_info("forum", "Thread {$threadID} created by {$user->name}");
+
+		return $threadID;
+	}
+
+	/**
+	 * @param int $threadID
+	 */
+	private function save_new_post($threadID, User $user)
+	{
+		global $config;
+		$userID = $user->id;
+		$message = html_escape($_POST["message"]);
+
+		$max_characters = $config->get_int('forumMaxCharsPerPost');
+		$message = substr($message, 0, $max_characters);
+
+		global $database;
+		$database->execute("INSERT INTO forum_posts
+				(thread_id, user_id, date, message)
+				VALUES
+				(?, ?, now(), ?)"
+				, array($threadID, $userID, $message));
+
+		$postID = $database->get_last_insert_id("forum_posts_id_seq");
+
+		log_info("forum", "Post {$postID} created by {$user->name}");
+
+		$database->execute("UPDATE forum_threads SET uptodate=now() WHERE id=?", array ($threadID));
+	}
+
+	/**
+	 * @param int $threadID
+	 * @param int $pageNumber
+	 */
+	private function retrieve_posts($threadID, $pageNumber)
+	{
+		global $database, $config;
+		$postsPerPage = $config->get_int('forumPostsPerPage', 15);
+
+		return $database->get_all(
+				"SELECT p.id, p.date, p.message, u.name as user_name, u.email AS user_email, u.class AS user_class ".
+				"FROM forum_posts AS p ".
+				"INNER JOIN users AS u ".
+				"ON p.user_id = u.id ".
+				"WHERE thread_id = :thread_id ".
 				"ORDER BY p.date ASC ".
-                "LIMIT :limit OFFSET :offset "
-                , array("thread_id"=>$threadID, "offset"=>($pageNumber - 1) * $postsPerPage, "limit"=>$postsPerPage));
-        }
-
-        private function delete_thread($threadID)
-        {
-            global $database;
-            $database->execute("DELETE FROM forum_threads WHERE id = ?", array($threadID));
-			$database->execute("DELETE FROM forum_posts WHERE thread_id = ?", array($threadID));
-        }
-		
-		private function delete_post($postID)
-        {
-            global $database;
-            $database->execute("DELETE FROM forum_posts WHERE id = ?", array($postID));
-        }
-		private function threadExists($threadID){
-			global $database;
-			$result=$database->get_one("SELECT EXISTS (SELECT * FROM forum_threads WHERE id= ?)", array($threadID));
-			if ($result==1){
-				return true;
-			}else{
-				return false;
-			}
+				"LIMIT :limit OFFSET :offset "
+				, array("thread_id"=>$threadID, "offset"=>($pageNumber - 1) * $postsPerPage, "limit"=>$postsPerPage));
+	}
+
+	/**
+	 * @param int $threadID
+	 */
+	private function delete_thread($threadID)
+	{
+		global $database;
+		$database->execute("DELETE FROM forum_threads WHERE id = ?", array($threadID));
+		$database->execute("DELETE FROM forum_posts WHERE thread_id = ?", array($threadID));
+	}
+
+	/**
+	 * @param int $postID
+	 */
+	private function delete_post($postID)
+	{
+		global $database;
+		$database->execute("DELETE FROM forum_posts WHERE id = ?", array($postID));
+	}
+
+	/**
+	 * @param int $threadID
+	 */
+	private function threadExists($threadID)
+	{
+		global $database;
+		$result=$database->get_one("SELECT EXISTS (SELECT * FROM forum_threads WHERE id= ?)", array($threadID));
+		if ($result==1){
+			return true;
+		}else{
+			return false;
 		}
+	}
 }
-
diff --git a/ext/handle_svg/main.php b/ext/handle_svg/main.php
index e4f2f9fe1..807b23596 100644
--- a/ext/handle_svg/main.php
+++ b/ext/handle_svg/main.php
@@ -101,6 +101,7 @@ class MiniSVGParser {
 	/** @var int */
 	public $height=0;
 
+	/** @param string $file */
 	function __construct($file) {
 		$xml_parser = xml_parser_create();
 		xml_set_element_handler($xml_parser, array($this, "startElement"), array($this, "endElement"));
diff --git a/ext/handle_video/main.php b/ext/handle_video/main.php
index e25674128..c256b3f2f 100644
--- a/ext/handle_video/main.php
+++ b/ext/handle_video/main.php
@@ -133,7 +133,7 @@ protected function supported_ext($ext) {
 	/**
 	 * @param string $filename
 	 * @param mixed[] $metadata
-	 * @return Image|null
+	 * @return Image
 	 */
 	protected function create_image_from_data($filename, $metadata) {
 
diff --git a/ext/ouroboros_api/main.php b/ext/ouroboros_api/main.php
index 69a984339..c6b0f64bb 100644
--- a/ext/ouroboros_api/main.php
+++ b/ext/ouroboros_api/main.php
@@ -587,9 +587,9 @@ protected function postShow($id = null)
 
     /**
      * Wrapper for getting a list of posts
-     * @param $limit
-     * @param $page
-     * @param $tags
+     * @param int $limit
+     * @param int $page
+     * @param string[] $tags
      */
     protected function postIndex($limit, $page, $tags)
     {
@@ -611,13 +611,13 @@ protected function postIndex($limit, $page, $tags)
 
     /**
      * Wrapper for getting a list of tags
-     * @param $limit
-     * @param $page
-     * @param $order
-     * @param $id
-     * @param $after_id
-     * @param $name
-     * @param $name_pattern
+     * @param int $limit
+     * @param int $page
+     * @param string $order
+     * @param int $id
+     * @param int $after_id
+     * @param string $name
+     * @param string $name_pattern
      */
     protected function tagIndex($limit, $page, $order, $id, $after_id, $name, $name_pattern)
     {
@@ -830,7 +830,7 @@ private function tryAuth()
 
     /**
      * Helper for matching API methods from event
-     * @param $page
+     * @param string $page
      * @return bool
      */
     private function match($page)
diff --git a/ext/resize/main.php b/ext/resize/main.php
index 02d7bf96a..b4cb19ed9 100644
--- a/ext/resize/main.php
+++ b/ext/resize/main.php
@@ -18,6 +18,7 @@
 class ImageResizeException extends SCoreException {
 	var $error;
 
+	/** @param string $error */
 	public function __construct($error) {
 		$this->error = $error;
 	}
@@ -282,7 +283,7 @@ private function resize_image(Image $image_obj, /*int*/ $width, /*int*/ $height)
 	 * Check Memory usage limits
 	 *
 	 * Old check:   $memory_use = (filesize($image_filename)*2) + ($width*$height*4) + (4*1024*1024);
-	 * New check:    memory_use = width * height * (bits per channel) * channels * 2.5
+	 * New check:   $memory_use = $width * $height * ($bits_per_channel) * channels * 2.5
 	 *
 	 * It didn't make sense to compute the memory usage based on the NEW size for the image. ($width*$height*4)
 	 * We need to consider the size that we are GOING TO instead.
@@ -290,24 +291,25 @@ private function resize_image(Image $image_obj, /*int*/ $width, /*int*/ $height)
 	 * The factor of 2.5 is simply a rough guideline.
 	 * http://stackoverflow.com/questions/527532/reasonable-php-memory-limit-for-image-resize
 	 *
-	 * @param $info
+	 * @param mixed[] $info
 	 * @return int
 	 */
 	private function calc_memory_use($info) {
 		if (isset($info['bits']) && isset($info['channels'])) {
-			return $memory_use = ($info[0] * $info[1] * ($info['bits'] / 8) * $info['channels'] * 2.5) / 1024;
+			$memory_use = ($info[0] * $info[1] * ($info['bits'] / 8) * $info['channels'] * 2.5) / 1024;
 		}
 		else {
 			// If we don't have bits and channel info from the image then assume default values
 			// of 8 bits per color and 4 channels (R,G,B,A) -- ie: regular 24-bit color
-			return $memory_use = ($info[0] * $info[1] * 1 * 4 * 2.5) / 1024;
+			$memory_use = ($info[0] * $info[1] * 1 * 4 * 2.5) / 1024;
 		}
+		return (int)$memory_use;
 	}
 
 	/**
 	 * @param Image $image_obj
-	 * @param $width
-	 * @param $height
+	 * @param int $width
+	 * @param int $height
 	 * @return int[]
 	 */
 	private function calc_new_size(Image $image_obj, $width, $height) {
@@ -320,7 +322,7 @@ private function calc_new_size(Image $image_obj, $width, $height) {
 			// Scale the new image
 			if ($width == 0) $factor = $height / $image_obj->height;
 			elseif ($height == 0) $factor = $width / $image_obj->width;
-			else                    $factor = min($width / $image_obj->width, $height / $image_obj->height);
+			else                  $factor = min($width / $image_obj->width, $height / $image_obj->height);
 
 			$new_width = round($image_obj->width * $factor);
 			$new_height = round($image_obj->height * $factor);
diff --git a/ext/shimmie_api/main.php b/ext/shimmie_api/main.php
index 7fb13d47d..a672f85b2 100644
--- a/ext/shimmie_api/main.php
+++ b/ext/shimmie_api/main.php
@@ -128,8 +128,8 @@ private function api_get_tags($arg) {
 	}
 
 	/**
-	 * @param $type
-	 * @param $query
+	 * @param string $type
+	 * @param string $query
 	 * @return array
 	 */
 	private function api_get_user($type, $query) {
diff --git a/ext/statsd/main.php b/ext/statsd/main.php
index 5267495ff..79fe7030f 100644
--- a/ext/statsd/main.php
+++ b/ext/statsd/main.php
@@ -18,6 +18,7 @@ function dstat($name, $val) {
 class StatsDInterface extends Extension {
 	public static $stats = array();
 
+	/** @param string $type */
 	private function _stats($type) {
 		global $_shm_event_count, $database, $_shm_load_start;
 		$time = microtime(true) - $_shm_load_start;
@@ -32,7 +33,7 @@ private function _stats($type) {
 		StatsDInterface::$stats["shimmie.$type.cache-misses"] = $database->cache->get_misses()."|c";
 	}
 
-	public function onPageRequest($event) {
+	public function onPageRequest(PageRequestEvent $event) {
 		$this->_stats("overall");
 
 		if($event->page_matches("post/view")) {  # 40%
@@ -64,19 +65,19 @@ public function onPageRequest($event) {
 		StatsDInterface::$stats = array();
 	}
 
-	public function onUserCreation($event) {
+	public function onUserCreation(UserCreationEvent $event) {
 		StatsDInterface::$stats["shimmie.events.user_creations"] = "1|c";
 	}
 
-	public function onDataUpload($event) {
+	public function onDataUpload(DataUploadEvent $event) {
 		StatsDInterface::$stats["shimmie.events.uploads"] = "1|c";
 	}
 
-	public function onCommentPosting($event) {
+	public function onCommentPosting(CommentPostingEvent $event) {
 		StatsDInterface::$stats["shimmie.events.comments"] = "1|c";
 	}
 
-	public function onImageInfoSet($event) {
+	public function onImageInfoSet(ImageInfoSetEvent $event) {
 		StatsDInterface::$stats["shimmie.events.info-sets"] = "1|c";
 	}
 
@@ -85,7 +86,10 @@ public function onImageInfoSet($event) {
 	 */
 	public function get_priority() {return 99;}
 
-
+	/**
+	 * @param array $data
+	 * @param int $sampleRate
+	 */
     private function send($data, $sampleRate=1) {
         if (!STATSD_HOST) { return; }
 
diff --git a/ext/tag_edit/main.php b/ext/tag_edit/main.php
index d6ac16bda..e05d3b5f9 100644
--- a/ext/tag_edit/main.php
+++ b/ext/tag_edit/main.php
@@ -98,6 +98,10 @@ class TagSetEvent extends Event {
 	public $tags;
 	public $metatags;
 
+	/**
+	 * @param Image $image
+	 * @param string $tags
+	 */
 	public function __construct(Image $image, $tags) {
 		$this->image    = $image;
 
@@ -165,6 +169,11 @@ class TagTermParseEvent extends Event {
 	/** @var bool */
 	public $parse  = TRUE; //marks the tag to be parsed, and not just checked if valid metatag
 
+	/**
+	 * @param string $term
+	 * @param int $id
+	 * @param bool $parse
+	 */
 	public function __construct($term, $id, $parse) {
 		$this->term  = $term;
 		$this->id    = $id;
diff --git a/ext/tag_history/main.php b/ext/tag_history/main.php
index eefe8cd03..124fddacf 100644
--- a/ext/tag_history/main.php
+++ b/ext/tag_history/main.php
@@ -248,8 +248,12 @@ public function get_global_tag_history($page_id) {
 		return ($row ? $row : array());
 	}
 	
-	/*
+	/**
 	 * This function attempts to revert all changes by a given IP within an (optional) timeframe.
+	 *
+	 * @param string $name
+	 * @param string $ip
+	 * @param string $date
 	 */
 	public function process_revert_all_changes($name, $ip, $date) {
 		global $database;
diff --git a/ext/tagger/main.php b/ext/tagger/main.php
index 04725f602..42d9e01a3 100644
--- a/ext/tagger/main.php
+++ b/ext/tagger/main.php
@@ -57,6 +57,7 @@ public function onPageRequest(PageRequestEvent $event) {
 		}
 	}
 
+	/** @param string $s */
 	private function match_tag_list ($s) {
 		global $database, $config;
 
@@ -101,6 +102,7 @@ private function match_tag_list ($s) {
 		return $this->list_to_xml($tags,"search",$s,$count);
 	}
 
+	/** @param int $image_id */
 	private function image_tag_list ($image_id) {
 		global $database;
 		$tags = $database->Execute("
@@ -110,6 +112,12 @@ private function image_tag_list ($image_id) {
 		return $this->list_to_xml($tags,"image",$image_id);
 	}
 
+	/**
+	 * @param PDOStatement $tags
+	 * @param string $type
+	 * @param string $query
+	 * @param array $misc
+	 */
 	private function list_to_xml ($tags,$type,$query,$misc=null) {
 		$r = $tags->_numOfRows;
 
diff --git a/themes/danbooru/index.theme.php b/themes/danbooru/index.theme.php
index 9a26a4d67..4c966ebd5 100644
--- a/themes/danbooru/index.theme.php
+++ b/themes/danbooru/index.theme.php
@@ -3,7 +3,7 @@
 class CustomIndexTheme extends IndexTheme {
 	/**
 	 * @param Page $page
-	 * @param null|Image[] $images
+	 * @param Image[] $images
 	 */
 	public function display_page(Page $page, $images) {
 		global $config;
@@ -40,7 +40,7 @@ public function display_page(Page $page, $images) {
 	/**
 	 * @param int $page_number
 	 * @param int $total_pages
-	 * @param array $search_terms
+	 * @param string[] $search_terms
 	 * @return string
 	 */
 	protected function build_navigation($page_number, $total_pages, $search_terms) {
diff --git a/themes/danbooru/layout.class.php b/themes/danbooru/layout.class.php
index ce8fa61ed..9ac3a7b4d 100644
--- a/themes/danbooru/layout.class.php
+++ b/themes/danbooru/layout.class.php
@@ -43,7 +43,7 @@
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 class Layout {
-	public function display_page($page) {
+	public function display_page(Page $page) {
 		global $config, $user;
 
 		$theme_name = $config->get_string('theme');
@@ -233,10 +233,16 @@ public function display_page($page) {
 EOD;
 	}
 	
-	private function navlinks($link, $desc, $pages_matched) {
 	/**
-	 * Woo! We can actually SEE THE CURRENT PAGE!! (well... see it highlighted in the menu.)
+	 * @param string $link
+	 * @param string $desc
+	 * @param string[] $pages_matched
+	 * @return string
 	 */
+	private function navlinks($link, $desc, $pages_matched) {
+		/**
+		 * Woo! We can actually SEE THE CURRENT PAGE!! (well... see it highlighted in the menu.)
+		 */
 		$html = null;
 		$url = ltrim(_get_query(), "/");
 

From 333c74ba356fb0fdba60f5dd7fe8fd93b3052ade Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 19 Jun 2016 17:48:10 +0100
Subject: [PATCH 145/250] typo

---
 ext/ext_manager/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ext_manager/theme.php b/ext/ext_manager/theme.php
index 001ab05ba..53732529f 100644
--- a/ext/ext_manager/theme.php
+++ b/ext/ext_manager/theme.php
@@ -3,7 +3,7 @@
 class ExtManagerTheme extends Themelet {
 	/**
 	 * @param Page $page
-	 * @param Extension[] $extensions
+	 * @param ExtensionInfo[] $extensions
 	 * @param bool $editable
 	 */
 	public function display_table(Page $page, /*array*/ $extensions, /*bool*/ $editable) {

From f8b7909426bb2a52cc8d90658728047bb073386b Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 19 Jun 2016 22:15:46 +0100
Subject: [PATCH 146/250] ExtensionInfo isn't private

---
 ext/ext_manager/main.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ext/ext_manager/main.php b/ext/ext_manager/main.php
index ee465965a..313ea1513 100644
--- a/ext/ext_manager/main.php
+++ b/ext/ext_manager/main.php
@@ -17,7 +17,6 @@ function __extman_extcmp(ExtensionInfo $a, ExtensionInfo $b) {
 	return strcmp($a->name, $b->name);
 }
 
-/** @private */
 class ExtensionInfo {
 	var $ext_name, $name, $link, $author, $email;
 	var $description, $documentation, $version, $visibility;

From 6febdec7b5d7210c2ff4618b2e6a632b342fe160 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 19 Jun 2016 23:05:57 +0100
Subject: [PATCH 147/250] more explicit variable types

---
 core/config.class.php                 |  6 +++---
 core/database.class.php               |  8 ++++----
 core/extension.class.php              |  4 ----
 ext/bulk_add/theme.php                |  2 +-
 ext/bulk_add_csv/theme.php            |  2 +-
 ext/comment/main.php                  |  8 ++++----
 ext/comment/theme.php                 | 12 ++++++------
 ext/ext_manager/main.php              |  6 +++---
 ext/image/main.php                    |  8 +++++---
 ext/image_hash_ban/main.php           |  6 +++---
 ext/index/main.php                    |  2 +-
 ext/index/theme.php                   |  2 +-
 ext/ipban/main.php                    |  8 ++++----
 ext/log_net/main.php                  |  2 +-
 ext/numeric_score/main.php            |  2 +-
 ext/pm/main.php                       |  4 ++--
 ext/resize/main.php                   |  2 +-
 ext/source_history/theme.php          |  2 +-
 ext/tag_categories/theme.php          |  4 ++--
 ext/tag_history/theme.php             |  2 +-
 ext/tag_list/test.php                 |  2 +-
 ext/user/main.php                     |  2 +-
 ext/view/main.php                     |  4 ++--
 ext/wiki/main.php                     | 14 ++++++++++----
 themes/danbooru2/custompage.class.php |  2 +-
 themes/futaba/custompage.class.php    |  2 +-
 26 files changed, 61 insertions(+), 57 deletions(-)

diff --git a/core/config.class.php b/core/config.class.php
index dd488b460..dc7e85baf 100644
--- a/core/config.class.php
+++ b/core/config.class.php
@@ -151,7 +151,7 @@ public function get_array(/*string*/ $name, $default=array());
  * left to the concrete implementation
  */
 abstract class BaseConfig implements Config {
-	var $values = array();
+	public $values = array();
 
 	/**
 	 * @param string $name
@@ -366,8 +366,8 @@ public function save(/*string*/ $name=null) {
  * \endcode
  */
 class DatabaseConfig extends BaseConfig {
-	/** @var \Database|null  */
-	var $database = null;
+	/** @var Database  */
+	private $database = null;
 
 	/**
 	 * Load the config table from a database.
diff --git a/core/database.class.php b/core/database.class.php
index 13cf612c7..27037ab1e 100644
--- a/core/database.class.php
+++ b/core/database.class.php
@@ -357,7 +357,7 @@ public function get_misses() {return $this->misses;}
 }
 
 class APCCache implements CacheEngine {
-	var $hits=0, $misses=0;
+	public $hits=0, $misses=0;
 
 	public function __construct($args) {
 		// $args is not used, but is passed in when APC cache is created.
@@ -755,11 +755,11 @@ public function count_tables() {
 
 class MockDatabase extends Database {
 	/** @var int */
-	var $query_id = 0;
+	private $query_id = 0;
 	/** @var array */
-	var $responses = array();
+	private $responses = array();
 	/** @var \NoCache|null  */
-	var $cache = null;
+	public $cache = null;
 
 	/**
 	 * @param array $responses
diff --git a/core/extension.class.php b/core/extension.class.php
index 06c2c5b5a..2267e63a5 100644
--- a/core/extension.class.php
+++ b/core/extension.class.php
@@ -88,15 +88,11 @@ abstract class Extension {
 	/** this theme's Themelet object */
 	public $theme;
 
-	/** @private */
-	var $_child;
-
 	// in PHP5.3, late static bindings can take care of this; __CLASS__
 	// used here will refer to the subclass
 	// http://php.net/manual/en/language.oop5.late-static-bindings.php
 	/** @private */
 	public function i_am(Extension $child) {
-		$this->_child = $child;
 		if(is_null($this->theme)) $this->theme = $this->get_theme_object($child, false);
 	}
 
diff --git a/ext/bulk_add/theme.php b/ext/bulk_add/theme.php
index 99ed1754e..98cd9b7fb 100644
--- a/ext/bulk_add/theme.php
+++ b/ext/bulk_add/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class BulkAddTheme extends Themelet {
-	var $messages = array();
+	private $messages = array();
 
 	/*
 	 * Show a standard page for results to be put into
diff --git a/ext/bulk_add_csv/theme.php b/ext/bulk_add_csv/theme.php
index 72b8d674d..88fcc41dc 100644
--- a/ext/bulk_add_csv/theme.php
+++ b/ext/bulk_add_csv/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class BulkAddCSVTheme extends Themelet {
-	var $messages = array();
+	private $messages = array();
 
 	/*
 	 * Show a standard page for results to be put into
diff --git a/ext/comment/main.php b/ext/comment/main.php
index b8bdd4819..dfb769e0e 100644
--- a/ext/comment/main.php
+++ b/ext/comment/main.php
@@ -53,9 +53,9 @@ public function __construct($comment_id) {
 class CommentPostingException extends SCoreException {}
 
 class Comment {
-	var $owner, $owner_id, $owner_name, $owner_email, $owner_class;
-	var $comment, $comment_id;
-	var $image_id, $poster_ip, $posted;
+	public $owner, $owner_id, $owner_name, $owner_email, $owner_class;
+	public $comment, $comment_id;
+	public $image_id, $poster_ip, $posted;
 
 	public function __construct($row) {
 		$this->owner = null;
@@ -94,7 +94,7 @@ public function get_owner() {
 
 class CommentList extends Extension {
 	/** @var CommentListTheme $theme */
-	var $theme;
+	public $theme;
 
 	public function onInitExt(InitExtEvent $event) {
 		global $config, $database;
diff --git a/ext/comment/theme.php b/ext/comment/theme.php
index 3d1e3a1b1..20e963f94 100644
--- a/ext/comment/theme.php
+++ b/ext/comment/theme.php
@@ -1,11 +1,11 @@
 <?php
 class CommentListTheme extends Themelet {
-	var $comments_shown = 0;
-	var $show_anon_id = false;
-	var $anon_id = 1;
-	var $anon_cid = 0;
-	var $anon_map = array();
-	var $ct = null;
+	private $comments_shown = 0;
+	private $show_anon_id = false;
+	private $anon_id = 1;
+	private $anon_cid = 0;
+	private $anon_map = array();
+	private $ct = null;
 
 	private function get_anon_colour($ip) {
 		if(is_null($this->ct)) {
diff --git a/ext/ext_manager/main.php b/ext/ext_manager/main.php
index 313ea1513..e92eea96f 100644
--- a/ext/ext_manager/main.php
+++ b/ext/ext_manager/main.php
@@ -18,9 +18,9 @@ function __extman_extcmp(ExtensionInfo $a, ExtensionInfo $b) {
 }
 
 class ExtensionInfo {
-	var $ext_name, $name, $link, $author, $email;
-	var $description, $documentation, $version, $visibility;
-	var $enabled;
+	public $ext_name, $name, $link, $author, $email;
+	public $description, $documentation, $version, $visibility;
+	public $enabled;
 
 	public function __construct($main) {
 		$matches = array();
diff --git a/ext/image/main.php b/ext/image/main.php
index 71c829a2d..fb1101065 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -12,8 +12,10 @@
  * An image is being added to the database.
  */
 class ImageAdditionEvent extends Event {
-	var $user;
-	/** @var \Image */
+	/** @var User */
+	public $user;
+
+	/** @var Image */
 	public $image;
 	
 	/**
@@ -30,7 +32,7 @@ public function __construct(Image $image) {
 }
 
 class ImageAdditionException extends SCoreException {
-	var $error;
+	public $error;
 
 	/**
 	 * @param string $error
diff --git a/ext/image_hash_ban/main.php b/ext/image_hash_ban/main.php
index 07a361749..431d2cf79 100644
--- a/ext/image_hash_ban/main.php
+++ b/ext/image_hash_ban/main.php
@@ -11,7 +11,7 @@
 
  // RemoveImageHashBanEvent {{{
 class RemoveImageHashBanEvent extends Event {
-	var $hash;
+	public $hash;
 
 	/**
 	 * @param string $hash
@@ -23,8 +23,8 @@ public function __construct($hash) {
 // }}}
 // AddImageHashBanEvent {{{
 class AddImageHashBanEvent extends Event {
-	var $hash;
-	var $reason;
+	public $hash;
+	public $reason;
 
 	/**
 	 * @param string $hash
diff --git a/ext/index/main.php b/ext/index/main.php
index 78404fe68..742cdf4a8 100644
--- a/ext/index/main.php
+++ b/ext/index/main.php
@@ -225,7 +225,7 @@ public function add_control(/*string*/ $html, /*int*/ $position=50) {
 }
 
 class Index extends Extension {
-	var $stpen = 0;  // search term parse event number
+	private $stpen = 0;  // search term parse event number
 
 	public function onInitExt(InitExtEvent $event) {
 		global $config;
diff --git a/ext/index/theme.php b/ext/index/theme.php
index dbe210941..a574555b9 100644
--- a/ext/index/theme.php
+++ b/ext/index/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class IndexTheme extends Themelet {
-	var $page_number, $total_pages, $search_terms;
+	private $page_number, $total_pages, $search_terms;
 
 	/**
 	 * @param int $page_number
diff --git a/ext/ipban/main.php b/ext/ipban/main.php
index ee9207e65..0469e5930 100644
--- a/ext/ipban/main.php
+++ b/ext/ipban/main.php
@@ -14,7 +14,7 @@
 
 // RemoveIPBanEvent {{{
 class RemoveIPBanEvent extends Event {
-	var $id;
+	public $id;
 
 	public function __construct($id) {
 		$this->id = $id;
@@ -23,9 +23,9 @@ public function __construct($id) {
 // }}}
 // AddIPBanEvent {{{
 class AddIPBanEvent extends Event {
-	var $ip;
-	var $reason;
-	var $end;
+	public $ip;
+	public $reason;
+	public $end;
 
 	public function __construct(/*string(ip)*/ $ip, /*string*/ $reason, /*string*/ $end) {
 		$this->ip = trim($ip);
diff --git a/ext/log_net/main.php b/ext/log_net/main.php
index 8a0fdd8a0..f5e071751 100644
--- a/ext/log_net/main.php
+++ b/ext/log_net/main.php
@@ -8,7 +8,7 @@
  */
 
 class LogNet extends Extension {
-	var $count = 0;
+	private $count = 0;
 
 	public function onLog(LogEvent $event) {
 		global $user;
diff --git a/ext/numeric_score/main.php b/ext/numeric_score/main.php
index 9286e7e2f..2b6f49eb2 100644
--- a/ext/numeric_score/main.php
+++ b/ext/numeric_score/main.php
@@ -11,7 +11,7 @@
  */
 
 class NumericScoreSetEvent extends Event {
-	var $image_id, $user, $score;
+	public $image_id, $user, $score;
 
 	/**
 	 * @param int $image_id
diff --git a/ext/pm/main.php b/ext/pm/main.php
index a0bb8c7ea..6de56ad7b 100644
--- a/ext/pm/main.php
+++ b/ext/pm/main.php
@@ -11,7 +11,7 @@
  */
 
 class SendPMEvent extends Event {
-	var $pm;
+	public $pm;
 
 	public function __construct(PM $pm) {
 		$this->pm = $pm;
@@ -19,7 +19,7 @@ public function __construct(PM $pm) {
 }
 
 class PM {
-	var $id, $from_id, $from_ip, $to_id, $sent_date, $subject, $message, $is_read;
+	public $id, $from_id, $from_ip, $to_id, $sent_date, $subject, $message, $is_read;
 
 	public function __construct($from_id=0, $from_ip="0.0.0.0", $to_id=0, $subject="A Message", $message="Some Text", $read=False) {
 		# PHP: the P stands for "really", the H stands for "awful" and the other P stands for "language"
diff --git a/ext/resize/main.php b/ext/resize/main.php
index b4cb19ed9..70e34f271 100644
--- a/ext/resize/main.php
+++ b/ext/resize/main.php
@@ -16,7 +16,7 @@
  * This class is just a wrapper around SCoreException.
  */
 class ImageResizeException extends SCoreException {
-	var $error;
+	public $error;
 
 	/** @param string $error */
 	public function __construct($error) {
diff --git a/ext/source_history/theme.php b/ext/source_history/theme.php
index 27ea3856f..c02ee222d 100644
--- a/ext/source_history/theme.php
+++ b/ext/source_history/theme.php
@@ -1,6 +1,6 @@
 <?php
 class Source_HistoryTheme extends Themelet {
-	var $messages = array();
+	private $messages = array();
 
 	/**
 	 * @param Page $page
diff --git a/ext/tag_categories/theme.php b/ext/tag_categories/theme.php
index 52c192cd8..cb98b7e33 100644
--- a/ext/tag_categories/theme.php
+++ b/ext/tag_categories/theme.php
@@ -1,8 +1,8 @@
 <?php
 
 class TagCategoriesTheme extends Themelet {
-    var $heading = "";
-    var $list = "";
+	private $heading = "";
+	private $list = "";
 
     public function show_tag_categories($page, $tc_dict) {
         $tc_block_index = 0;
diff --git a/ext/tag_history/theme.php b/ext/tag_history/theme.php
index db824d533..2f358546c 100644
--- a/ext/tag_history/theme.php
+++ b/ext/tag_history/theme.php
@@ -5,7 +5,7 @@
  */
 
 class Tag_HistoryTheme extends Themelet {
-	var $messages = array();
+	private $messages = array();
 
 	/**
 	 * @param Page $page
diff --git a/ext/tag_list/test.php b/ext/tag_list/test.php
index 3d9b464f1..7fe82e725 100644
--- a/ext/tag_list/test.php
+++ b/ext/tag_list/test.php
@@ -1,6 +1,6 @@
 <?php
 class TagListTest extends ShimmiePHPUnitTestCase {
-	var $pages = array("map", "alphabetic", "popularity", "categories");
+	private $pages = array("map", "alphabetic", "popularity", "categories");
 
 	public function testTagList() {
 		$this->get_page('tags/map');
diff --git a/ext/user/main.php b/ext/user/main.php
index c5f57d702..c2bc2f8e9 100644
--- a/ext/user/main.php
+++ b/ext/user/main.php
@@ -81,7 +81,7 @@ class NullUserException extends SCoreException {}
 
 class UserPage extends Extension {
 	/** @var UserPageTheme $theme */
-	var $theme;
+	public $theme;
 
 	public function onInitExt(InitExtEvent $event) {
 		global $config;
diff --git a/ext/view/main.php b/ext/view/main.php
index db9e74225..2c80e4a4a 100644
--- a/ext/view/main.php
+++ b/ext/view/main.php
@@ -74,8 +74,8 @@ public function __construct(Image $image) {
 }
 
 class ImageAdminBlockBuildingEvent extends Event {
-	/** @var array  */
-	var $parts = array();
+	/** @var string[] */
+	public $parts = array();
 	/** @var \Image|null  */
 	public $image = null;
 	/** @var null|\User  */
diff --git a/ext/wiki/main.php b/ext/wiki/main.php
index 836f70aac..8eb541f02 100644
--- a/ext/wiki/main.php
+++ b/ext/wiki/main.php
@@ -31,14 +31,20 @@ class WikiPage {
 	/** @var int|string */
 	public $id;
 
-	var $owner_id;
-	var $owner_ip;
-	var $date;
+	/** @var int */
+	public $owner_id;
+
+	/** @var string */
+	public $owner_ip;
+
+	/** @var string */
+	public $date;
 
 	/** @var string */
 	public $title;
 
-	var $revision;
+	/** @var int */
+	public $revision;
 
 	/** @var bool */
 	public $locked;
diff --git a/themes/danbooru2/custompage.class.php b/themes/danbooru2/custompage.class.php
index 16d676cff..d8aca86c9 100644
--- a/themes/danbooru2/custompage.class.php
+++ b/themes/danbooru2/custompage.class.php
@@ -1,7 +1,7 @@
 <?php
 
 class CustomPage extends Page {
-	var $left_enabled = true;
+	public $left_enabled = true;
 	public function disable_left() {
 		$this->left_enabled = false;
 	}
diff --git a/themes/futaba/custompage.class.php b/themes/futaba/custompage.class.php
index 16d676cff..d8aca86c9 100644
--- a/themes/futaba/custompage.class.php
+++ b/themes/futaba/custompage.class.php
@@ -1,7 +1,7 @@
 <?php
 
 class CustomPage extends Page {
-	var $left_enabled = true;
+	public $left_enabled = true;
 	public function disable_left() {
 		$this->left_enabled = false;
 	}

From cb73a0caa00c037c37e03b0b777a7e4ce1632b4e Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 19 Jun 2016 23:23:34 +0100
Subject: [PATCH 148/250] let's stop being php5.2 compatible

---
 core/extension.class.php | 37 ++++++++++++++++---------------------
 core/util.inc.php        |  2 --
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/core/extension.class.php b/core/extension.class.php
index 2267e63a5..dcbd10102 100644
--- a/core/extension.class.php
+++ b/core/extension.class.php
@@ -85,18 +85,13 @@ abstract class Extension {
 	/** @var array which DBs this ext supports (blank for 'all') */
 	protected $db_support = [];
 
-	/** this theme's Themelet object */
+	/** @var Themelet this theme's Themelet object */
 	public $theme;
 
-	// in PHP5.3, late static bindings can take care of this; __CLASS__
-	// used here will refer to the subclass
-	// http://php.net/manual/en/language.oop5.late-static-bindings.php
-	/** @private */
-	public function i_am(Extension $child) {
-		if(is_null($this->theme)) $this->theme = $this->get_theme_object($child, false);
+	public function __construct() {
+		$this->theme = $this->get_theme_object(get_called_class());
 	}
 
-
 	public function is_live() {
 		global $database;
 		return (
@@ -108,21 +103,21 @@ public function is_live() {
 	/**
 	 * Find the theme object for a given extension.
 	 *
-	 * @param Extension $class
-	 * @param bool $fatal
-	 * @return bool
+	 * @param string $base
+	 * @return Themelet
 	 */
-	private function get_theme_object(Extension $class, $fatal=true) {
-		$base = get_class($class);
-		if(class_exists('Custom'.$base.'Theme')) {
-			$class = 'Custom'.$base.'Theme';
-			return new $class();
+	private function get_theme_object($base) {
+		$custom = 'Custom'.$base.'Theme';
+		$normal = $base.'Theme';
+
+		if(class_exists($custom)) {
+			return new $custom();
+		}
+		elseif(class_exists($normal)) {
+			return new $normal();
 		}
-		elseif ($fatal || class_exists($base.'Theme')) {
-			$class = $base.'Theme';
-			return new $class();
-		} else {
-			return false;
+		else {
+			return null;
 		}
 	}
 
diff --git a/core/util.inc.php b/core/util.inc.php
index 0cb81ede5..c3d5a6c5d 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -1429,7 +1429,6 @@ function _set_event_listeners() {
 		elseif(is_subclass_of($class, "Extension")) {
 			/** @var Extension $extension */
 			$extension = new $class();
-			$extension->i_am($extension);
 
 			// skip extensions which don't support our current database
 			if(!$extension->is_live()) continue;
@@ -1460,7 +1459,6 @@ function _dump_event_listeners($event_listeners, $path) {
 		if($rclass->isAbstract()) {}
 		elseif(is_subclass_of($class, "Extension")) {
 			$p .= "\$$class = new $class(); ";
-			$p .= "\${$class}->i_am(\$$class);\n";
 		}
 	}
 

From d2eb2485384a8c13d2933dbf4e49a43f25a0e356 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Mon, 20 Jun 2016 00:24:50 +0100
Subject: [PATCH 149/250] extra cookie updates

---
 lib/shimmie.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/shimmie.js b/lib/shimmie.js
index e068a6ac4..ae6b98c51 100644
--- a/lib/shimmie.js
+++ b/lib/shimmie.js
@@ -50,7 +50,7 @@ $(document).ready(function() {
 	});
 
 	try {
-		var sidebar_hidden = ($.cookie("ui-sidebar-hidden") || "").split("|");
+		var sidebar_hidden = (Cookies.get("ui-sidebar-hidden") || "").split("|");
 		for(var i in sidebar_hidden) {
 			if(sidebar_hidden.hasOwnProperty(i) && sidebar_hidden[i].length > 0) {
 				$(sidebar_hidden[i]+" .blockbody").hide();
@@ -75,7 +75,7 @@ $(document).ready(function() {
 					}
 				}
 			}
-			$.cookie("ui-sidebar-hidden", sidebar_hidden.join("|"), {path: '/', expires: 365});
+			Cookies.set("ui-sidebar-hidden", sidebar_hidden.join("|"), {expires: 365});
 		});
 	});
 

From bb35421b05c94e56cd2ac61b8b5ea2f25a95256c Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 26 Jun 2016 18:57:53 +0100
Subject: [PATCH 150/250] Load AutoComplete before Home, so that the headers
 show up

---
 ext/autocomplete/main.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ext/autocomplete/main.php b/ext/autocomplete/main.php
index 918796a40..24e1e87f6 100644
--- a/ext/autocomplete/main.php
+++ b/ext/autocomplete/main.php
@@ -6,6 +6,8 @@
  */
 
 class AutoComplete extends Extension {
+	public function get_priority() {return 30;} // before Home
+
 	public function onPageRequest(PageRequestEvent $event) {
 		global $page, $database;
 

From 17696f842ce2bba2d8f23388109c1b61540d8a4a Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Mon, 27 Jun 2016 20:49:07 +0100
Subject: [PATCH 151/250] tiny readme tweak

---
 README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index c5fabf2d0..0b08f7b9c 100644
--- a/README.markdown
+++ b/README.markdown
@@ -29,7 +29,7 @@ check out one of the versioned branches.
 # Requirements
 
 - MySQL/MariaDB 5.1+ (with experimental support for PostgreSQL 9+ and SQLite 3)
-- Stable PHP ([5.5 as of writing](https://en.wikipedia.org/wiki/PHP#Release_history))
+- [Stable PHP](https://en.wikipedia.org/wiki/PHP#Release_history) (5.5 as of writing)
 - GD or ImageMagick
 
 # Installation

From 8c8106c6a9999ede9b8657f72de391d3288097be Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 3 Jul 2016 11:48:08 +0100
Subject: [PATCH 152/250] fix index var access

---
 ext/index/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/index/theme.php b/ext/index/theme.php
index a574555b9..ecc0b496c 100644
--- a/ext/index/theme.php
+++ b/ext/index/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class IndexTheme extends Themelet {
-	private $page_number, $total_pages, $search_terms;
+	protected $page_number, $total_pages, $search_terms;
 
 	/**
 	 * @param int $page_number

From b6ad316d20bdba82f783cffa2c60247880e5ca0b Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 3 Jul 2016 12:07:54 +0100
Subject: [PATCH 153/250] linting

---
 core/imageboard.pack.php | 8 ++++----
 core/page.class.php      | 2 +-
 core/util.inc.php        | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index ddfdd1d6d..58828416d 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -667,7 +667,7 @@ public function set_tags($tags) {
 	/**
 	 * Send list of metatags to be parsed.
 	 *
-	 * @param [] $metatags
+	 * @param string[] $metatags
 	 * @param int $image_id
 	 */
 	public function parse_metatags($metatags, $image_id) {
@@ -876,7 +876,7 @@ private static function build_search_querylet($terms) {
 		 * Merge all the image metadata searches into one generic querylet
 		 * and append to the base querylet with "AND blah"
 		 */
-		if($img_querylets) {
+		if(!empty($img_querylets)) {
 			$n = 0;
 			$img_sql = "";
 			$img_vars = array();
@@ -950,11 +950,11 @@ private static function build_accurate_search_querylet($tag_querylets) {
 
 		assert('$positive_tag_id_array || $negative_tag_id_array');
 		$wheres = array();
-		if ($positive_tag_id_array) {
+		if (!empty($positive_tag_id_array)) {
 			$positive_tag_id_list = join(', ', $positive_tag_id_array);
 			$wheres[] = "tag_id IN ($positive_tag_id_list)";
 		}
-		if ($negative_tag_id_array) {
+		if (!empty($negative_tag_id_array)) {
 			$negative_tag_id_list = join(', ', $negative_tag_id_array);
 			$wheres[] = "tag_id NOT IN ($negative_tag_id_list)";
 		}
diff --git a/core/page.class.php b/core/page.class.php
index 9b60c99c8..3d02bbe6b 100644
--- a/core/page.class.php
+++ b/core/page.class.php
@@ -290,7 +290,7 @@ public function display() {
 				#	header("Cache-control: no-cache");
 				#	header('Expires: ' . gmdate('D, d M Y H:i:s', time() - 600) . ' GMT');
 				#}
-				if($this->get_cookie("flash_message")) {
+				if($this->get_cookie("flash_message") !== null) {
 					$this->add_cookie("flash_message", "", -1, "/");
 				}
 				usort($this->blocks, "blockcmp");
diff --git a/core/util.inc.php b/core/util.inc.php
index c3d5a6c5d..298a064c1 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -79,7 +79,7 @@ function sql_escape($input) {
 /**
  * Turn all manner of HTML / INI / JS / DB booleans into a PHP one
  *
- * @param $input
+ * @param mixed $input
  * @return bool
  */
 function bool_escape($input) {
@@ -676,7 +676,7 @@ function captcha_check() {
 		else {
 			session_start();
 			$securimg = new Securimage();
-			if($securimg->check($_POST['captcha_code']) == FALSE) {
+			if($securimg->check($_POST['captcha_code']) === false) {
 				log_info("core", "Captcha failed (Securimage)");
 				return false;
 			}
@@ -733,7 +733,7 @@ function getMimeType($file, $ext="", $list=false) {
 		'mp4' => 'video/mp4', 'ogv' => 'video/ogg', 'webm' => 'video/webm'
 	);
 
-	if ($list == true){ return $exts; }
+	if ($list === true){ return $exts; }
 
 	if (isset($exts[$ext])) { return $exts[$ext]; }
 
@@ -828,7 +828,7 @@ function get_memory_limit() {
 			// Shimmie wants more memory than what PHP is currently set for.
 
 			// Attempt to set PHP's memory limit.
-			if ( ini_set("memory_limit", $shimmie_limit) === FALSE ) {
+			if ( ini_set("memory_limit", $shimmie_limit) === false ) {
 				/*  We can't change PHP's limit, oh well, return whatever its currently set to */
 				return $memory;
 			}

From c14a36079cf598438a1b7647e068d9e789a123e1 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Mon, 11 Jul 2016 13:00:54 +0100
Subject: [PATCH 154/250] add option to force a specific base url

---
 core/sys_config.inc.php | 3 ++-
 core/util.inc.php       | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/sys_config.inc.php b/core/sys_config.inc.php
index 506c89932..50ac40a67 100644
--- a/core/sys_config.inc.php
+++ b/core/sys_config.inc.php
@@ -39,7 +39,8 @@ function _d($name, $value) {if(!defined($name)) define($name, $value);}
 _d("VERSION", '2.5.5+');     // string   shimmie version
 _d("TIMEZONE", null);        // string   timezone
 _d("CORE_EXTS", "bbcode,user,mail,upload,image,view,handle_pixel,ext_manager,setup,upgrade,handle_404,comment,tag_list,index,tag_edit,alias_editor"); // extensions to always enable
-_d("EXTRA_EXTS", "");        // optional extra extensions
+_d("EXTRA_EXTS", "");        // string   optional extra extensions
+_d("BASE_URL", null);        // string   force a specific base URL (default is auto-detect)
 
 
 /*
diff --git a/core/util.inc.php b/core/util.inc.php
index c3d5a6c5d..274219e89 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -444,7 +444,10 @@ function make_link($page=null, $query=null) {
 
 	if(is_null($page)) $page = $config->get_string('main_page');
 
-	if(NICE_URLS || $config->get_bool('nice_urls', false)) {
+	if(!is_null(BASE_URL)) {
+		$base = BASE_URL;
+	}
+	elseif(NICE_URLS || $config->get_bool('nice_urls', false)) {
 		$base = str_replace('/'.basename($_SERVER["SCRIPT_FILENAME"]), "", $_SERVER["PHP_SELF"]);
 	}
 	else {

From bc3e48224748f27883d49fb4c8529ac00aa5043d Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 30 Jul 2016 15:04:34 +0100
Subject: [PATCH 155/250] more image report display options

---
 ext/report_image/main.php  | 59 +++++++++++++++++++++++++++-----------
 ext/report_image/theme.php | 29 ++++++++++++++-----
 2 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/ext/report_image/main.php b/ext/report_image/main.php
index c64b1e638..65ffad399 100644
--- a/ext/report_image/main.php
+++ b/ext/report_image/main.php
@@ -22,21 +22,28 @@ public function __construct($id) {
 }
 
 class AddReportedImageEvent extends Event {
+	/** @var ImageReport */
+	public $report;
+
+	/**
+	 * @param ImageReport $report
+	 */
+	public function __construct($report) {
+		$this->report = $report;
+	}
+}
+
+class ImageReport {
 	/** @var int  */
-	public $reporter_id;
+	public $user_id;
 	/** @var int  */
 	public $image_id;
 	/** @var string  */
 	public $reason;
 
-	/**
-	 * @param int $image_id
-	 * @param int $reporter_id
-	 * @param string $reason
-	 */
-	public function __construct($image_id, $reporter_id, $reason) {
-		$this->reporter_id = $reporter_id;
+	public function __construct($image_id, $user_id, $reason) {
 		$this->image_id = $image_id;
+		$this->user_id = $user_id;
 		$this->reason = $reason;
 	}
 }
@@ -56,7 +63,7 @@ public function onPageRequest(PageRequestEvent $event) {
 			if($event->get_arg(0) == "add") {
 				if(!empty($_POST['image_id']) && !empty($_POST['reason'])) {
 					$image_id = int_escape($_POST['image_id']);
-					send_event(new AddReportedImageEvent($image_id, $user->id, $_POST['reason']));
+					send_event(new AddReportedImageEvent(new ImageReport($image_id, $user->id, $_POST['reason'])));
 					$page->set_mode("redirect");
 					$page->set_redirect(make_link("post/view/$image_id"));
 				}
@@ -93,11 +100,11 @@ public function onPageRequest(PageRequestEvent $event) {
 
 	public function onAddReportedImage(AddReportedImageEvent $event) {
 		global $database;
-		log_info("report_image", "Adding report of Image #{$event->image_id} with reason '{$event->reason}'", false, array("image_id" => $event->image_id));
+		log_info("report_image", "Adding report of Image #{$event->report->image_id} with reason '{$event->report->reason}'", false, array("image_id" => $event->report->image_id));
 		$database->Execute(
 				"INSERT INTO image_reports(image_id, reporter_id, reason)
 				VALUES (?, ?, ?)",
-				array($event->image_id, $event->reporter_id, $event->reason));
+				array($event->report->image_id, $event->report->user_id, $event->report->reason));
 		$database->cache->delete("image-report-count");
 	}
 
@@ -117,7 +124,7 @@ public function onUserPageBuilding(UserPageBuildingEvent $event) {
 	public function onDisplayingImage(DisplayingImageEvent $event) {
 		global $user;
 		if($user->can('create_image_report')) {
-			$reps = $this->get_reporters($event->image);
+			$reps = $this->get_reports($event->image);
 			$this->theme->display_image_banner($event->image, $reps);
 		}
 	}
@@ -141,6 +148,20 @@ public function onUserDeletion(UserDeletionEvent $event) {
 		$this->delete_reports_by($event->id);
 	}
 
+	public function onSetupBuilding(SetupBuildingEvent $event) {
+		$sb = new SetupBlock("Image Reports");
+
+		$opts = array(
+			"Reporter Only" => "user",
+			"Reason Only" => "reason",
+			"Both" => "both",
+			"None" => "none",
+		);
+		$sb->add_choice_option("report_image_publicity", $opts, "Show publicly: ");
+
+		$event->panel->add_block($sb);
+	}
+
 	/**
 	 * @param int $user_id
 	 */
@@ -168,17 +189,21 @@ protected function install() {
 
 	/**
 	 * @param Image $image
-	 * @return string[]
+	 * @return ImageReport[]
 	 */
-	public function get_reporters(Image $image) {
+	public function get_reports(Image $image) {
 		global $database;
 
-		return $database->get_col("
-			SELECT users.name
+		$rows = $database->get_all("
+			SELECT *
 			FROM image_reports
-			JOIN users ON reporter_id = users.id
 			WHERE image_reports.image_id = :image_id
 		", array("image_id" => $image->id));
+		$reps = array();
+		foreach($rows as $row) {
+			$reps[] = new ImageReport($row["image_id"], $row["reporter_id"], $row["reason"]);
+		}
+		return $reps;
 	}
 
 	/**
diff --git a/ext/report_image/theme.php b/ext/report_image/theme.php
index 8c7b250c8..251bc49e8 100644
--- a/ext/report_image/theme.php
+++ b/ext/report_image/theme.php
@@ -16,7 +16,7 @@ class ReportImageTheme extends Themelet {
 	 * @param array $reports
 	 */
 	public function display_reported_images(Page $page, $reports) {
-		global $config;
+		global $config, $user;
 
 		$h_reportedimages = "";
 		foreach($reports as $report) {
@@ -27,7 +27,6 @@ public function display_reported_images(Page $page, $reports) {
 			$reporter_name = html_escape($report['reporter_name']);
 			$userlink = "<a href='".make_link("user/$reporter_name")."'>$reporter_name</a>";
 
-			global $user;
 			$iabbe = new ImageAdminBlockBuildingEvent($image, $user);
 			send_event($iabbe);
 			ksort($iabbe->parts);
@@ -65,15 +64,31 @@ public function display_reported_images(Page $page, $reports) {
 
 	/**
 	 * @param Image $image
-	 * @param array $reporters
+	 * @param ImageReport[] $reports
 	 */
-	public function display_image_banner(Image $image, /*array*/ $reporters) {
-		global $page;
+	public function display_image_banner(Image $image, /*array*/ $reports) {
+		global $config, $page;
 
 		$i_image = int_escape($image->id);
 		$html = "";
-		if(count($reporters) > 0) {
-			$html .= "<b>Image reported by ".html_escape(implode(", ", $reporters))."</b><p>";
+		$public = $config->get_string("report_image_publicity");
+		if($public != "none" && count($reports) > 0) {
+			$html .= "<b>Current reports:</b>";
+			foreach($reports as $report) {
+				$html .= "<br>";
+				if($public == "both") {
+					$html .= html_escape(User::by_id($report->user_id)->name);
+					$html .= " - ";
+					$html .= html_escape($report->reason);
+				}
+				elseif($public == "user") {
+					$html .= html_escape(User::by_id($report->user_id)->name);
+				}
+				elseif($public == "reason") {
+					$html .= html_escape($report->reason);
+				}
+			}
+			$html .= "<p>";
 		}
 		$html .= "
 			".make_form(make_link("image_report/add"))."

From 7be951b271c8a9e285e599206cfeac622e42bff3 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 30 Jul 2016 22:11:49 +0100
Subject: [PATCH 156/250] Convert tags from user-supplied string to array once,
 on input

This results in a fuckton of refactoring and code cancelling out
other code -- we no longer have a whole bunch of places trying
to support string params and array params, and doing their own
esaping and unescaping, never being quite sure if the data they've
been passed is escaped or not.

Also adds a bunch of type hinting, since we can now know what
data we're dealing with better.
---
 core/event.class.php       |   2 +-
 core/extension.class.php   |   2 +-
 core/imageboard.pack.php   | 208 ++++++++++++++-----------------------
 ext/handle_ico/main.php    |   2 +-
 ext/handle_svg/main.php    |   2 +-
 ext/index/main.php         |  21 ++--
 ext/livefeed/main.php      |  15 ++-
 ext/ouroboros_api/main.php |   8 +-
 ext/tag_edit/main.php      |  31 +++---
 ext/tag_history/main.php   |   9 +-
 ext/tag_history/theme.php  |   2 +-
 ext/tag_list/main.php      |   5 +-
 12 files changed, 129 insertions(+), 178 deletions(-)

diff --git a/core/event.class.php b/core/event.class.php
index f1db791d2..37511e293 100644
--- a/core/event.class.php
+++ b/core/event.class.php
@@ -133,7 +133,7 @@ public function count_args() {
 	public function get_search_terms() {
 		$search_terms = array();
 		if($this->count_args() === 2) {
-			$search_terms = explode(' ', $this->get_arg(0));
+			$search_terms = Tag::explode($this->get_arg(0));
 		}
 		return $search_terms;
 	}
diff --git a/core/extension.class.php b/core/extension.class.php
index dcbd10102..e3931935e 100644
--- a/core/extension.class.php
+++ b/core/extension.class.php
@@ -174,7 +174,7 @@ public function onDataUpload(DataUploadEvent $event) {
 		$supported_ext = $this->supported_ext($event->type);
 		$check_contents = $this->check_contents($event->tmpname);
 		if($supported_ext && $check_contents) {
-			if(!move_upload_to_archive($event)) return;
+			move_upload_to_archive($event);
 			send_event(new ThumbnailGenerationEvent($event->hash, $event->type));
 
 			/* Check if we are replacing an image */
diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 58828416d..b619f3d5d 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -198,7 +198,6 @@ public function validate_accel($tags) {
 	public function get_accelerated_result($tags, $offset, $limit) {
 		global $database;
 
-		$tags = Tag::resolve_aliases($tags);
 		if(!Image::validate_accel($tags)) {
 			return null;
 		}
@@ -263,10 +262,9 @@ public static function count_images($tags=array()) {
 			return $total;
 		}
 		else if($tag_count === 1 && !preg_match("/[:=><\*\?]/", $tags[0])) {
-			$term = Tag::resolve_alias($tags[0]);
 			return $database->get_one(
 				$database->scoreql_to_sql("SELECT count FROM tags WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)"),
-				array("tag"=>$term));
+				array("tag"=>$tags[0]));
 		}
 		else {
 			$querylet = Image::build_search_querylet($tags);
@@ -802,7 +800,6 @@ private static function build_search_querylet($terms) {
 			}
 		}
 
-		$terms = Tag::resolve_aliases($terms);
 		foreach ($terms as $term) {
 			$positive = true;
 			if (is_string($term) && !empty($term) && ($term[0] == '-')) {
@@ -819,10 +816,18 @@ private static function build_search_querylet($terms) {
 				foreach ($stpe->get_querylets() as $querylet) {
 					$img_querylets[] = new ImgQuerylet($querylet, $positive);
 				}
-			} else {
-				$tag_querylets[] = new TagQuerylet(Tag::sanitise_wildcard($term), $positive);
-				if ($positive) $positive_tag_count++;
-				else $negative_tag_count++;
+			}
+			else {
+				// if the whole match is wild, skip this;
+				// if not, translate into SQL
+				if(str_replace("*", "", $term) != "") {
+					$term = str_replace('_', '\_', $term);
+					$term = str_replace('%', '\%', $term);
+					$term = str_replace('*', '%', $term);
+					$tag_querylets[] = new TagQuerylet($term, $positive);
+					if ($positive) $positive_tag_count++;
+					else $negative_tag_count++;
+				}
 			}
 		}
 
@@ -1063,146 +1068,85 @@ private static function build_ugly_search_querylet($tag_querylets) {
  */
 class Tag {
 	/**
-	 * Remove any excess fluff from a user-input tag
-	 *
-	 * @param string $tag
+	 * @param string[] $tags
 	 * @return string
 	 */
-	public static function sanitise($tag) {
-		assert('is_string($tag)');
-		$tag = preg_replace("/[\s?*]/", "", $tag);            # whitespace
-		$tag = preg_replace('/\x20(\x0e|\x0f)/', '', $tag);   # unicode RTL
-		$tag = preg_replace("/\.+/", ".", $tag);              # strings of dots?
-		$tag = preg_replace("/^(\.+[\/\\\\])+/", "", $tag);   # trailing slashes?
-		return $tag;
+	public static function implode($tags) {
+		assert('is_array($tags)');
+
+		sort($tags);
+		$tags = implode(' ', $tags);
+
+		return $tags;
 	}
 
 	/**
-	 * Turn any string or array into a valid tag array.
+	 * Turn a human-supplied string into a valid tag array.
 	 *
-	 * @param string|string[] $tags
-	 * @param bool $tagme
+	 * @param string $tags
+	 * @param bool $tagme add "tagme" if the string is empty
 	 * @return string[]
 	 */
 	public static function explode($tags, $tagme=true) {
-		assert('is_string($tags) || is_array($tags)');
+		global $database;
+		assert('is_string($tags)');
 
-		if(is_string($tags)) {
-			$tags = explode(' ', trim($tags));
-		}
-		//else if(is_array($tags)) {
-			// do nothing
-		//}
+		$tags = explode(' ', trim($tags));
 
+		/* sanitise by removing invisible / dodgy characters */
 		$tag_array = array();
 		foreach($tags as $tag) {
+			$tag = preg_replace("/\s/", "", $tag);                # whitespace
+			$tag = preg_replace('/\x20(\x0e|\x0f)/', '', $tag);   # unicode RTL
+			$tag = preg_replace("/\.+/", ".", $tag);              # strings of dots?
+			$tag = preg_replace("/^(\.+[\/\\\\])+/", "", $tag);   # trailing slashes?
 			$tag = trim($tag, ", \t\n\r\0\x0B");
-			if(is_string($tag) && !empty($tag)) {
+
+			if(!empty($tag)) {
 				$tag_array[] = $tag;
 			}
 		}
 
+		/* if user supplied a blank string, add "tagme" */
 		if(count($tag_array) === 0 && $tagme) {
 			$tag_array = array("tagme");
 		}
 
-		$tag_array = array_iunique($tag_array); //remove duplicate tags
-
-		sort($tag_array);
-
-		return $tag_array;
-	}
-
-	/**
-	 * @param string|string[] $tags
-	 * @return string
-	 */
-	public static function implode($tags) {
-		assert('is_string($tags) || is_array($tags)');
-
-		if(is_array($tags)) {
-			sort($tags);
-			$tags = implode(' ', $tags);
-		}
-		//else if(is_string($tags)) {
-			// do nothing
-		//}
-
-		return $tags;
-	}
-
-	/**
-	 * @param string $tag
-	 * @return string
-	 */
-	public static function resolve_alias($tag) {
-		assert('is_string($tag)');
-		global $database;
-
-		$negative = false;
-		if(!empty($tag) && ($tag[0] == '-')) {
-			$negative = true;
-			$tag = substr($tag, 1);
-		}
-
-
-		$newtag = $database->get_one(
-			$database->scoreql_to_sql("SELECT newtag FROM aliases WHERE SCORE_STRNORM(oldtag)=SCORE_STRNORM(:tag)"),
-			array("tag"=>$tag)
-		);
-
-		if(empty($newtag)) {
-			//tag has no alias, use old tag
-			$newtag = $tag;
-		}
-
-		return !$negative ? $newtag : preg_replace("/(\S+)/", "-$1", $newtag);
-	}
-
-	/**
-	 * @param string $tag
-	 * @return string
-	 */
-	public static function sanitise_wildcard($tag) {
-		// if there is no wildcard, return the tag
-		if(strpos($tag, "*") === false) {
-			return $tag;
-		}
-
-		// if the whole match is wild, save the database
-		else if(str_replace("*", "", $tag) == "") {
-			return "invalid-wildcard";
-		}
-
-		// else translate to sql
-		else {
-			$tag = str_replace("%", "\%", $tag);
-			$tag = str_replace("*", "%", $tag);
-			return $tag;
-		}
-	}
-
-	/**
-	 * This function takes a list (array) of tags and changes any tags that have aliases
-	 *
-	 * @param string[] $tags Array of tags
-	 * @return array
-	 */
-	public static function resolve_aliases($tags) {
-		assert('is_array($tags)');
-
+		/* resolve aliases */
 		$new = array();
-
 		$i = 0;
-		$tag_count = count($tags);
+		$tag_count = count($tag_array);
 		while($i<$tag_count) {
-			$aliases = Tag::explode(Tag::resolve_alias($tags[$i]), FALSE);
-			foreach($aliases as $alias){
-				if(!in_array($alias, $new)){
-					if($tags[$i] == $alias){
-						$new[] = $alias;
-					}elseif(!in_array($alias, $tags)){
-						$tags[] = $alias;
+			$tag = $tag_array[$i];
+			$negative = '';
+			if(!empty($tag) && ($tag[0] == '-')) {
+				$negative = '-';
+				$tag = substr($tag, 1);
+			}
+
+			$newtags = $database->get_one(
+				$database->scoreql_to_sql("
+					SELECT newtag
+					FROM aliases
+					WHERE SCORE_STRNORM(oldtag)=SCORE_STRNORM(:tag)
+				"),
+				array("tag"=>$tag)
+			);
+			if(empty($newtags)) {
+				//tag has no alias, use old tag
+				$aliases = array($tag);
+			}
+			else {
+				$aliases = Tag::explode($newtags);
+			}
+
+			foreach($aliases as $alias) {
+				if(!in_array($alias, $new)) {
+					if($tag == $alias) {
+						$new[] = $negative.$alias;
+					}
+					elseif(!in_array($alias, $tag_array)) {
+						$tag_array[] = $negative.$alias;
 						$tag_count++;
 					}
 				}
@@ -1210,8 +1154,13 @@ public static function resolve_aliases($tags) {
 			$i++;
 		}
 
-		$new = array_iunique($new); // remove any duplicate tags
-		return $new;
+		/* remove any duplicate tags */
+		$tag_array = array_iunique($new);
+
+		/* tidy up */
+		sort($tag_array);
+
+		return $tag_array;
 	}
 }
 
@@ -1225,16 +1174,17 @@ public static function resolve_aliases($tags) {
  * hierarchy, or throw an exception trying.
  *
  * @param DataUploadEvent $event
- * @return bool
  * @throws UploadException
  */
 function move_upload_to_archive(DataUploadEvent $event) {
 	$target = warehouse_path("images", $event->hash);
 	if(!@copy($event->tmpname, $target)) {
-		$errors = error_get_last(); // note: requires php 5.2
-		throw new UploadException("Failed to copy file from uploads ({$event->tmpname}) to archive ($target): {$errors['type']} / {$errors['message']}");
+		$errors = error_get_last();
+		throw new UploadException(
+			"Failed to copy file from uploads ({$event->tmpname}) to archive ($target): ".
+			"{$errors['type']} / {$errors['message']}"
+		);
 	}
-	return true;
 }
 
 /**
diff --git a/ext/handle_ico/main.php b/ext/handle_ico/main.php
index 00f1a54aa..e9d902278 100644
--- a/ext/handle_ico/main.php
+++ b/ext/handle_ico/main.php
@@ -10,7 +10,7 @@ public function onDataUpload(DataUploadEvent $event) {
 		if($this->supported_ext($event->type) && $this->check_contents($event->tmpname)) {
 			$hash = $event->hash;
 			$ha = substr($hash, 0, 2);
-			if(!move_upload_to_archive($event)) return;
+			move_upload_to_archive($event);
 			send_event(new ThumbnailGenerationEvent($event->hash, $event->type));
 			$image = $this->create_image_from_data("images/$ha/$hash", $event->metadata);
 			if(is_null($image)) {
diff --git a/ext/handle_svg/main.php b/ext/handle_svg/main.php
index 807b23596..e412500b2 100644
--- a/ext/handle_svg/main.php
+++ b/ext/handle_svg/main.php
@@ -10,7 +10,7 @@ class SVGFileHandler extends Extension {
 	public function onDataUpload(DataUploadEvent $event) {
 		if($this->supported_ext($event->type) && $this->check_contents($event->tmpname)) {
 			$hash = $event->hash;
-			if(!move_upload_to_archive($event)) return;
+			move_upload_to_archive($event);
 			send_event(new ThumbnailGenerationEvent($event->hash, $event->type));
 			$image = $this->create_image_from_data(warehouse_path("images", $hash), $event->metadata);
 			if(is_null($image)) {
diff --git a/ext/index/main.php b/ext/index/main.php
index 742cdf4a8..24fe3f5bf 100644
--- a/ext/index/main.php
+++ b/ext/index/main.php
@@ -161,16 +161,16 @@
 class SearchTermParseEvent extends Event {
 	/** @var null|string  */
 	public $term = null;
-	/** @var null|array */
-	public $context = null;
+	/** @var null */
+	public $context = array();
 	/** @var \Querylet[] */
 	public $querylets = array();
 
 	/**
 	 * @param string|null $term
-	 * @param array|null $context
+	 * @param array $context
 	 */
-	public function __construct($term, $context) {
+	public function __construct($term, array $context) {
 		$this->term = $term;
 		$this->context = $context;
 	}
@@ -201,16 +201,16 @@ class SearchTermParseException extends SCoreException {
 }
 
 class PostListBuildingEvent extends Event {
-	/** @var null|array */
-	public $search_terms = null;
+	/** @var array */
+	public $search_terms = array();
 
 	/** @var array */
 	public $parts = array();
 
 	/**
-	 * @param array|null $search
+	 * @param string[] $search
 	 */
-	public function __construct($search) {
+	public function __construct(array $search) {
 		$this->search_terms = $search;
 	}
 
@@ -238,7 +238,8 @@ public function onPageRequest(PageRequestEvent $event) {
 		global $database, $page;
 		if($event->page_matches("post/list")) {
 			if(isset($_GET['search'])) {
-				$search = url_escape(Tag::implode(Tag::resolve_aliases(Tag::explode($_GET['search'], false))));
+				// implode(explode()) to resolve aliases and sanitise
+				$search = url_escape(Tag::implode(Tag::explode($_GET['search'], false)));
 				if(empty($search)) {
 					$page->set_mode("redirect");
 					$page->set_redirect(make_link("post/list/1"));
@@ -310,7 +311,7 @@ public function onSetupBuilding(SetupBuildingEvent $event) {
 		$event->panel->add_block($sb);
 	}
 
-	public function onImageInfoSet($event) {
+	public function onImageInfoSet(ImageInfoSetEvent $event) {
 		global $database;
 		if(SPEED_HAX) {
 			$database->cache->delete("thumb-block:{$event->image->id}");
diff --git a/ext/livefeed/main.php b/ext/livefeed/main.php
index 804b57e60..a6c281ad4 100644
--- a/ext/livefeed/main.php
+++ b/ext/livefeed/main.php
@@ -15,11 +15,11 @@ public function onSetupBuilding(SetupBuildingEvent $event) {
 		$event->panel->add_block($sb);
 	}
 
-	public function onUserCreation($event) {
+	public function onUserCreation(UserCreationEvent $event) {
 		$this->msg("New user created: {$event->username}");
 	}
 
-	public function onImageAddition($event) {
+	public function onImageAddition(ImageAdditionEvent $event) {
 		global $user;
 		$this->msg(
 			make_http(make_link("post/view/".$event->image->id))." - ".
@@ -27,14 +27,14 @@ public function onImageAddition($event) {
 		);
 	}
 
-	public function onTagSet($event) {
+	public function onTagSet(TagSetEvent $event) {
 		$this->msg(
 			make_http(make_link("post/view/".$event->image->id))." - ".
 			"tags set to: ".Tag::implode($event->tags)
 		);
 	}
 
-	public function onCommentPosting($event) {
+	public function onCommentPosting(CommentPostingEvent $event) {
 		global $user;
 		$this->msg(
 			make_http(make_link("post/view/".$event->image_id))." - ".
@@ -42,14 +42,19 @@ public function onCommentPosting($event) {
 		);
 	}
 
-	public function onImageInfoSet($event) {
+	public function onImageInfoSet(ImageInfoSetEvent $event) {
 #		$this->msg("Image info set");
 	}
 
 	public function get_priority() {return 99;}
 
+	/**
+	 * @param string $data
+	 */
     private function msg($data) {
 		global $config;
+		assert('is_string($data)');
+
 		$host = $config->get_string("livefeed_host", "127.0.0.1:25252");
 
         if(!$host) { return; }
diff --git a/ext/ouroboros_api/main.php b/ext/ouroboros_api/main.php
index c6b0f64bb..20d272944 100644
--- a/ext/ouroboros_api/main.php
+++ b/ext/ouroboros_api/main.php
@@ -271,12 +271,8 @@ class OuroborosPost extends _SafeOuroborosImage
     public function __construct(array $post, $md5 = '')
     {
         if (array_key_exists('tags', $post)) {
-            $this->tags = Tag::implode(
-                array_map(
-                    array('Tag', 'sanitise'),
-                    Tag::explode(urldecode($post['tags']))
-                )
-            );
+            // implode(explode()) to resolve aliases and sanitise
+            $this->tags = Tag::implode(Tag::explode(urldecode($post['tags'])));
         }
         if (array_key_exists('file', $post)) {
             if (!is_null($post['file'])) {
diff --git a/ext/tag_edit/main.php b/ext/tag_edit/main.php
index e05d3b5f9..508e18dc4 100644
--- a/ext/tag_edit/main.php
+++ b/ext/tag_edit/main.php
@@ -100,20 +100,15 @@ class TagSetEvent extends Event {
 
 	/**
 	 * @param Image $image
-	 * @param string $tags
+	 * @param string[] $tags
 	 */
-	public function __construct(Image $image, $tags) {
+	public function __construct(Image $image, array $tags) {
 		$this->image    = $image;
 
 		$this->tags     = array();
 		$this->metatags = array();
 
-		//tags need to be sanitised, alias checked & have metatags removed before being passed to onTagSet
-		$tag_array = Tag::explode($tags);
-		$tag_array = array_map(array('Tag', 'sanitise'), $tag_array);
-		$tag_array = Tag::resolve_aliases($tag_array);
-
-		foreach($tag_array as $tag) {
+		foreach($tags as $tag) {
 			if((strpos($tag, ':') === FALSE) && (strpos($tag, '=') === FALSE)) {
 				//Tag doesn't contain : or =, meaning it can't possibly be a metatag.
 				//This should help speed wise, as it avoids running every single tag through a bunch of preg_match instead.
@@ -134,12 +129,6 @@ public function __construct(Image $image, $tags) {
 	}
 }
 
-/*
- * LockSetEvent:
- *   $image_id
- *   $locked
- *
- */
 class LockSetEvent extends Event {
 	/** @var \Image */
 	public $image;
@@ -151,7 +140,8 @@ class LockSetEvent extends Event {
 	 * @param bool $locked
 	 */
 	public function __construct(Image $image, $locked) {
-		assert(is_bool($locked));
+		assert('is_bool($locked)');
+
 		$this->image = $image;
 		$this->locked = $locked;
 	}
@@ -175,6 +165,10 @@ class TagTermParseEvent extends Event {
 	 * @param bool $parse
 	 */
 	public function __construct($term, $id, $parse) {
+		assert('is_string($term)');
+		assert('is_int($id)');
+		assert('is_bool($parse)');
+
 		$this->term  = $term;
 		$this->id    = $id;
 		$this->parse = $parse;
@@ -229,7 +223,7 @@ public function onImageInfoSet(ImageInfoSetEvent $event) {
 			}
 		}
 		if($this->can_tag($event->image) && isset($_POST['tag_edit__tags'])) {
-			send_event(new TagSetEvent($event->image, $_POST['tag_edit__tags']));
+			send_event(new TagSetEvent($event->image, Tag::explode($_POST['tag_edit__tags'])));
 		}
 		if($this->can_source($event->image) && isset($_POST['tag_edit__source'])) {
 			if(isset($_POST['tag_edit__tags']) ? !preg_match('/source[=|:]/', $_POST["tag_edit__tags"]) : TRUE){
@@ -387,10 +381,13 @@ private function mass_tag_edit($search, $replace) {
 	}
 
 	/**
-	 * @param string|string[] $tags
+	 * @param string $tags
 	 * @param string $source
 	 */
 	private function mass_source_edit($tags, $source) {
+		assert('is_string($tags)');
+		assert('is_string($source)');
+
 		$tags = Tag::explode($tags);
 
 		$last_id = -1;
diff --git a/ext/tag_history/main.php b/ext/tag_history/main.php
index 124fddacf..19dd7fea5 100644
--- a/ext/tag_history/main.php
+++ b/ext/tag_history/main.php
@@ -153,7 +153,7 @@ private function process_revert_request($revert_id) {
 
 		log_debug("tag_history", 'Reverting tags of Image #'.$stored_image_id.' to ['.$stored_tags.']');
 		// all should be ok so we can revert by firing the SetUserTags event.
-		send_event(new TagSetEvent($image, $stored_tags));
+		send_event(new TagSetEvent($image, Tag::explode($stored_tags)));
 		
 		// all should be done now so redirect the user back to the image
 		$page->set_mode("redirect");
@@ -339,7 +339,7 @@ public function process_revert_all_changes($name, $ip, $date) {
 
 				log_debug("tag_history", 'Reverting tags of Image #'.$stored_image_id.' to ['.$stored_tags.']');
 				// all should be ok so we can revert by firing the SetTags event.
-				send_event(new TagSetEvent($image, $stored_tags));
+				send_event(new TagSetEvent($image, Tag::explode($stored_tags)));
 				$this->theme->add_status('Reverted Change','Reverted Image #'.$image_id.' to Tag History #'.$stored_result_id.' ('.$row['tags'].')');
 			}
 		}
@@ -351,13 +351,14 @@ public function process_revert_all_changes($name, $ip, $date) {
 	 * This function is called just before an images tag are changed.
 	 *
 	 * @param Image $image
-	 * @param string|string[] $tags
+	 * @param string[] $tags
 	 */
 	private function add_tag_history(Image $image, $tags) {
 		global $database, $config, $user;
+		assert('is_array($tags)');
 
 		$new_tags = Tag::implode($tags);
-		$old_tags = Tag::implode($image->get_tag_array());
+		$old_tags = $image->get_tag_list();
 		
 		if($new_tags == $old_tags) { return; }
 		
diff --git a/ext/tag_history/theme.php b/ext/tag_history/theme.php
index 2f358546c..7e6bb78c8 100644
--- a/ext/tag_history/theme.php
+++ b/ext/tag_history/theme.php
@@ -39,7 +39,7 @@ public function display_history_page(Page $page, /*int*/ $image_id, /*array*/ $h
 			foreach($current_tags as $tag){
 				$taglinks[] = "<a href='".make_link("post/list/".$tag."/1")."'>".$tag."</a>";
 			}
-			$current_tags = Tag::implode($taglinks);
+			$current_tags = implode(' ', $taglinks);
 
 			$history_list .= "
 				<li>
diff --git a/ext/tag_list/main.php b/ext/tag_list/main.php
index 5322f5b42..aff12bb6a 100644
--- a/ext/tag_list/main.php
+++ b/ext/tag_list/main.php
@@ -491,10 +491,11 @@ private function add_popular_block(Page $page) {
 	 * @param Page $page
 	 * @param string[] $search
 	 */
-	private function add_refine_block(Page $page, /*array(string)*/ $search) {
+	private function add_refine_block(Page $page, $search) {
 		global $database, $config;
+		assert('is_array($search)');
 
-		$wild_tags = Tag::explode($search);
+		$wild_tags = $search;
 		$str_search = Tag::implode($search);
 		$related_tags = $database->cache->get("related_tags:$str_search");
 

From b81e8a2db891292bb20fc212469835baaba4ddc1 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 30 Jul 2016 22:45:44 +0100
Subject: [PATCH 157/250] also explode tags on transload input

---
 ext/upload/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/upload/main.php b/ext/upload/main.php
index 61c41d0f8..266772427 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -178,7 +178,7 @@ public function onPageRequest(PageRequestEvent $event) {
 				}
 				else if(!empty($_GET['url'])) {
 					$url = $_GET['url'];
-					$tags = isset($_GET['tags']) ? $_GET['tags'] : 'tagme';
+					$tags = isset($_GET['tags']) ? Tag::explode($_GET['tags']) : 'tagme';
 					$source = isset($_GET['source']) ? $_GET['source'] : $url;
 					$ok = $this->try_transload($url, $tags, $source, $image_id);
 					$this->theme->display_upload_status($page, $ok);

From ffce1a46831bb318a75bf14bbf9cbddc3b7c1822 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 30 Jul 2016 22:54:42 +0100
Subject: [PATCH 158/250] more hinting

---
 ext/upload/main.php | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/ext/upload/main.php b/ext/upload/main.php
index 266772427..6f632124e 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -157,7 +157,7 @@ public function onPageRequest(PageRequestEvent $event) {
 					}
 					
 					$source = isset($_POST['source']) ? $_POST['source'] : null;
-					$tags = ''; // Tags aren't changed when uploading. Set to null to stop PHP warnings.
+					$tags = array(); // Tags aren't changed when replacing. Set to empty to stop PHP warnings.
 					
 					$ok = false;
 					if(count($_FILES)) {
@@ -287,14 +287,18 @@ private function upload_error_message($error_code) {
 
 	/**
 	 * Handle an upload.
-	 * @param $file
-	 * @param $tags
-	 * @param $source
-	 * @param string $replace
+	 * @param string $file
+	 * @param string[] $tags
+	 * @param string|null $source
+	 * @param int $replace
 	 * @return bool TRUE on upload successful.
 	 */
-	private function try_upload($file, $tags, $source, $replace='') {
+	private function try_upload($file, $tags, $source, $replace=-1) {
 		global $page;
+		assert('is_string($url)');
+		assert('is_array($tags)');
+		assert('is_string($source) || is_null($source)');
+		assert('is_int($replace)');
 
 		if(empty($source)) $source = null;
 
@@ -316,7 +320,7 @@ private function try_upload($file, $tags, $source, $replace='') {
 				$metadata['source'] = $source;
 				
 				/* check if we have been given an image ID to replace */
-				if (!empty($replace)) {
+				if ($replace >= 0) {
 					$metadata['replace'] = $replace;
 				}
 				
@@ -341,13 +345,17 @@ private function try_upload($file, $tags, $source, $replace='') {
 	 * Handle an transload.
 	 *
 	 * @param string $url
-	 * @param mixed $tags
-	 * @param string $source
-	 * @param string $replace
+	 * @param string[] $tags
+	 * @param string|null $source
+	 * @param int $replace
 	 * @return bool Returns TRUE on transload successful.
 	 */
-	private function try_transload($url, $tags, $source, $replace='') {
+	private function try_transload($url, $tags, $source, $replace=-1) {
 		global $page, $config, $user;
+		assert('is_string($url)');
+		assert('is_array($tags)');
+		assert('is_string($source) || is_null($source)');
+		assert('is_int($replace)');
 
 		$ok = true;
 
@@ -408,7 +416,7 @@ private function try_transload($url, $tags, $source, $replace='') {
 			}
 			
 			/* check if we have been given an image ID to replace */
-			if (!empty($replace)) {
+			if ($replace >= 0) {
 				$metadata['replace'] = $replace;
 			}
 			

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 159/250] 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 9b8eda6c4..6122cb465 100644
--- a/ext/handle_flash/main.php
+++ b/ext/handle_flash/main.php
@@ -37,7 +37,7 @@ protected function create_image_from_data(/*string*/ $filename, /*array*/ $metad
 		$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 e9d902278..83cd9d56f 100644
--- a/ext/handle_ico/main.php
+++ b/ext/handle_ico/main.php
@@ -79,7 +79,7 @@ private function create_image_from_data($filename, $metadata) {
 		$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 069107b54..3ccd28716 100644
--- a/ext/handle_mp3/main.php
+++ b/ext/handle_mp3/main.php
@@ -55,7 +55,7 @@ protected function create_image_from_data($filename, $metadata) {
 		}
 		
 		$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 e216568a8..38ba6b3d0 100644
--- a/ext/handle_pixel/main.php
+++ b/ext/handle_pixel/main.php
@@ -32,11 +32,11 @@ protected function create_image_from_data(/*string*/ $filename, /*array*/ $metad
 		$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 e412500b2..872d59d42 100644
--- a/ext/handle_svg/main.php
+++ b/ext/handle_svg/main.php
@@ -75,7 +75,7 @@ private function create_image_from_data($filename, $metadata) {
 		$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 c256b3f2f..654711650 100644
--- a/ext/handle_video/main.php
+++ b/ext/handle_video/main.php
@@ -169,7 +169,7 @@ protected function create_image_from_data($filename, $metadata) {
 		$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 6f632124e..5232896b1 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;
 

From 26b2cd5c16d87a9fd9a5faa589fa7713254452fd Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 30 Jul 2016 23:06:42 +0100
Subject: [PATCH 160/250] derp

---
 ext/upload/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/upload/main.php b/ext/upload/main.php
index 5232896b1..da3d3430a 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -299,7 +299,7 @@ private function upload_error_message($error_code) {
 	 */
 	private function try_upload($file, $tags, $source, $replace=-1) {
 		global $page;
-		assert('is_string($url)');
+		assert('is_string($file)');
 		assert('is_array($tags)');
 		assert('is_string($source) || is_null($source)');
 		assert('is_int($replace)');

From 28c10d17483896af5cc234ecde4f5cc5d2b2f389 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 30 Jul 2016 23:08:08 +0100
Subject: [PATCH 161/250] unit tests are input too

---
 tests/bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 87f07f48e..453040b9c 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -127,7 +127,7 @@ protected function post_image($filename, $tags) {
 		$dae = new DataUploadEvent($filename, array(
 			"filename" => $filename,
 			"extension" => pathinfo($filename, PATHINFO_EXTENSION),
-			"tags" => $tags,
+			"tags" => Tag::explode($tags),
 			"source" => null,
 		));
 		send_event($dae);

From 89dffd569a9d73c44d37990c456cae9884805b5f Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 30 Jul 2016 23:41:42 +0100
Subject: [PATCH 162/250] and mass tagger

---
 ext/mass_tagger/main.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/mass_tagger/main.php b/ext/mass_tagger/main.php
index a1806d212..e46ec63c7 100644
--- a/ext/mass_tagger/main.php
+++ b/ext/mass_tagger/main.php
@@ -26,12 +26,11 @@ public function onPageRequest(PageRequestEvent $event) {
 		if($event->page_matches("mass_tagger/tag") && $user->is_admin()) {
 			if( !isset($_POST['ids']) or !isset($_POST['tag']) ) return;
 
-			$tag = $_POST['tag'];
+			$tags = Tag::explode($_POST['tag']);
 
-			$tag_array = explode(" ",$tag);
 			$pos_tag_array = array();
 			$neg_tag_array = array();
-			foreach($tag_array as $new_tag) {
+			foreach($tags as $new_tag) {
 				if (strpos($new_tag, '-') === 0)
 					$neg_tag_array[] = substr($new_tag,1);
 				else
@@ -45,18 +44,19 @@ public function onPageRequest(PageRequestEvent $event) {
 
 			if(isset($_POST['setadd']) && $_POST['setadd'] == 'set') {
 				foreach($images as $image) {
-					$image->set_tags(Tag::explode($tag));
+					$image->set_tags($tags);
 				}
 			}
 			else {
 				foreach($images as $image) {
 					if (!empty($neg_tag_array)) {
-						$img_tags = array_merge($pos_tag_array, explode(" ",$image->get_tag_list()));
+						$img_tags = array_merge($pos_tag_array, $image->get_tag_array());
 						$img_tags = array_diff($img_tags, $neg_tag_array);
-						$image->set_tags(Tag::explode($img_tags));
+						$image->set_tags($img_tags);
+					}
+					else {
+						$image->set_tags(array_merge($tags, $image->get_tag_array()));
 					}
-					else
-						$image->set_tags(Tag::explode($tag . " " . $image->get_tag_list()));
 				}
 			}
 

From d8e1346b782c21e54bda341b188acece0dbd68ee Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Thu, 18 Aug 2016 15:15:28 -0400
Subject: [PATCH 163/250] Replace deprecated DefaultType directive

---
 .htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index 7fdf0a5af..8e33b6f35 100644
--- a/.htaccess
+++ b/.htaccess
@@ -48,9 +48,9 @@
 	AddOutputFilterByType DEFLATE application/x-javascript application/javascript
 </ifmodule>
 
-DefaultType image/jpeg
 AddType audio/mp4      f4a f4b m4a
 AddType audio/ogg      oga ogg opus
+AddType image/jpeg     jpg jpeg
 AddType image/bmp      bmp
 AddType image/svg+xml  svg svgz
 AddType image/webp     webp

From 8fe92128823b00cafc18f24a08734869437d98c1 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Fri, 19 Aug 2016 15:16:53 -0400
Subject: [PATCH 164/250] Fixed assertion failure upon upload due to incorrect
 type check

---
 ext/upload/main.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/upload/main.php b/ext/upload/main.php
index da3d3430a..524f751b7 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -291,7 +291,7 @@ private function upload_error_message($error_code) {
 
 	/**
 	 * Handle an upload.
-	 * @param string $file
+	 * @param string[] $file
 	 * @param string[] $tags
 	 * @param string|null $source
 	 * @param int $replace
@@ -299,7 +299,7 @@ private function upload_error_message($error_code) {
 	 */
 	private function try_upload($file, $tags, $source, $replace=-1) {
 		global $page;
-		assert('is_string($file)');
+		assert('is_array($file)');
 		assert('is_array($tags)');
 		assert('is_string($source) || is_null($source)');
 		assert('is_int($replace)');

From cce24f9e80468268e9fa4a9b0ba21019f91da9d3 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Fri, 19 Aug 2016 20:03:55 -0400
Subject: [PATCH 165/250] Added video playback options for autoplay and loop

---
 ext/handle_video/main.php  | 11 ++++++++++-
 ext/handle_video/theme.php | 12 ++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ext/handle_video/main.php b/ext/handle_video/main.php
index 654711650..d8a187cd2 100644
--- a/ext/handle_video/main.php
+++ b/ext/handle_video/main.php
@@ -2,7 +2,7 @@
 /*
  * Name: Handle Video
  * Author: velocity37 <velocity37@gmail.com>
- * Modified By: Shish <webmaster@shishnet.org>, jgen <jeffgenovy@gmail.com>
+ * Modified By: Shish <webmaster@shishnet.org>, jgen <jeffgenovy@gmail.com>, im-mi <im.mi.mail.mi@gmail.com>
  * License: GPLv2
  * Description: Handle FLV, MP4, OGV and WEBM video files.
  * Documentation:
@@ -42,6 +42,9 @@ public function onInitExt(InitExtEvent $event) {
 			$config->set_int("ext_handle_video_version", 1);
 			log_info("pools", "extension installed");
 		}
+
+		$config->set_default_bool('video_playback_autoplay', TRUE);
+		$config->set_default_bool('video_playback_loop', TRUE);
 	}
 
 	public function onSetupBuilding(SetupBuildingEvent $event) {
@@ -67,6 +70,12 @@ public function onSetupBuilding(SetupBuildingEvent $event) {
 		$sb->add_bool_option("video_thumb_ignore_aspect_ratio", "Ignore aspect ratio when creating thumbnails: ");
 
 		$event->panel->add_block($sb);
+		
+		$sb = new SetupBlock("Video Playback Options");
+		$sb->add_bool_option("video_playback_autoplay", "Autoplay: ");
+		$sb->add_label("<br>");
+		$sb->add_bool_option("video_playback_loop", "Loop: ");
+		$event->panel->add_block($sb);
 	}
 
 	/**
diff --git a/ext/handle_video/theme.php b/ext/handle_video/theme.php
index 1699f7cda..159283b16 100644
--- a/ext/handle_video/theme.php
+++ b/ext/handle_video/theme.php
@@ -2,10 +2,13 @@
 
 class VideoFileHandlerTheme extends Themelet {
 	public function display_image(Page $page, Image $image) {
+		global $config;
 		$ilink = $image->get_image_link();
 		$thumb_url = make_http($image->get_thumb_link()); //used as fallback image
 		$ext = strtolower($image->get_ext());
 		$full_url = make_http($ilink);
+		$autoplay = $config->get_bool("video_playback_autoplay");
+		$loop = $config->get_bool("video_playback_loop");
 
 		$html = "Video not playing? <a href='" . $image->parse_link_template(make_link('image/$id/$id%20-%20$tags.$ext')) . "'>Click here</a> to download the file.<br/>";
 
@@ -25,7 +28,12 @@ public function display_image(Page $page, Image $image) {
 							<param name=\"allowFullScreen\" value=\"true\" />
 							<param name=\"wmode\" value=\"opaque\" />
 
-							<param name=\"flashVars\" value=\"controls=true&autoplay=true&poster={$thumb_url}&file={$full_url}\" />
+							<param name=\"flashVars\" value=\""
+								. "controls=true"
+								. "&autoplay=" . ($autoplay ? 'true' : 'false')
+								. "&poster={$thumb_url}"
+								. "&file={$full_url}"
+								. "&loop=" . ($loop ? 'true' : 'false') . "\" />
 							<img src=\"{$thumb_url}\" />
 						</object>";
 
@@ -34,7 +42,7 @@ public function display_image(Page $page, Image $image) {
 				$html .= $html_fallback;
 			} else {
 				$html .= "
-					<video controls autoplay width=\"100%\">
+					<video controls " . ($autoplay ? 'autoplay' : '') . " width=\"100%\" " . ($loop ? 'loop' : '') . ">
 						<source src='{$ilink}' type='{$supportedExts[$ext]}'>
 
 						<!-- If browser doesn't support filetype, fallback to flash -->

From 980e3b686b652847bdad4dccaeea1ea3bb62277d Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Fri, 19 Aug 2016 21:52:48 -0400
Subject: [PATCH 166/250] Fix log info section name

---
 ext/handle_video/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/handle_video/main.php b/ext/handle_video/main.php
index 654711650..bc264b75c 100644
--- a/ext/handle_video/main.php
+++ b/ext/handle_video/main.php
@@ -40,7 +40,7 @@ public function onInitExt(InitExtEvent $event) {
 			$config->set_default_bool('video_thumb_ignore_aspect_ratio', TRUE);
 
 			$config->set_int("ext_handle_video_version", 1);
-			log_info("pools", "extension installed");
+			log_info("handle_video", "extension installed");
 		}
 	}
 

From 36b66f4c23f64501426a2c0a4b92db5e98763f8c Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Mon, 29 Aug 2016 00:26:55 -0400
Subject: [PATCH 167/250] html_escape data-tags for tags that contain single
 quotes

---
 core/basethemelet.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/basethemelet.class.php b/core/basethemelet.class.php
index de23c99b0..71ce42882 100644
--- a/core/basethemelet.class.php
+++ b/core/basethemelet.class.php
@@ -54,7 +54,7 @@ public function build_thumb_html(Image $image) {
 		$h_view_link = make_link('post/view/'.$i_id);
 		$h_thumb_link = $image->get_thumb_link();
 		$h_tip = html_escape($image->get_tooltip());
-		$h_tags = strtolower($image->get_tag_list());
+		$h_tags = html_escape(strtolower($image->get_tag_list()));
 
 		$extArr = array_flip(array('swf', 'svg', 'mp3')); //List of thumbless filetypes
 		if(!isset($extArr[$image->ext])){

From 84b4ac38935ef184996a8768a9bbc451e3261ddd Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Mon, 29 Aug 2016 01:07:44 -0400
Subject: [PATCH 168/250] html_escape tag info link

---
 ext/tag_list/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/tag_list/theme.php b/ext/tag_list/theme.php
index db9bf4af0..0e97abb5f 100644
--- a/ext/tag_list/theme.php
+++ b/ext/tag_list/theme.php
@@ -216,7 +216,7 @@ public function return_tag($row, $tag_category_dict) {
 		$count = $row['calc_count'];
 		// if($n++) $display_html .= "\n<br/>";
 		if(!is_null($config->get_string('info_link'))) {
-			$link = str_replace('$tag', $tag, $config->get_string('info_link'));
+			$link = html_escape(str_replace('$tag', $tag, $config->get_string('info_link')));
 			$display_html .= ' <a class="tag_info_link'.$tag_category_css.'" '.$tag_category_style.'href="'.$link.'">?</a>';
 		}
 		$link = $this->tag_link($row['tag']);

From bcef3fbc8ff86d7f072e0d552d1033e1f5ab9573 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Mon, 29 Aug 2016 09:21:23 +0100
Subject: [PATCH 169/250] have tag sanitisation process ignore tags which are
 too long, fixes #565

---
 core/imageboard.pack.php | 5 +++++
 ext/tag_edit/test.php    | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index b619f3d5d..0827b411c 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -1102,6 +1102,11 @@ public static function explode($tags, $tagme=true) {
 			$tag = preg_replace("/^(\.+[\/\\\\])+/", "", $tag);   # trailing slashes?
 			$tag = trim($tag, ", \t\n\r\0\x0B");
 
+			if(mb_strlen($tag, 'UTF-8') > 255){
+				flash_message("The tag below is longer than 255 characters, please use a shorter tag.\n$tag\n");
+				continue;
+			}
+
 			if(!empty($tag)) {
 				$tag_array[] = $tag;
 			}
diff --git a/ext/tag_edit/test.php b/ext/tag_edit/test.php
index 498d29f43..8099a7025 100644
--- a/ext/tag_edit/test.php
+++ b/ext/tag_edit/test.php
@@ -21,6 +21,13 @@ public function testTagEdit() {
 		$this->log_out();
 	}
 
+	public function testTagEdit_tooLong() {
+		$this->log_in_as_user();
+		$image_id = $this->post_image("tests/pbx_screenshot.jpg", str_repeat("a", 500));
+		$this->get_page("post/view/$image_id");
+		$this->assert_title("Image $image_id: tagme");
+	}
+
 	public function testSourceEdit() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "pbx");

From bb64d12d9d71bb79d5ab0a57882353a09fd085af Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Thu, 1 Sep 2016 00:35:52 -0400
Subject: [PATCH 170/250] Use TextFormattingEvent instead of raw BBCode
 formatter

---
 ext/pools/theme.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ext/pools/theme.php b/ext/pools/theme.php
index 5edb3625e..651941039 100644
--- a/ext/pools/theme.php
+++ b/ext/pools/theme.php
@@ -154,8 +154,9 @@ private function display_top(/*array*/ $pools, /*string*/ $heading, $check_all=f
 				}
 			}
 
-			$bb = new BBCode();
-			$page->add_block(new Block(html_escape($pool['title']), $bb->format($pool['description']), "main", 10));
+			$tfe = new TextFormattingEvent($pool['description']);
+			send_event($tfe);
+			$page->add_block(new Block(html_escape($pool['title']), $tfe->formatted, "main", 10));
 		}
 	}
 

From 10e8fc50d3ae1a282aa5789bdd6b119888728af0 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Thu, 1 Sep 2016 03:23:52 -0400
Subject: [PATCH 171/250] Fix "starts-with" header in tag list when escaping
 required

This fixes the "starts-with" headers* on the tags/alphabetic page. Before, the headers would be wrong if they started with an escaped character.

This also escapes the resulting header so that it no longer generates invalid HTML in such cases.

* Note that these headers are only visible when paged tag lists is disabled.
---
 ext/tag_list/main.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ext/tag_list/main.php b/ext/tag_list/main.php
index aff12bb6a..c97ebac46 100644
--- a/ext/tag_list/main.php
+++ b/ext/tag_list/main.php
@@ -297,13 +297,15 @@ private function build_tag_alphabetic() {
 		
 		$lastLetter = "";
 		foreach($tag_data as $row) {
-			$h_tag = html_escape($row['tag']);
-			$count = $row['count'];
-			if($lastLetter != mb_strtolower(substr($h_tag, 0, count($starts_with)+1))) {
-				$lastLetter = mb_strtolower(substr($h_tag, 0, count($starts_with)+1));
-				$html .= "<p>$lastLetter<br>";
+			$tag = $row['tag'];
+			if($lastLetter != mb_strtolower(substr($tag, 0, count($starts_with)+1))) {
+				$lastLetter = mb_strtolower(substr($tag, 0, count($starts_with)+1));
+				$h_lastLetter = html_escape($lastLetter); 
+				$html .= "<p>$h_lastLetter<br>";
 			}
-			$link = $this->tag_link($row['tag']);
+			$link = $this->tag_link($tag);
+			$h_tag = html_escape($tag);
+			$count = $row['count'];
 			$html .= "<a href='$link'>$h_tag&nbsp;($count)</a>\n";
 		}
 

From b554e7505bda81b4a9417982f5fa6e1647e2b1e4 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Thu, 1 Sep 2016 21:57:53 -0400
Subject: [PATCH 172/250] Added zoom support to webm

---
 ext/handle_video/theme.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ext/handle_video/theme.php b/ext/handle_video/theme.php
index 159283b16..171582d5e 100644
--- a/ext/handle_video/theme.php
+++ b/ext/handle_video/theme.php
@@ -42,7 +42,12 @@ public function display_image(Page $page, Image $image) {
 				$html .= $html_fallback;
 			} else {
 				$html .= "
-					<video controls " . ($autoplay ? 'autoplay' : '') . " width=\"100%\" " . ($loop ? 'loop' : '') . ">
+					<video controls class='shm-main-image' id='main_image' alt='main image'"
+						. ($autoplay ? ' autoplay' : '')
+						. ($loop ? ' loop' : '')
+						. " data-width='{$image->width}' "
+						. " data-height='{$image->height}'>
+
 						<source src='{$ilink}' type='{$supportedExts[$ext]}'>
 
 						<!-- If browser doesn't support filetype, fallback to flash -->

From eeb0c2b9741d729aa963761d86ec5b0ffcd57226 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Fri, 2 Sep 2016 00:36:34 -0400
Subject: [PATCH 173/250] Only allow click-to-zoom on img

---
 ext/handle_pixel/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/handle_pixel/script.js b/ext/handle_pixel/script.js
index b85094cce..1857c178d 100644
--- a/ext/handle_pixel/script.js
+++ b/ext/handle_pixel/script.js
@@ -28,7 +28,7 @@ $(function() {
 		zoom(this.options[this.selectedIndex].value);
 	});
 
-	$(".shm-main-image").click(function(e) {
+	$("img.shm-main-image").click(function(e) {
 		switch(Cookies.get("ui-image-zoom")) {
 			case "full": zoom("width"); break;
 			default: zoom("full"); break;

From f26fc5925b405c745c34b47ff13c486bb962dfbc Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Thu, 1 Sep 2016 23:08:28 -0400
Subject: [PATCH 174/250] Added zoom support to ico

---
 ext/handle_ico/theme.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ext/handle_ico/theme.php b/ext/handle_ico/theme.php
index aa0927092..3741096ff 100644
--- a/ext/handle_ico/theme.php
+++ b/ext/handle_ico/theme.php
@@ -4,7 +4,8 @@ class IcoFileHandlerTheme extends Themelet {
 	public function display_image(Page $page, Image $image) {
 		$ilink = make_link("get_ico/{$image->id}/{$image->id}.ico");
 		$html = "
-			<img id='main_image' src='$ilink'>
+			<img id='main_image' class='shm-main-image' alt='main image' src='$ilink'
+			data-width='{$image->width}' data-height='{$image->height}'>
 		";
 		$page->add_block(new Block("Image", $html, "main", 10));
 	}

From 84dbc3abff595a4781169bdc6945546cb69bff7f Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Thu, 1 Sep 2016 22:48:33 -0400
Subject: [PATCH 175/250] Re-apply zoom upon window resize

---
 ext/handle_pixel/script.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ext/handle_pixel/script.js b/ext/handle_pixel/script.js
index 1857c178d..16faa8788 100644
--- a/ext/handle_pixel/script.js
+++ b/ext/handle_pixel/script.js
@@ -27,6 +27,11 @@ $(function() {
 	$(".shm-zoomer").change(function(e) {
 		zoom(this.options[this.selectedIndex].value);
 	});
+	$(window).resize(function(e) {
+		$(".shm-zoomer").each(function (e) {
+			zoom(this.options[this.selectedIndex].value)
+		});
+	});
 
 	$("img.shm-main-image").click(function(e) {
 		switch(Cookies.get("ui-image-zoom")) {

From 35d2f8682ccfd91b725b41b6f70317b7d8ef3750 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Thu, 1 Sep 2016 23:34:18 -0400
Subject: [PATCH 176/250] Don't save zoom mode cookie upon window resize

---
 ext/handle_pixel/script.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ext/handle_pixel/script.js b/ext/handle_pixel/script.js
index 16faa8788..e127e42f9 100644
--- a/ext/handle_pixel/script.js
+++ b/ext/handle_pixel/script.js
@@ -1,5 +1,7 @@
 $(function() {
-	function zoom(zoom_type) {
+	function zoom(zoom_type, save_cookie) {
+		save_cookie = save_cookie === undefined ? true : save_cookie;
+		
 		var img = $('.shm-main-image');
 		
 		if(zoom_type == "full") {
@@ -21,7 +23,9 @@ $(function() {
 		
 		$(".shm-zoomer").val(zoom_type);
 		
-		Cookies.set("ui-image-zoom", zoom_type, {expires: 365});
+		if (save_cookie) {
+			Cookies.set("ui-image-zoom", zoom_type, {expires: 365});
+		}
 	}
 
 	$(".shm-zoomer").change(function(e) {
@@ -29,7 +33,7 @@ $(function() {
 	});
 	$(window).resize(function(e) {
 		$(".shm-zoomer").each(function (e) {
-			zoom(this.options[this.selectedIndex].value)
+			zoom(this.options[this.selectedIndex].value, false)
 		});
 	});
 

From 49d6fa99da2e52f3db89fd84802049f1dfa7c58c Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Fri, 2 Sep 2016 05:08:58 -0400
Subject: [PATCH 177/250] Clear the mass tagger's selection on load .. in case
 it was autocompleted by the browser.

---
 ext/mass_tagger/script.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ext/mass_tagger/script.js b/ext/mass_tagger/script.js
index 7a028e01e..26b3e61ca 100644
--- a/ext/mass_tagger/script.js
+++ b/ext/mass_tagger/script.js
@@ -34,3 +34,8 @@ function toggle_tag( button, id ) {
 		list.val(string);
 	}
 }
+
+$(function () {
+	// Clear the selection, in case it was autocompleted by the browser.
+	$('#mass_tagger_ids').val("");
+});

From d2540a9619670e10eca8d9cec6bf2abefc955837 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Fri, 2 Sep 2016 05:14:55 -0400
Subject: [PATCH 178/250] Use CSS for mass tagger button styling

---
 ext/mass_tagger/script.js | 4 ++--
 ext/mass_tagger/style.css | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 ext/mass_tagger/style.css

diff --git a/ext/mass_tagger/script.js b/ext/mass_tagger/script.js
index 26b3e61ca..0e4dbcd95 100644
--- a/ext/mass_tagger/script.js
+++ b/ext/mass_tagger/script.js
@@ -24,12 +24,12 @@ function toggle_tag( button, id ) {
     var string = list.val();
     
     if( (string.indexOf(id) == 0) || (string.indexOf(":"+id) > -1) ) {
-		$(button).css('border', 'none');
+		$(button).removeClass('mass-tagger-selected');
 		string = string.replace(id, '');
 		list.val(string);
 	}
 	else {
-		$(button).css('border', '3px solid blue');
+		$(button).addClass('mass-tagger-selected');
 		string += id;
 		list.val(string);
 	}
diff --git a/ext/mass_tagger/style.css b/ext/mass_tagger/style.css
new file mode 100644
index 000000000..c0a2ea6c7
--- /dev/null
+++ b/ext/mass_tagger/style.css
@@ -0,0 +1,3 @@
+.mass-tagger-selected {
+	border: 3px solid blue;
+}
\ No newline at end of file

From 15ffdff3875828ee61dae665b765cefbde274ffa Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Fri, 2 Sep 2016 02:16:07 -0400
Subject: [PATCH 179/250] Fix .ico when size is 256 x 256

---
 ext/handle_ico/main.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/handle_ico/main.php b/ext/handle_ico/main.php
index 83cd9d56f..8bb9932ff 100644
--- a/ext/handle_ico/main.php
+++ b/ext/handle_ico/main.php
@@ -72,8 +72,10 @@ private function create_image_from_data($filename, $metadata) {
 		$subheader = unpack("cwidth/cheight/ccolours/cnull/splanes/sbpp/lsize/loffset", fread($fp, 16));
 		fclose($fp);
 
-		$image->width = $subheader['width'];
-		$image->height = $subheader['height'];
+		$width = $subheader['width'];
+		$height = $subheader['height'];
+		$image->width = width == 0 ? 256 : width;
+		$image->height = height == 0 ? 256 : height;
 
 		$image->filesize  = $metadata['size'];
 		$image->hash      = $metadata['hash'];

From 3051334d8f153862a3e1b1a6de65c08b31ede52d Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Fri, 2 Sep 2016 16:19:02 +0100
Subject: [PATCH 180/250] be explicit that variables are variables

---
 ext/handle_ico/main.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/handle_ico/main.php b/ext/handle_ico/main.php
index 8bb9932ff..4e53c249b 100644
--- a/ext/handle_ico/main.php
+++ b/ext/handle_ico/main.php
@@ -74,8 +74,8 @@ private function create_image_from_data($filename, $metadata) {
 
 		$width = $subheader['width'];
 		$height = $subheader['height'];
-		$image->width = width == 0 ? 256 : width;
-		$image->height = height == 0 ? 256 : height;
+		$image->width = $width == 0 ? 256 : $width;
+		$image->height = $height == 0 ? 256 : $height;
 
 		$image->filesize  = $metadata['size'];
 		$image->hash      = $metadata['hash'];

From 17f71094f22106a4baf760b6f55a0c627ab7e6f2 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sat, 3 Sep 2016 04:39:40 -0400
Subject: [PATCH 181/250] Use the size of the outermost svg element ... in case
 there are nested svg elements.

---
 ext/handle_svg/main.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ext/handle_svg/main.php b/ext/handle_svg/main.php
index 872d59d42..6db9ad1d9 100644
--- a/ext/handle_svg/main.php
+++ b/ext/handle_svg/main.php
@@ -101,6 +101,9 @@ class MiniSVGParser {
 	/** @var int */
 	public $height=0;
 
+	/** @var int */
+	private $xml_depth=0;
+
 	/** @param string $file */
 	function __construct($file) {
 		$xml_parser = xml_parser_create();
@@ -110,13 +113,15 @@ function __construct($file) {
 	}
 
 	function startElement($parser, $name, $attrs) {
-		if($name == "SVG") {
+		if($name == "SVG" && $this->xml_depth == 0) {
 			$this->width = int_escape($attrs["WIDTH"]);
 			$this->height = int_escape($attrs["HEIGHT"]);
 		}
+		$this->xml_depth++;
 	}
 
 	function endElement($parser, $name) {
+		$this->xml_depth--;
 	}
 }
 

From d9903a969d2b2d6479a07994290013fa9980f68c Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sat, 3 Sep 2016 04:50:15 -0400
Subject: [PATCH 182/250] Added zoom support to svg

---
 ext/handle_svg/theme.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/handle_svg/theme.php b/ext/handle_svg/theme.php
index 76d76aa38..8e87ee1d6 100644
--- a/ext/handle_svg/theme.php
+++ b/ext/handle_svg/theme.php
@@ -5,8 +5,8 @@ public function display_image(Page $page, Image $image) {
 		$ilink = make_link("get_svg/{$image->id}/{$image->id}.svg");
 //		$ilink = $image->get_image_link();
 		$html = "
-			<object data='$ilink' type='image/svg+xml' width='{$image->width}' height='{$image->height}'>
-			    <embed src='$ilink' type='image/svg+xml' width='{$image->width}' height='{$image->height}' />
+			<object data='$ilink' type='image/svg+xml' data-width='{$image->width}' data-height='{$image->height}' id='main_image' class='shm-main-image'>
+				<embed src='$ilink' type='image/svg+xml' />
 			</object>
 		";
 		$page->add_block(new Block("Image", $html, "main", 10));

From d39b084537135b6cdff91f067834f4532b4e2fdf Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sat, 3 Sep 2016 13:37:26 -0400
Subject: [PATCH 183/250] Properly end attribute list of tag on upload form

---
 ext/upload/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/upload/theme.php b/ext/upload/theme.php
index 76c6e4383..b041e5b0f 100644
--- a/ext/upload/theme.php
+++ b/ext/upload/theme.php
@@ -59,7 +59,7 @@ protected function h_upload_list_1() {
 				$upload_list .= "
 					<tr>
 						<td colspan='2'><input type='file' name='data$i'></td>
-						<td colspan='2'><input type='text' name='url$i'</td>
+						<td colspan='2'><input type='text' name='url$i'></td>
 						<td colspan='2'><input type='text' name='tags$i' class='autocomplete_tags' autocomplete='off'></td>
 					</tr>
 				";

From 10d47409adf897e86015856a7c8b2e9a22f0cf85 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sat, 3 Sep 2016 13:48:20 -0400
Subject: [PATCH 184/250] Added doctype to home page

---
 ext/home/theme.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/home/theme.php b/ext/home/theme.php
index 7abe784f3..07ef10a2a 100644
--- a/ext/home/theme.php
+++ b/ext/home/theme.php
@@ -6,6 +6,7 @@ public function display_page(Page $page, $sitename, $base_href, $theme_name, $bo
 		$page->add_auto_html_headers();
 		$hh = $page->get_all_html_headers();
 		$page->set_data(<<<EOD
+<!doctype html>
 <html>
 	<head>
 		<title>$sitename</title>

From ac53fe52dec4a1fd85093530bd1a96b24d609981 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sat, 3 Sep 2016 14:06:15 -0400
Subject: [PATCH 185/250] Removed obsolete language specification from <script>

---
 ext/pools/theme.php | 6 +++---
 ext/setup/main.php  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ext/pools/theme.php b/ext/pools/theme.php
index 651941039..78b6699b2 100644
--- a/ext/pools/theme.php
+++ b/ext/pools/theme.php
@@ -215,7 +215,7 @@ public function sidebar_options(Page $page, $pool, /*bool*/ $check_all) {
 
 		if($user->id == $pool['user_id'] || $user->is_admin()){
 			$editor .= "
-				<script language='javascript' type='text/javascript'>
+				<script type='text/javascript'>
 				<!--
 				function confirm_action() {
 					return confirm('Are you sure that you want to delete this pool?');
@@ -232,7 +232,7 @@ function confirm_action() {
 
 		if($check_all) {
 			$editor .= "
-				<script language='javascript' type='text/javascript'>
+				<script type='text/javascript'>
 				<!--
 				function setAll(value) {
 					$('[name=\"check[]\"]').attr('checked', value);
@@ -258,7 +258,7 @@ public function pool_result(Page $page, /*array*/ $images, /*array*/ $pool) {
 
 		$this->display_top($pool, "Importing Posts", true);
 		$pool_images = "
-			<script language='javascript' type='text/javascript'>
+			<script type='text/javascript'>
 			<!--
 			function confirm_action() {
 				return confirm('Are you sure you want to add selected posts to this pool?');
diff --git a/ext/setup/main.php b/ext/setup/main.php
index 751b202f9..6bef9dcf8 100644
--- a/ext/setup/main.php
+++ b/ext/setup/main.php
@@ -262,7 +262,7 @@ public function onSetupBuilding(SetupBuildingEvent $event) {
                 $full = (@$_SERVER["HTTPS"] ? "https://" : "http://") . $host . $_SERVER["PHP_SELF"];
 		$test_url = str_replace("/index.php", "/nicetest", $full);
 
-		$nicescript = "<script language='javascript'>
+		$nicescript = "<script type='text/javascript'>
 			function getHTTPObject() {
 				if (window.XMLHttpRequest){
 					return new XMLHttpRequest();

From 91fea63319ae370149c82fba2b10a94e5f3a6122 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sat, 3 Sep 2016 14:24:51 -0400
Subject: [PATCH 186/250] Removed stray end tag

---
 ext/image_view_counter/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/image_view_counter/main.php b/ext/image_view_counter/main.php
index 8cd9d409a..956136321 100644
--- a/ext/image_view_counter/main.php
+++ b/ext/image_view_counter/main.php
@@ -37,7 +37,7 @@ public function onImageInfoBoxBuilding(ImageInfoBoxBuildingEvent $event) {
 			$event->add_part(
 				"<tr><th>Views:</th><td>". 
 				$this->get_view_count($event->image->id) .
-				"</th></tr>", 38);
+				"</tr>", 38);
 	}
 
 	# Installs DB table

From e5cfea028ac07973942de9d3ee5a5b432122543f Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sat, 3 Sep 2016 14:43:23 -0400
Subject: [PATCH 187/250] Fixed mass source set's broken dialog

---
 ext/tag_edit/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php
index 5536a8bfc..498cfcd10 100644
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@@ -24,7 +24,7 @@ public function mss_html($terms) {
 		$html = make_form(make_link("tag_edit/mass_source_set"), "POST") . "
 				<input type='hidden' name='tags' value='$h_terms'>
 				<input type='text' name='source' value=''>
-				<input type='submit' value='Set Source For All' onclick='return confirm(\"This will mass-edit all sources on the page.\nAre you sure you want to do this?\")'>
+				<input type='submit' value='Set Source For All' onclick='return confirm(\"This will mass-edit all sources on the page.\\nAre you sure you want to do this?\")'>
 			</form>
 		";
 		return $html;

From 59191124770d3591ffedac88da735b1b63b0e8a6 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Tue, 6 Sep 2016 03:18:36 -0400
Subject: [PATCH 188/250] Use tables for tag lists

---
 ext/tag_list/theme.php     | 106 +++++++++++++++++++++----------------
 themes/danbooru/style.css  |   9 ++++
 themes/danbooru2/style.css |  10 ++++
 themes/default/style.css   |  10 ++++
 themes/futaba/style.css    |  14 +++++
 themes/lite/style.css      |  10 ++++
 themes/material/style.css  |   9 ++++
 themes/warm/style.css      |  11 ++++
 8 files changed, 132 insertions(+), 47 deletions(-)

diff --git a/ext/tag_list/theme.php b/ext/tag_list/theme.php
index 0e97abb5f..886f1730b 100644
--- a/ext/tag_list/theme.php
+++ b/ext/tag_list/theme.php
@@ -35,6 +35,29 @@ public function display_page(Page $page) {
 
 	// =======================================================================
 
+	protected function get_tag_list_preamble() {
+		global $config;
+
+		$tag_info_link_is_visible = !is_null($config->get_string('info_link'));
+		$tag_count_is_visible = $config->get_bool("tag_list_numbers");
+
+		return '
+			<table class="tag_list sortable">
+				<colgroup>' .
+					($tag_info_link_is_visible ? '<col class="tag_info_link_column">' : '') .
+					('<col class="tag_name_column">') .
+					($tag_count_is_visible ? '<col class="tag_count_column">' : '') . '
+				</colgroup>
+				<thead>
+					<tr>' .
+						($tag_info_link_is_visible ? '<th class="tag_info_link_cell"></th>' : '') .
+						('<th class="tag_name_cell">Tag</th>') .
+						($tag_count_is_visible ? '<th class="tag_count_cell">#</th>' : '') . '
+					</tr>
+				</thead>
+				<tbody>';
+	}
+
 	/*
 	 * $tag_infos = array(
 	 *                 array('tag' => $tag, 'count' => $number_of_uses),
@@ -61,9 +84,9 @@ public function display_split_related_block(Page $page, $tag_infos) {
 			$category = $split[0];
 			$tag_html = $split[1];
 			if(!isset($tag_categories_html[$category])) {
-				$tag_categories_html[$category] = '';
+				$tag_categories_html[$category] = $this->get_tag_list_preamble();
 			}
-			$tag_categories_html[$category] .= $tag_html . '<br />';
+			$tag_categories_html[$category] .= "<tr>$tag_html</tr>";
 
 			if(!isset($tag_categories_count[$category])) {
 				$tag_categories_count[$category] = 0;
@@ -71,6 +94,10 @@ public function display_split_related_block(Page $page, $tag_infos) {
 			$tag_categories_count[$category] += 1;
 		}
 
+		foreach(array_keys($tag_categories_html) as $category) {
+			$tag_categories_html[$category] .= '</tbody></table>';
+		}
+
 		asort($tag_categories_html);
 		if(isset($tag_categories_html[' '])) $main_html = $tag_categories_html[' ']; else $main_html = null;
 		unset($tag_categories_html[' ']);
@@ -99,10 +126,8 @@ public function display_split_related_block(Page $page, $tag_infos) {
 	 *                 ...
 	 *              )
 	 */
-	public function display_related_block(Page $page, $tag_infos) {
-		global $config;
-
-		if($config->get_string('tag_list_related_sort') == 'alphabetical') asort($tag_infos);
+	private function get_tag_list_html($tag_infos, $sort) {
+		if($sort == 'alphabetical') asort($tag_infos);
 
 		if(class_exists('TagCategories')) {
 			$this->tagcategories = new TagCategories;
@@ -111,15 +136,32 @@ public function display_related_block(Page $page, $tag_infos) {
 		else {
 			$tag_category_dict = array();
 		}
-		$main_html = '';
+		$main_html = $this->get_tag_list_preamble();
 
 		foreach($tag_infos as $row) {
 			$split = $this->return_tag($row, $tag_category_dict);
 			//$category = $split[0];
 			$tag_html = $split[1];
-			$main_html .= $tag_html . '<br />';
+			$main_html .= "<tr>$tag_html</tr>";
 		}
 
+		$main_html .= '</tbody></table>';
+
+		return $main_html;
+	}
+
+	/*
+	 * $tag_infos = array(
+	 *                 array('tag' => $tag, 'count' => $number_of_uses),
+	 *                 ...
+	 *              )
+	 */
+	public function display_related_block(Page $page, $tag_infos) {
+		global $config;
+
+		$main_html = $this->get_tag_list_html(
+			$tag_infos, $config->get_string('tag_list_related_sort'));
+
 		if($config->get_string('tag_list_image_type')=="tags") {
 			$page->add_block(new Block("Tags", $main_html, "left", 10));
 		}
@@ -138,25 +180,10 @@ public function display_related_block(Page $page, $tag_infos) {
 	public function display_popular_block(Page $page, $tag_infos) {
 		global $config;
 
-		if($config->get_string('tag_list_popular_sort') == 'alphabetical') asort($tag_infos);
-
-		if(class_exists('TagCategories')) {
-			$this->tagcategories = new TagCategories;
-			$tag_category_dict = $this->tagcategories->getKeyedDict();
-		}
-		else {
-			$tag_category_dict = array();
-		}
-		$main_html = '';
-
-		foreach($tag_infos as $row) {
-			$split = self::return_tag($row, $tag_category_dict);
-			//$category = $split[0];
-			$tag_html = $split[1];
-			$main_html .= $tag_html . '<br />';
-		}
-
+		$main_html = $this->get_tag_list_html(
+			$tag_infos, $config->get_string('tag_list_popular_sort'));
 		$main_html .= "&nbsp;<br><a class='more' href='".make_link("tags")."'>Full List</a>\n";
+
 		$page->add_block(new Block("Popular Tags", $main_html, "left", 60));
 	}
 
@@ -170,25 +197,10 @@ public function display_popular_block(Page $page, $tag_infos) {
 	public function display_refine_block(Page $page, $tag_infos, $search) {
 		global $config;
 
-		if($config->get_string('tag_list_popular_sort') == 'alphabetical') asort($tag_infos);
-
-		if(class_exists('TagCategories')) {
-			$this->tagcategories = new TagCategories;
-			$tag_category_dict = $this->tagcategories->getKeyedDict();
-		}
-		else {
-			$tag_category_dict = array();
-		}
-		$main_html = '';
-
-		foreach($tag_infos as $row) {
-			$split = self::return_tag($row, $tag_category_dict);
-			//$category = $split[0];
-			$tag_html = $split[1];
-			$main_html .= $tag_html . '<br />';
-		}
-
+		$main_html = $this->get_tag_list_html(
+			$tag_infos, $config->get_string('tag_list_popular_sort'));
 		$main_html .= "&nbsp;<br><a class='more' href='".make_link("tags")."'>Full List</a>\n";
+
 		$page->add_block(new Block("refine Search", $main_html, "left", 60));
 	}
 
@@ -217,13 +229,13 @@ public function return_tag($row, $tag_category_dict) {
 		// if($n++) $display_html .= "\n<br/>";
 		if(!is_null($config->get_string('info_link'))) {
 			$link = html_escape(str_replace('$tag', $tag, $config->get_string('info_link')));
-			$display_html .= ' <a class="tag_info_link'.$tag_category_css.'" '.$tag_category_style.'href="'.$link.'">?</a>';
+			$display_html .= ' <td class="tag_info_link_cell"><a class="tag_info_link'.$tag_category_css.'" '.$tag_category_style.'href="'.$link.'">?</a></td>';
 		}
 		$link = $this->tag_link($row['tag']);
-		$display_html .= ' <a class="tag_name'.$tag_category_css.'" '.$tag_category_style.'href="'.$link.'">'.$h_tag_no_underscores.'</a>';
+		$display_html .= ' <td class="tag_name_cell"><a class="tag_name'.$tag_category_css.'" '.$tag_category_style.'href="'.$link.'">'.$h_tag_no_underscores.'</a></td>';
 
 		if($config->get_bool("tag_list_numbers")) {
-			$display_html .= " <span class='tag_count'>$count</span>";
+			$display_html .= " <td class='tag_count_cell'><span class='tag_count'>$count</span></td>";
 		}
 
 		return array($category, $display_html);
diff --git a/themes/danbooru/style.css b/themes/danbooru/style.css
index 96dd79f3d..480aba71f 100644
--- a/themes/danbooru/style.css
+++ b/themes/danbooru/style.css
@@ -132,6 +132,15 @@ overflow:hidden;
 text-align:left;
 width:150px;
 }
+TABLE.tag_list {
+	border-collapse: collapse;
+}
+TABLE.tag_list>THEAD {
+	display: none;
+}
+TABLE.tag_list>TBODY>TR>TD {
+	display: inline;
+}
 .tag_count {
 color:#AAAAAA;
 }
diff --git a/themes/danbooru2/style.css b/themes/danbooru2/style.css
index efa39edf5..09771b8df 100644
--- a/themes/danbooru2/style.css
+++ b/themes/danbooru2/style.css
@@ -152,6 +152,16 @@ max-width:150px;
 width:15rem;
 text-align:left;
 }
+TABLE.tag_list {
+	width: auto;
+	border-collapse: collapse;
+}
+TABLE.tag_list>THEAD {
+	display: none;
+}
+TABLE.tag_list>TBODY>TR>TD {
+	display: inline;
+}
 .tag_count {
 display:inline-block;
 margin-left:0.4rem;
diff --git a/themes/default/style.css b/themes/default/style.css
index 816e47a69..d79a9f4ff 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -96,6 +96,16 @@ NAV SELECT {
 	padding: 0px;
 }
 
+TABLE.tag_list {
+	border-collapse: collapse;
+}
+TABLE.tag_list>THEAD {
+	display: none;
+}
+TABLE.tag_list>TBODY>TR>TD {
+	display: inline;
+}
+
 .more:after {
 	content: " >>>";
 }
diff --git a/themes/futaba/style.css b/themes/futaba/style.css
index f58cbda14..f1015d298 100644
--- a/themes/futaba/style.css
+++ b/themes/futaba/style.css
@@ -61,6 +61,20 @@ TD {
 	vertical-align: top;
 }
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+*             the navigation bar, and all its blocks             *
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+TABLE.tag_list {
+	border-collapse: collapse;
+}
+TABLE.tag_list>THEAD {
+	display: none;
+}
+TABLE.tag_list>TBODY>TR>TD {
+	display: inline;
+}
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *                     specific page types                        *
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
diff --git a/themes/lite/style.css b/themes/lite/style.css
index fe519214f..f872f204d 100644
--- a/themes/lite/style.css
+++ b/themes/lite/style.css
@@ -218,6 +218,16 @@ NAV SELECT {
 	text-align: left;
 }
 
+TABLE.tag_list {
+	border-collapse: collapse;
+}
+TABLE.tag_list>THEAD {
+	display: none;
+}
+TABLE.tag_list>TBODY>TR>TD {
+	display: inline;
+}
+
 .more:after {
 	content: " >>>";
 }
diff --git a/themes/material/style.css b/themes/material/style.css
index d3aa59d74..41c1f7049 100644
--- a/themes/material/style.css
+++ b/themes/material/style.css
@@ -1,3 +1,12 @@
 .nav-card{
   min-height: 3em;
 }
+TABLE.tag_list {
+  border-collapse: collapse;
+}
+TABLE.tag_list>THEAD {
+  display: none;
+}
+TABLE.tag_list>TBODY>TR>TD {
+  display: inline;
+}
\ No newline at end of file
diff --git a/themes/warm/style.css b/themes/warm/style.css
index 3bb5d01a2..f1bae3f95 100644
--- a/themes/warm/style.css
+++ b/themes/warm/style.css
@@ -117,6 +117,17 @@ NAV SELECT {
 	padding: 0px;
 }
 
+TABLE.tag_list {
+	width: 100%;
+	border-collapse: collapse;
+}
+TABLE.tag_list>THEAD {
+	display: none;
+}
+TABLE.tag_list>TBODY>TR>TD {
+	display: inline;
+}
+
 .more:after {
 	content: " >>>";
 }

From 73ff0e669d7ef19e36f74d8b9bafe65657a0b9c0 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Tue, 6 Sep 2016 08:34:20 -0400
Subject: [PATCH 189/250] Use generic NavBlock instead of "Index" block on pool
 pages

---
 ext/pools/theme.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ext/pools/theme.php b/ext/pools/theme.php
index 651941039..b02b8becb 100644
--- a/ext/pools/theme.php
+++ b/ext/pools/theme.php
@@ -136,14 +136,13 @@ private function display_top(/*array*/ $pools, /*string*/ $heading, $check_all=f
 		$page->set_title($heading);
 		$page->set_heading($heading);
 
-		$nav_html = '<a href="'.make_link().'">Index</a>';
 		$poolnav_html = '
 			<a href="'.make_link("pool/list").'">Pool Index</a>
 			<br><a href="'.make_link("pool/new").'">Create Pool</a>
 			<br><a href="'.make_link("pool/updated").'">Pool Changes</a>
 		';
 
-		$page->add_block(new Block($nav_html, null, "left", 5, "indexnavleft"));
+		$page->add_block(new NavBlock());
 		$page->add_block(new Block("Pool Navigation", $poolnav_html, "left", 10));
 
 		if(count($pools) == 1) {

From ab33652d70d444943a86ecf03ff65c33ff7cbe5c Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Tue, 6 Sep 2016 22:05:34 -0400
Subject: [PATCH 190/250] Made tag list spacing more like it was before It's
 still a few pixels off in some cases, but the difference is negligible now.

---
 themes/danbooru/style.css  | 5 +++++
 themes/danbooru2/style.css | 5 +++++
 themes/default/style.css   | 4 ++++
 themes/futaba/style.css    | 5 +++++
 themes/lite/style.css      | 5 +++++
 themes/material/style.css  | 5 +++++
 themes/warm/style.css      | 5 +++++
 7 files changed, 34 insertions(+)

diff --git a/themes/danbooru/style.css b/themes/danbooru/style.css
index 480aba71f..59701969f 100644
--- a/themes/danbooru/style.css
+++ b/themes/danbooru/style.css
@@ -140,6 +140,11 @@ TABLE.tag_list>THEAD {
 }
 TABLE.tag_list>TBODY>TR>TD {
 	display: inline;
+	padding: 0;
+	line-height: 1em;
+}
+TABLE.tag_list>TBODY>TR>TD:after {
+	content: " ";
 }
 .tag_count {
 color:#AAAAAA;
diff --git a/themes/danbooru2/style.css b/themes/danbooru2/style.css
index 09771b8df..610d6bef7 100644
--- a/themes/danbooru2/style.css
+++ b/themes/danbooru2/style.css
@@ -161,6 +161,11 @@ TABLE.tag_list>THEAD {
 }
 TABLE.tag_list>TBODY>TR>TD {
 	display: inline;
+	padding: 0;
+	line-height: 1em;
+}
+TABLE.tag_list>TBODY>TR>TD:after {
+	content: " ";
 }
 .tag_count {
 display:inline-block;
diff --git a/themes/default/style.css b/themes/default/style.css
index d79a9f4ff..0f65cd514 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -104,6 +104,10 @@ TABLE.tag_list>THEAD {
 }
 TABLE.tag_list>TBODY>TR>TD {
 	display: inline;
+	padding: 0;
+}
+TABLE.tag_list>TBODY>TR>TD:after {
+	content: " ";
 }
 
 .more:after {
diff --git a/themes/futaba/style.css b/themes/futaba/style.css
index f1015d298..34805b86f 100644
--- a/themes/futaba/style.css
+++ b/themes/futaba/style.css
@@ -73,6 +73,11 @@ TABLE.tag_list>THEAD {
 }
 TABLE.tag_list>TBODY>TR>TD {
 	display: inline;
+	padding: 0;
+	line-height: 1em;
+}
+TABLE.tag_list>TBODY>TR>TD:after {
+	content: " ";
 }
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/themes/lite/style.css b/themes/lite/style.css
index f872f204d..f78564959 100644
--- a/themes/lite/style.css
+++ b/themes/lite/style.css
@@ -226,6 +226,11 @@ TABLE.tag_list>THEAD {
 }
 TABLE.tag_list>TBODY>TR>TD {
 	display: inline;
+	padding: 0;
+	line-height: 1em;
+}
+TABLE.tag_list>TBODY>TR>TD:after {
+	content: " ";
 }
 
 .more:after {
diff --git a/themes/material/style.css b/themes/material/style.css
index 41c1f7049..294c2688f 100644
--- a/themes/material/style.css
+++ b/themes/material/style.css
@@ -9,4 +9,9 @@ TABLE.tag_list>THEAD {
 }
 TABLE.tag_list>TBODY>TR>TD {
   display: inline;
+  padding: 0;
+  line-height: 1em;
+}
+TABLE.tag_list>TBODY>TR>TD:after {
+  content: " ";
 }
\ No newline at end of file
diff --git a/themes/warm/style.css b/themes/warm/style.css
index f1bae3f95..0b1176313 100644
--- a/themes/warm/style.css
+++ b/themes/warm/style.css
@@ -126,6 +126,11 @@ TABLE.tag_list>THEAD {
 }
 TABLE.tag_list>TBODY>TR>TD {
 	display: inline;
+	padding: 0;
+	line-height: 1em;
+}
+TABLE.tag_list>TBODY>TR>TD:after {
+	content: " ";
 }
 
 .more:after {

From 58096e10c889c5cc7d9cd7c77fe070e9c313c131 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Tue, 6 Sep 2016 22:10:09 -0400
Subject: [PATCH 191/250] Fix tag list clipboard spacing

This brings back the original behavior of having spaces between the columns when the tag list gets copied to the clipboard (tested in Chrome, Edge, and Firefox).

One caveat: Edge now adds multiple spaces.
---
 ext/tag_list/theme.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/tag_list/theme.php b/ext/tag_list/theme.php
index 886f1730b..b0607e761 100644
--- a/ext/tag_list/theme.php
+++ b/ext/tag_list/theme.php
@@ -229,13 +229,13 @@ public function return_tag($row, $tag_category_dict) {
 		// if($n++) $display_html .= "\n<br/>";
 		if(!is_null($config->get_string('info_link'))) {
 			$link = html_escape(str_replace('$tag', $tag, $config->get_string('info_link')));
-			$display_html .= ' <td class="tag_info_link_cell"><a class="tag_info_link'.$tag_category_css.'" '.$tag_category_style.'href="'.$link.'">?</a></td>';
+			$display_html .= '<td class="tag_info_link_cell"> <a class="tag_info_link'.$tag_category_css.'" '.$tag_category_style.'href="'.$link.'">?</a></td>';
 		}
 		$link = $this->tag_link($row['tag']);
-		$display_html .= ' <td class="tag_name_cell"><a class="tag_name'.$tag_category_css.'" '.$tag_category_style.'href="'.$link.'">'.$h_tag_no_underscores.'</a></td>';
+		$display_html .= '<td class="tag_name_cell"> <a class="tag_name'.$tag_category_css.'" '.$tag_category_style.'href="'.$link.'">'.$h_tag_no_underscores.'</a></td>';
 
 		if($config->get_bool("tag_list_numbers")) {
-			$display_html .= " <td class='tag_count_cell'><span class='tag_count'>$count</span></td>";
+			$display_html .= "<td class='tag_count_cell'> <span class='tag_count'>$count</span></td>";
 		}
 
 		return array($category, $display_html);

From e8c6f655b074c600382e0a0b3455258fe4a434a5 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Wed, 7 Sep 2016 08:41:33 -0400
Subject: [PATCH 192/250] Don't use javascript for pool search placeholder

---
 ext/pools/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/pools/theme.php b/ext/pools/theme.php
index 651941039..a792a05fd 100644
--- a/ext/pools/theme.php
+++ b/ext/pools/theme.php
@@ -195,7 +195,7 @@ public function sidebar_options(Page $page, $pool, /*bool*/ $check_all) {
 		global $user;
 
 		$editor = "\n".make_form( make_link('pool/import') ).'
-				<input type="text" name="pool_tag" id="edit_pool_tag" value="Please enter a tag" onclick="this.value=\'\';"/>
+				<input type="text" name="pool_tag" id="edit_pool_tag" placeholder="Please enter a tag"/>
 				<input type="submit" name="edit" id="edit_pool_import_btn" value="Import"/>
 				<input type="hidden" name="pool_id" value="'.$pool['id'].'">
 			</form>

From e110b558b886c9ce2db08bfe55b598c9adbf166f Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sun, 11 Sep 2016 23:26:20 -0400
Subject: [PATCH 193/250] Hide the rating editor outside of edit mode

---
 ext/rating/theme.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ext/rating/theme.php b/ext/rating/theme.php
index 889988d6e..756304e8b 100644
--- a/ext/rating/theme.php
+++ b/ext/rating/theme.php
@@ -10,13 +10,17 @@ public function get_rater_html(/*int*/ $image_id, /*string*/ $rating) {
 		$s_checked = $rating == 's' ? " checked" : "";
 		$q_checked = $rating == 'q' ? " checked" : "";
 		$e_checked = $rating == 'e' ? " checked" : "";
+		$human_rating = Ratings::rating_to_human($rating);
 		$html = "
 			<tr>
 				<th>Rating</th>
 				<td>
-					<input type='radio' name='rating' value='s' id='s'$s_checked><label for='s'>Safe</label>
-					<input type='radio' name='rating' value='q' id='q'$q_checked><label for='q'>Questionable</label>
-					<input type='radio' name='rating' value='e' id='e'$e_checked><label for='e'>Explicit</label>
+					<span class='view'>$human_rating</span>
+					<span class='edit'>
+						<input type='radio' name='rating' value='s' id='s'$s_checked><label for='s'>Safe</label>
+						<input type='radio' name='rating' value='q' id='q'$q_checked><label for='q'>Questionable</label>
+						<input type='radio' name='rating' value='e' id='e'$e_checked><label for='e'>Explicit</label>
+					</span>
 				</td>
 			</tr>
 		";

From 001a1176cce84d46dd94c2487db49d4c8ea52f5a Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sun, 11 Sep 2016 23:34:56 -0400
Subject: [PATCH 194/250] Show image rating in image info box even when not
 logged in

---
 ext/rating/main.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ext/rating/main.php b/ext/rating/main.php
index 22b331d8b..2dc8b189b 100644
--- a/ext/rating/main.php
+++ b/ext/rating/main.php
@@ -103,9 +103,7 @@ public function onRatingSet(RatingSetEvent $event) {
 	}
 	
 	public function onImageInfoBoxBuilding(ImageInfoBoxBuildingEvent $event) {
-		if($this->can_rate()) {
-			$event->add_part($this->theme->get_rater_html($event->image->id, $event->image->rating), 80);
-		}
+		$event->add_part($this->theme->get_rater_html($event->image->id, $event->image->rating), 80);
 	}
 	
 	public function onImageInfoSet(ImageInfoSetEvent $event) {

From 4dcee0eede9c3830a4af737ffa78764f182f3c80 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sun, 11 Sep 2016 23:32:13 -0400
Subject: [PATCH 195/250] Removed trailing period from "Parent: None." for
 consistency

---
 ext/relatationships/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/relatationships/theme.php b/ext/relatationships/theme.php
index abc4302e4..c53483c11 100644
--- a/ext/relatationships/theme.php
+++ b/ext/relatationships/theme.php
@@ -30,7 +30,7 @@ public function get_parent_editor_html(Image $image) {
 		global $user;
 
 		$h_parent_id = $image->parent_id;
-		$s_parent_id = $h_parent_id ?: "None.";
+		$s_parent_id = $h_parent_id ?: "None";
 
 		$html = "<tr>\n".
 		        "	<th>Parent</th>\n".

From 3e52e332dec0fbb90375ac1f8846e4c67c126ca6 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Tue, 13 Sep 2016 02:10:48 -0400
Subject: [PATCH 196/250] Only show image rater if user can rate

---
 ext/rating/main.php  | 2 +-
 ext/rating/theme.php | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ext/rating/main.php b/ext/rating/main.php
index 2dc8b189b..c3018331b 100644
--- a/ext/rating/main.php
+++ b/ext/rating/main.php
@@ -103,7 +103,7 @@ public function onRatingSet(RatingSetEvent $event) {
 	}
 	
 	public function onImageInfoBoxBuilding(ImageInfoBoxBuildingEvent $event) {
-		$event->add_part($this->theme->get_rater_html($event->image->id, $event->image->rating), 80);
+		$event->add_part($this->theme->get_rater_html($event->image->id, $event->image->rating, $this->can_rate()), 80);
 	}
 	
 	public function onImageInfoSet(ImageInfoSetEvent $event) {
diff --git a/ext/rating/theme.php b/ext/rating/theme.php
index 756304e8b..d3836c5de 100644
--- a/ext/rating/theme.php
+++ b/ext/rating/theme.php
@@ -6,7 +6,7 @@ class RatingsTheme extends Themelet {
 	 * @param string $rating
 	 * @return string
 	 */
-	public function get_rater_html(/*int*/ $image_id, /*string*/ $rating) {
+	public function get_rater_html(/*int*/ $image_id, /*string*/ $rating, /*bool*/ $can_rate) {
 		$s_checked = $rating == 's' ? " checked" : "";
 		$q_checked = $rating == 'q' ? " checked" : "";
 		$e_checked = $rating == 'e' ? " checked" : "";
@@ -15,12 +15,16 @@ public function get_rater_html(/*int*/ $image_id, /*string*/ $rating) {
 			<tr>
 				<th>Rating</th>
 				<td>
+		".($can_rate ? "
 					<span class='view'>$human_rating</span>
 					<span class='edit'>
 						<input type='radio' name='rating' value='s' id='s'$s_checked><label for='s'>Safe</label>
 						<input type='radio' name='rating' value='q' id='q'$q_checked><label for='q'>Questionable</label>
 						<input type='radio' name='rating' value='e' id='e'$e_checked><label for='e'>Explicit</label>
 					</span>
+		" : "
+					$human_rating
+		")."
 				</td>
 			</tr>
 		";

From c1083bbea1806e9d04674c62531f9f4867dd877e Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Wed, 14 Sep 2016 17:42:32 -0400
Subject: [PATCH 197/250] Fixed comment-delete code-injection vulnerability

---
 core/util.inc.php                  | 10 ++++++++++
 ext/comment/theme.php              | 13 ++++++++-----
 themes/danbooru/comment.theme.php  | 13 ++++++++-----
 themes/danbooru2/comment.theme.php | 13 ++++++++-----
 themes/futaba/comment.theme.php    | 13 ++++++++-----
 5 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/core/util.inc.php b/core/util.inc.php
index 94cf1eb08..1d5460f9a 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -15,6 +15,16 @@ function html_escape($input) {
 	return htmlentities($input, ENT_QUOTES, "UTF-8");
 }
 
+/**
+ * Unescape data that was made safe for printing into HTML
+ *
+ * @param $input
+ * @return string
+ */
+function html_unescape($input) {
+	return html_entity_decode($input, ENT_QUOTES, "UTF-8");
+}
+
 /**
  * Make sure some data is safe to be used in integer context
  *
diff --git a/ext/comment/theme.php b/ext/comment/theme.php
index 20e963f94..f017bdb31 100644
--- a/ext/comment/theme.php
+++ b/ext/comment/theme.php
@@ -259,8 +259,6 @@ protected function comment_to_html(Comment $comment, $trim=false) {
 		else {
 			$h_userlink = '<a class="username" href="'.make_link('user/'.$h_name).'">'.$h_name.'</a>';
 		}
-		$stripped_nonl = str_replace("\n", "\\n", substr($tfe->stripped, 0, 50));
-		$stripped_nonl = str_replace("\r", "\\r", $stripped_nonl);
 
 		$hb = ($comment->owner_class == "hellbanned" ? "hb" : "");
 		if($trim) {
@@ -280,9 +278,14 @@ protected function comment_to_html(Comment $comment, $trim=false) {
 			}
 			$h_reply = " - <a href='javascript: replyTo($i_image_id, $i_comment_id, \"$h_name\")'>Reply</a>";
 			$h_ip = $user->can("view_ip") ? "<br>".show_ip($comment->poster_ip, "Comment posted {$comment->posted}") : "";
-			$h_del = $user->can("delete_comment") ?
-				' - <a onclick="return confirm(\'Delete comment by '.$h_name.':\\n'.$stripped_nonl.'\');" '.
-				'href="'.make_link('comment/delete/'.$i_comment_id.'/'.$i_image_id).'">Del</a>' : '';
+			$h_del = "";
+			if ($user->can("delete_comment")) {
+				$comment_preview = substr(html_unescape($tfe->stripped), 0, 50);
+				$j_delete_confirm_message = json_encode("Delete comment by {$comment->owner_name}:\n$comment_preview");
+				$h_delete_script = html_escape("return confirm($j_delete_confirm_message);");
+				$h_delete_link = make_link("comment/delete/$i_comment_id/$i_image_id");
+				$h_del = " - <a onclick='$h_delete_script' href='$h_delete_link'>Del</a>";
+			}
 			$html = "
 				<div class=\"comment $hb\" id=\"c$i_comment_id\">
 					<div class=\"info\">
diff --git a/themes/danbooru/comment.theme.php b/themes/danbooru/comment.theme.php
index 5e959e10c..e7187fe5a 100644
--- a/themes/danbooru/comment.theme.php
+++ b/themes/danbooru/comment.theme.php
@@ -111,12 +111,15 @@ protected function comment_to_html(Comment $comment, $trim=false) {
 		$i_image_id = int_escape($comment->image_id);
 		$h_posted = autodate($comment->posted);
 
-		$stripped_nonl = str_replace("\n", "\\n", substr($tfe->stripped, 0, 50));
-		$stripped_nonl = str_replace("\r", "\\r", $stripped_nonl);
 		$h_userlink = "<a class='username' href='".make_link("user/$h_name")."'>$h_name</a>";
-		$h_del = $user->can("delete_comment") ?
-			' - <a onclick="return confirm(\'Delete comment by '.$h_name.':\\n'.$stripped_nonl.'\');" '.
-			'href="'.make_link('comment/delete/'.$i_comment_id.'/'.$i_image_id).'">Del</a>' : '';
+		$h_del = "";
+		if ($user->can("delete_comment")) {
+			$comment_preview = substr(html_unescape($tfe->stripped), 0, 50);
+			$j_delete_confirm_message = json_encode("Delete comment by {$comment->owner_name}:\n$comment_preview");
+			$h_delete_script = html_escape("return confirm($j_delete_confirm_message);");
+			$h_delete_link = make_link("comment/delete/$i_comment_id/$i_image_id");
+			$h_del = " - <a onclick='$h_delete_script' href='$h_delete_link'>Del</a>";
+		}
 		//$h_imagelink = $trim ? "<a href='".make_link("post/view/$i_image_id")."'>&gt;&gt;&gt;</a>\n" : "";
 		if($trim) {
 			return "<p class='comment'>$h_userlink $h_del<br/>$h_posted<br/>$h_comment</p>";
diff --git a/themes/danbooru2/comment.theme.php b/themes/danbooru2/comment.theme.php
index 081537bb8..a9fef1dd8 100644
--- a/themes/danbooru2/comment.theme.php
+++ b/themes/danbooru2/comment.theme.php
@@ -101,12 +101,15 @@ protected function comment_to_html(Comment $comment, $trim=false) {
 		$i_image_id = int_escape($comment->image_id);
 		$h_posted = autodate($comment->posted);
 
-		$stripped_nonl = str_replace("\n", "\\n", substr($tfe->stripped, 0, 50));
-		$stripped_nonl = str_replace("\r", "\\r", $stripped_nonl);
 		$h_userlink = "<a class='username' href='".make_link("user/$h_name")."'>$h_name</a>";
-		$h_del = $user->can("delete_comment") ?
-			' - <a onclick="return confirm(\'Delete comment by '.$h_name.':\\n'.$stripped_nonl.'\');" '.
-			'href="'.make_link('comment/delete/'.$i_comment_id.'/'.$i_image_id).'">Del</a>' : '';
+		$h_del = "";
+		if ($user->can("delete_comment")) {
+			$comment_preview = substr(html_unescape($tfe->stripped), 0, 50);
+			$j_delete_confirm_message = json_encode("Delete comment by {$comment->owner_name}:\n$comment_preview");
+			$h_delete_script = html_escape("return confirm($j_delete_confirm_message);");
+			$h_delete_link = make_link("comment/delete/$i_comment_id/$i_image_id");
+			$h_del = " - <a onclick='$h_delete_script' href='$h_delete_link'>Del</a>";
+		}
 		//$h_imagelink = $trim ? "<a href='".make_link("post/view/$i_image_id")."'>&gt;&gt;&gt;</a>\n" : "";
 		if($trim) {
 			return "<p class='comment'>$h_userlink $h_del<br/>$h_posted<br/>$h_comment</p>";
diff --git a/themes/futaba/comment.theme.php b/themes/futaba/comment.theme.php
index 29e0b157f..bd8a97b89 100644
--- a/themes/futaba/comment.theme.php
+++ b/themes/futaba/comment.theme.php
@@ -70,13 +70,16 @@ protected function comment_to_html(Comment $comment, $trim=false) {
 		$i_comment_id = int_escape($comment->comment_id);
 		$i_image_id = int_escape($comment->image_id);
 
-		$stripped_nonl = str_replace("\n", "\\n", substr($tfe->stripped, 0, 50));
-		$stripped_nonl = str_replace("\r", "\\r", $stripped_nonl);
 		$h_userlink = "<a href='".make_link("user/$h_name")."'>$h_name</a>";
 		$h_date = $comment->posted;
-		$h_del = $user->can("delete_comment") ?
-			' - <a onclick="return confirm(\'Delete comment by '.$h_name.':\\n'.$stripped_nonl.'\');" '.
-			'href="'.make_link('comment/delete/'.$i_comment_id.'/'.$i_image_id).'">Del</a>' : '';
+		$h_del = "";
+		if ($user->can("delete_comment")) {
+			$comment_preview = substr(html_unescape($tfe->stripped), 0, 50);
+			$j_delete_confirm_message = json_encode("Delete comment by {$comment->owner_name}:\n$comment_preview");
+			$h_delete_script = html_escape("return confirm($j_delete_confirm_message);");
+			$h_delete_link = make_link("comment/delete/$i_comment_id/$i_image_id");
+			$h_del = " - <a onclick='$h_delete_script' href='$h_delete_link'>Del</a>";
+		}
 		$h_reply = "[<a href='".make_link("post/view/$i_image_id")."'>Reply</a>]";
 
 		if($inner_id == 0) {

From a49c5745b0ad137eee1127e9e7da2967fd56950c Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Wed, 14 Sep 2016 18:08:12 -0400
Subject: [PATCH 198/250] Use html_escape instead of htmlspecialchars

---
 ext/tag_editcloud/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/tag_editcloud/main.php b/ext/tag_editcloud/main.php
index aca32af7f..f9325aae8 100644
--- a/ext/tag_editcloud/main.php
+++ b/ext/tag_editcloud/main.php
@@ -134,7 +134,7 @@ private function build_tag_map(Image $image) {
 			}
 
 			$size = sprintf("%.2f", max($row['scaled'],0.5));
-			$js = htmlspecialchars('tageditcloud_toggle_tag(this,'.json_encode($full_tag).')',ENT_QUOTES); //Ugly, but it works
+			$js = html_escape('tageditcloud_toggle_tag(this,'.json_encode($full_tag).')'); //Ugly, but it works
 
 			if(array_search($row['tag'],$image->get_tag_array()) !== FALSE) {
 				if($used_first) {

From 891e52f4b9a81bc612fef5d8bb746ec030748884 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Wed, 31 Aug 2016 18:08:24 -0400
Subject: [PATCH 199/250] Ignore arrow key navigation when modifier keys held

---
 ext/arrowkey_navigation/main.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/arrowkey_navigation/main.php b/ext/arrowkey_navigation/main.php
index 75cc22bdb..023ca87bb 100644
--- a/ext/arrowkey_navigation/main.php
+++ b/ext/arrowkey_navigation/main.php
@@ -47,6 +47,7 @@ private function add_arrowkeys_code($prev_url, $next_url) {
 			(function($){
 				$(document).keyup(function(e) {
 					if($(e.target).is('input', 'textarea')){ return; }
+					if (e.metaKey || e.ctrlKey || e.altKey || e.shiftKey) { return; }
 					if (e.keyCode == 37) { window.location.href = '{$prev_url}'; }
 					else if (e.keyCode == 39) { window.location.href = '{$next_url}'; }
 				});

From 3bebe77addbdc6734c75b160b87312d9591c719b Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sun, 14 Aug 2016 18:56:24 -0400
Subject: [PATCH 200/250] Made the random list searchable

---
 ext/random_list/main.php  | 38 ++++++++++++++++++++---------
 ext/random_list/theme.php | 51 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/ext/random_list/main.php b/ext/random_list/main.php
index 609766fb5..267c971aa 100644
--- a/ext/random_list/main.php
+++ b/ext/random_list/main.php
@@ -15,24 +15,40 @@ public function onPageRequest(PageRequestEvent $event) {
 		global $config, $page;
 
 		if($event->page_matches("random")) {
+			if(isset($_GET['search'])) {
+				// implode(explode()) to resolve aliases and sanitise
+				$search = url_escape(Tag::implode(Tag::explode($_GET['search'], false)));
+				if(empty($search)) {
+					$page->set_mode("redirect");
+					$page->set_redirect(make_link("random"));
+				}
+				else {
+					$page->set_mode("redirect");
+					$page->set_redirect(make_link('random/'.$search));
+				}
+				return;
+			}
+
+			if($event->count_args() == 0) {
+				$search_terms = array();
+			}
+			else if($event->count_args() == 1) {
+				$search_terms = explode(' ', $event->get_arg(0));
+			}
+			else {
+				throw new SCoreException("Error: too many arguments.");
+			}
+
 			// set vars
-			$page->title = "Random Images";
 			$images_per_page = $config->get_int("random_images_list_count", 12);
 			$random_images = array();
-			$random_html = "<b>Refresh the page to view more images</b>
-			<div class='shm-image-list'>";
 
 			// generate random images
 			for ($i = 0; $i < $images_per_page; $i++)
-				array_push($random_images, Image::by_random());
-
-			// create html to display images
-			foreach ($random_images as $image)
-				$random_html .= $this->theme->build_thumb_html($image);
+				array_push($random_images, Image::by_random($search_terms));
 
-			// display it
-			$random_html .= "</div>";
-			$page->add_block(new Block("Random Images", $random_html));
+			$this->theme->set_page($search_terms);
+			$this->theme->display_page($page, $random_images);
 		}
 	}
 
diff --git a/ext/random_list/theme.php b/ext/random_list/theme.php
index b3baf1ade..c092b0867 100644
--- a/ext/random_list/theme.php
+++ b/ext/random_list/theme.php
@@ -1,4 +1,51 @@
 <?php
-/* needed for access to build_thumb_html */
-class RandomListTheme extends Themelet {}
+
+class RandomListTheme extends Themelet {
+	protected $search_terms;
+
+	/**
+	 * @param string[] $search_terms
+	 */
+	public function set_page($search_terms) {
+		$this->search_terms = $search_terms;
+	}
+
+	/**
+	 * @param Page $page
+	 * @param Image[] $images
+	 */
+	public function display_page(Page $page, $images) {
+		$page->title = "Random Images";
+
+		$html = "<b>Refresh the page to view more images</b>
+		<div class='shm-image-list'>";
+
+		foreach ($images as $image)
+			$html .= $this->build_thumb_html($image);
+
+		$html .= "</div>";
+		$page->add_block(new Block("Random Images", $html));
+
+		$nav = $this->build_navigation($this->search_terms);
+		$page->add_block(new Block("Navigation", $nav, "left", 0));
+	}
+
+	/**
+	 * @param string[] $search_terms
+	 * @return string
+	 */
+	protected function build_navigation($search_terms) {
+		$h_search_string = html_escape(implode(" ", $search_terms));
+		$h_search_link = make_link("random");
+		$h_search = "
+			<p><form action='$h_search_link' method='GET'>
+				<input type='search' name='search' value='$h_search_string' placeholder='Search random list' class='autocomplete_tags' autocomplete='off' />
+				<input type='hidden' name='q' value='/random'>
+				<input type='submit' value='Find' style='display: none;' />
+			</form>
+		";
+
+		return $h_search;
+	}
+}
 

From f763fc13565a8cc04bb4a13ae7dd9cb407565477 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Fri, 23 Sep 2016 12:31:02 -0400
Subject: [PATCH 201/250] React appropriately when there are no random list
 search results

---
 ext/random_list/main.php  |  7 +++++--
 ext/random_list/theme.php | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ext/random_list/main.php b/ext/random_list/main.php
index 267c971aa..46c498019 100644
--- a/ext/random_list/main.php
+++ b/ext/random_list/main.php
@@ -44,8 +44,11 @@ public function onPageRequest(PageRequestEvent $event) {
 			$random_images = array();
 
 			// generate random images
-			for ($i = 0; $i < $images_per_page; $i++)
-				array_push($random_images, Image::by_random($search_terms));
+			for ($i = 0; $i < $images_per_page; $i++) {
+				$random_image = Image::by_random($search_terms);
+				if (!$random_image) continue;
+				array_push($random_images, $random_image);
+			}
 
 			$this->theme->set_page($search_terms);
 			$this->theme->display_page($page, $random_images);
diff --git a/ext/random_list/theme.php b/ext/random_list/theme.php
index c092b0867..dd0f1d25f 100644
--- a/ext/random_list/theme.php
+++ b/ext/random_list/theme.php
@@ -17,13 +17,18 @@ public function set_page($search_terms) {
 	public function display_page(Page $page, $images) {
 		$page->title = "Random Images";
 
-		$html = "<b>Refresh the page to view more images</b>
-		<div class='shm-image-list'>";
+		$html = "<b>Refresh the page to view more images</b>";
+		if (count($images)) {
+			$html .= "<div class='shm-image-list'>";
 
-		foreach ($images as $image)
-			$html .= $this->build_thumb_html($image);
+			foreach ($images as $image)
+				$html .= $this->build_thumb_html($image);
+
+			$html .= "</div>";
+		} else {
+			$html .= "<br/><br/>No images were found to match the search criteria";
+		}
 
-		$html .= "</div>";
 		$page->add_block(new Block("Random Images", $html));
 
 		$nav = $this->build_navigation($this->search_terms);

From 9c062f3385551f2b11789d59a51585dc159d07fe Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 24 Sep 2016 16:17:14 +0100
Subject: [PATCH 202/250] case-insensitive wiki pages

---
 ext/wiki/main.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/wiki/main.php b/ext/wiki/main.php
index 8eb541f02..808375106 100644
--- a/ext/wiki/main.php
+++ b/ext/wiki/main.php
@@ -226,11 +226,11 @@ public static function can_edit(User $user, WikiPage $page) {
 	private function get_page($title, $revision=-1) {
 		global $database;
 		// first try and get the actual page
-		$row = $database->get_row("
+		$row = $database->get_row($database->scoreql_to_sql("
 				SELECT *
 				FROM wiki_pages
-				WHERE title LIKE :title
-				ORDER BY revision DESC",
+				WHERE SCORE_STRNORM(title) LIKE SCORE_STRNORM(:title)
+				ORDER BY revision DESC"),
 				array("title"=>$title));
 
 		// fall back to wiki:default

From 1dd0dfc5911444522ac38f74bfc919fa3b5efba8 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sat, 24 Sep 2016 14:03:14 -0400
Subject: [PATCH 203/250] Read ICO header with proper sign Fixes width/height
 being read incorrectly when >= 128

---
 ext/handle_ico/main.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/handle_ico/main.php b/ext/handle_ico/main.php
index 4e53c249b..b615a59da 100644
--- a/ext/handle_ico/main.php
+++ b/ext/handle_ico/main.php
@@ -67,9 +67,9 @@ private function create_image_from_data($filename, $metadata) {
 		$image = new Image();
 
 		$fp = fopen($filename, "r");
-		$header = unpack("snull/stype/scount", fread($fp, 6));
+		$header = unpack("Snull/Stype/Scount", fread($fp, 6));
 
-		$subheader = unpack("cwidth/cheight/ccolours/cnull/splanes/sbpp/lsize/loffset", fread($fp, 16));
+		$subheader = unpack("Cwidth/Cheight/Ccolours/Cnull/Splanes/Sbpp/Lsize/loffset", fread($fp, 16));
 		fclose($fp);
 
 		$width = $subheader['width'];
@@ -94,7 +94,7 @@ private function create_image_from_data($filename, $metadata) {
 	private function check_contents($file) {
 		if(!file_exists($file)) return false;
 		$fp = fopen($file, "r");
-		$header = unpack("snull/stype/scount", fread($fp, 6));
+		$header = unpack("Snull/Stype/Scount", fread($fp, 6));
 		fclose($fp);
 		return ($header['null'] == 0 && ($header['type'] == 0 || $header['type'] == 1));
 	}

From 05da5d0b4f14e45b0f19165483f4d2014dcdcaca Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sun, 25 Sep 2016 15:25:12 -0400
Subject: [PATCH 204/250] Use Image->get_image_link() on ICO files

---
 ext/handle_ico/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/handle_ico/theme.php b/ext/handle_ico/theme.php
index aa0927092..9f68cc533 100644
--- a/ext/handle_ico/theme.php
+++ b/ext/handle_ico/theme.php
@@ -2,7 +2,7 @@
 
 class IcoFileHandlerTheme extends Themelet {
 	public function display_image(Page $page, Image $image) {
-		$ilink = make_link("get_ico/{$image->id}/{$image->id}.ico");
+		$ilink = $image->get_image_link();
 		$html = "
 			<img id='main_image' src='$ilink'>
 		";

From d4fda00dd993bbc71b9db73139d66916da68b2fe Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sun, 25 Sep 2016 14:24:20 -0400
Subject: [PATCH 205/250] Check for existence of POST var tag_edit__owner
 before using it

---
 ext/tag_edit/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/tag_edit/main.php b/ext/tag_edit/main.php
index 508e18dc4..2f270fd03 100644
--- a/ext/tag_edit/main.php
+++ b/ext/tag_edit/main.php
@@ -214,7 +214,7 @@ public function onPostListBuilding(PostListBuildingEvent $event) {
 
 	public function onImageInfoSet(ImageInfoSetEvent $event) {
 		global $user;
-		if($user->can("edit_image_owner")) {
+		if($user->can("edit_image_owner") && isset($_POST['tag_edit__owner'])) {
 			$owner = User::by_name($_POST['tag_edit__owner']);
 			if ($owner instanceof User) {
 				send_event(new OwnerSetEvent($event->image, $owner));

From e6dd1b492cba7a33b20e402e5889d7f4ae483897 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sun, 25 Sep 2016 15:17:29 -0400
Subject: [PATCH 206/250] Sanitize ratings

---
 ext/rating/main.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/ext/rating/main.php b/ext/rating/main.php
index 22b331d8b..17fa8b0d4 100644
--- a/ext/rating/main.php
+++ b/ext/rating/main.php
@@ -110,7 +110,10 @@ public function onImageInfoBoxBuilding(ImageInfoBoxBuildingEvent $event) {
 	
 	public function onImageInfoSet(ImageInfoSetEvent $event) {
 		if($this->can_rate() && isset($_POST["rating"])) {
-			send_event(new RatingSetEvent($event->image, $_POST['rating']));
+			$rating = $_POST["rating"];
+			if (Ratings::rating_is_valid($rating)) {
+				send_event(new RatingSetEvent($event->image, $rating));
+			}
 		}
 	}
 
@@ -211,6 +214,22 @@ public static function rating_to_human(/*string*/ $rating) {
 		}
 	}
 
+	/**
+	 * @param string $rating
+	 * @return bool
+	 */
+	public static function rating_is_valid(/*string*/ $rating) {
+		switch($rating) {
+			case "s":
+			case "q":
+			case "e":
+			case "u":
+				return true;
+			default:
+				return false;
+		}
+	}
+
 	/**
 	 * FIXME: this is a bit ugly and guessey, should have proper options
 	 *

From 8805f0dd182efdb107b1e717a03cb6d2dc04d598 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Mon, 26 Sep 2016 11:15:08 -0400
Subject: [PATCH 207/250] Remove get_ico page It's no longer needed because ICO
 now uses Image->get_image_link()

---
 .htaccess               |  1 +
 ext/handle_ico/main.php | 14 --------------
 ext/handle_ico/test.php |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/.htaccess b/.htaccess
index 8e33b6f35..30a33a42f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -53,6 +53,7 @@ AddType audio/ogg      oga ogg opus
 AddType image/jpeg     jpg jpeg
 AddType image/bmp      bmp
 AddType image/svg+xml  svg svgz
+AddType image/x-icon   ico ani cur
 AddType image/webp     webp
 AddType video/mp4      f4v f4p m4v mp4
 AddType video/ogg      ogv
diff --git a/ext/handle_ico/main.php b/ext/handle_ico/main.php
index b615a59da..beda95968 100644
--- a/ext/handle_ico/main.php
+++ b/ext/handle_ico/main.php
@@ -35,20 +35,6 @@ public function onDisplayingImage(DisplayingImageEvent $event) {
 		}
 	}
 
-	public function onPageRequest(PageRequestEvent $event) {
-		global $page;
-		if($event->page_matches("get_ico")) {
-			$id = int_escape($event->get_arg(0));
-			$image = Image::by_id($id);
-			$hash = $image->hash;
-			$ha = substr($hash, 0, 2);
-
-			$page->set_type("image/x-icon");
-			$page->set_mode("data");
-			$page->set_data(file_get_contents("images/$ha/$hash"));
-		}
-	}
-
 	/**
 	 * @param string $ext
 	 * @return bool
diff --git a/ext/handle_ico/test.php b/ext/handle_ico/test.php
index b019eed09..fa1301005 100644
--- a/ext/handle_ico/test.php
+++ b/ext/handle_ico/test.php
@@ -4,7 +4,6 @@ public function testIcoHander() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("lib/static/favicon.ico", "shimmie favicon");
 		$this->get_page("post/view/$image_id"); // test for no crash
-		$this->get_page("get_ico/$image_id"); // test for no crash
 
 		# FIXME: test that the thumb works
 		# FIXME: test that it gets displayed properly

From d5fd6f6821b3cbce7fdb5ccadd85d1b7ec5a3fe0 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Wed, 28 Sep 2016 10:26:13 -0400
Subject: [PATCH 208/250] url_escape tag info link tag

---
 ext/tag_list/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/tag_list/theme.php b/ext/tag_list/theme.php
index 0e97abb5f..725032f21 100644
--- a/ext/tag_list/theme.php
+++ b/ext/tag_list/theme.php
@@ -216,7 +216,7 @@ public function return_tag($row, $tag_category_dict) {
 		$count = $row['calc_count'];
 		// if($n++) $display_html .= "\n<br/>";
 		if(!is_null($config->get_string('info_link'))) {
-			$link = html_escape(str_replace('$tag', $tag, $config->get_string('info_link')));
+			$link = html_escape(str_replace('$tag', url_escape($tag), $config->get_string('info_link')));
 			$display_html .= ' <a class="tag_info_link'.$tag_category_css.'" '.$tag_category_style.'href="'.$link.'">?</a>';
 		}
 		$link = $this->tag_link($row['tag']);

From fefc9220700c7419bbfe4497e9d17e0eb4b33caa Mon Sep 17 00:00:00 2001
From: Shish <webmaster@shishnet.org>
Date: Sun, 27 Nov 2016 20:28:16 +0000
Subject: [PATCH 209/250] Create LICENSE.txt

---
 LICENSE.txt | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 339 insertions(+)
 create mode 100644 LICENSE.txt

diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 000000000..23cb79033
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {description}
+    Copyright (C) {year}  {fullname}
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  {signature of Ty Coon}, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

From c379420a1fb211f5457e08ec286647123eded235 Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Wed, 8 Mar 2017 01:14:11 -0800
Subject: [PATCH 210/250] #597: Fix for XSS issue in chatbox extension.

---
 ext/chatbox/history/index.php | 14 +++++++++++---
 ext/chatbox/php/functions.php |  5 ++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ext/chatbox/history/index.php b/ext/chatbox/history/index.php
index 4a9a8b042..f3755e98b 100644
--- a/ext/chatbox/history/index.php
+++ b/ext/chatbox/history/index.php
@@ -10,15 +10,23 @@
 
 	$admin = loggedIn();
 	
+	$log = 1;
+	
 	if (isset($_GET['log']))
+	{
 		$log = $_GET['log'];
+	}
 	
 	if (isset($_POST['log']))
+	{
 		$log = $_POST['log'];
+	}
 
-	if (!isset($log))
+	if (filter_var($log, FILTER_VALIDATE_INT) === false)
+	{
 		$log = 1;
-		
+	}
+	
 	$ys = ys($log);
 	$posts = $ys->posts();
 
@@ -132,4 +140,4 @@
 			<a id="to-top" href="#top">Back to top</a>
 		</div>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ext/chatbox/php/functions.php b/ext/chatbox/php/functions.php
index 2966ce7d7..23eca1c1e 100644
--- a/ext/chatbox/php/functions.php
+++ b/ext/chatbox/php/functions.php
@@ -89,7 +89,10 @@ function ys($log = 1) {
 		global $yShout, $prefs;
 		if ($yShout) return $yShout;
 
-		if ($log > $prefs['logs'] || $log < 0 || !is_numeric($log)) $log = 1;
+		if (filter_var($log, FILTER_VALIDATE_INT, array("options" => array("min_range" => 0, "max_range" => $prefs['logs']))) === false)
+		{
+		  $log = 1;
+		}
 		
 		$log = 'log.' . $log;
 		return new YShout($log, loggedIn());

From 17307820e8d9cbb10d5ebd0feb933967ff700792 Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Wed, 8 Mar 2017 23:02:26 -0800
Subject: [PATCH 211/250] Add some PHPdoc comments as suggested by Scrutinizier

---
 core/database.class.php      |  8 ++++++--
 core/imageboard.pack.php     |  4 ++++
 ext/ban_words/main.php       |  9 +++++++++
 ext/setup/main.php           | 10 ++++++++++
 ext/wiki/main.php            |  2 +-
 install.php                  | 12 ++++++++++++
 themes/lite/layout.class.php |  2 +-
 7 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/core/database.class.php b/core/database.class.php
index 27037ab1e..f287d0b47 100644
--- a/core/database.class.php
+++ b/core/database.class.php
@@ -509,7 +509,7 @@ public function beginTransaction() {
 	}
 
 	/**
-	 * @return bool
+	 * @return boolean|null
 	 * @throws SCoreException
 	 */
 	public function commit() {
@@ -525,7 +525,7 @@ public function commit() {
 	}
 
 	/**
-	 * @return bool
+	 * @return boolean|null
 	 * @throws SCoreException
 	 */
 	public function rollback() {
@@ -566,6 +566,10 @@ public function get_driver_name() {
 		return $this->engine->name;
 	}
 
+	/**
+	 * @param null|PDO $db
+	 * @param string $sql
+	 */
 	private function count_execs($db, $sql, $inputarray) {
 		if ((defined('DEBUG_SQL') && DEBUG_SQL === true) || (!defined('DEBUG_SQL') && @$_GET['DEBUG_SQL'])) {
 			$fp = @fopen("data/sql.log", "a");
diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 0827b411c..b21cbf6a9 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -175,6 +175,10 @@ public static function find_images(/*int*/ $start, /*int*/ $limit, $tags=array()
 		return $images;
 	}
 
+	/**
+	 * @param string[] $tags
+	 * @return boolean
+	 */
 	public function validate_accel($tags) {
 		$yays = 0;
 		$nays = 0;
diff --git a/ext/ban_words/main.php b/ext/ban_words/main.php
index 864633060..9d9493d41 100644
--- a/ext/ban_words/main.php
+++ b/ext/ban_words/main.php
@@ -86,6 +86,12 @@ public function onSetupBuilding(SetupBuildingEvent $event) {
 		$event->panel->add_block($sb);
 	}
 
+	/**
+	 * Throws if the comment contains banned words.
+	 * @param string $comment
+	 * @param CommentPostingException|SCoreException $ex
+	 * @throws CommentPostingException|SCoreException if the comment contains banned words. 
+	 */
 	private function test_text($comment, $ex) {
 		$comment = strtolower($comment);
 
@@ -105,6 +111,9 @@ private function test_text($comment, $ex) {
 		}
 	}
 
+	/**
+	 * @return string[]
+	 */
 	private function get_words() {
 		global $config;
 		$words = array();
diff --git a/ext/setup/main.php b/ext/setup/main.php
index 6bef9dcf8..96eaff9f3 100644
--- a/ext/setup/main.php
+++ b/ext/setup/main.php
@@ -157,6 +157,11 @@ public function add_shorthand_int_option($name, $label=null) {
 		$this->body .= "<input type='hidden' name='_type_$name' value='int'>\n";
 	}
 
+	/**
+	 * @param string $name
+	 * @param string[] $options
+	 * @param null|string $label
+	 */
 	public function add_choice_option($name, $options, $label=null) {
 		global $config;
 		$current = $config->get_string($name);
@@ -176,6 +181,11 @@ public function add_choice_option($name, $options, $label=null) {
 		$this->body .= $html;
 	}
 
+	/**
+	 * @param string $name
+	 * @param string[] $options
+	 * @param null|string $label
+	 */
 	public function add_multichoice_option($name, $options, $label=null) {
 		global $config;
 		$current = $config->get_array($name);
diff --git a/ext/wiki/main.php b/ext/wiki/main.php
index 808375106..cd61a1e43 100644
--- a/ext/wiki/main.php
+++ b/ext/wiki/main.php
@@ -220,7 +220,7 @@ public static function can_edit(User $user, WikiPage $page) {
 
 	/**
 	 * @param string $title
-	 * @param int|null $revision
+	 * @param integer $revision
 	 * @return WikiPage
 	 */
 	private function get_page($title, $revision=-1) {
diff --git a/install.php b/install.php
index 2db9cb12c..1efe82ac7 100644
--- a/install.php
+++ b/install.php
@@ -114,6 +114,9 @@
 // utilities {{{
 	// TODO: Can some of these be pushed into "core/util.inc.php" ?
 
+/**
+ * @return int
+ */
 function check_gd_version() {
 	$gdversion = 0;
 
@@ -129,6 +132,9 @@ function check_gd_version() {
 	return $gdversion;
 }
 
+/**
+ * @return int
+ */
 function check_im_version() {
 	$convert_check = exec("convert");
 
@@ -469,6 +475,12 @@ function write_config() { // {{{
 	echo "\n";
 } // }}}
 
+/**
+ * @param boolean $isPDO
+ * @param string $errorMessage1
+ * @param string $errorMessage2
+ * @param integer $exitCode
+ */
 function handle_db_errors(/*bool*/ $isPDO, /*str*/ $errorMessage1,  /*str*/ $errorMessage2, /*int*/ $exitCode) {
 	$errorMessage1Extra = ($isPDO ? "Please check and ensure that the database configuration options are all correct." : "Please check the server log files for more information.");
 	print <<<EOD
diff --git a/themes/lite/layout.class.php b/themes/lite/layout.class.php
index 9606456a1..6cef09e97 100644
--- a/themes/lite/layout.class.php
+++ b/themes/lite/layout.class.php
@@ -242,7 +242,7 @@ public function block_to_html(Block $block, $hidable=false, $salt="") {
 	/**
 	 * @param string $link
 	 * @param null|string $desc
-	 * @param array $pages_matched
+	 * @param string[] $pages_matched
 	 * @return null|string
 	 */
 	public function navlinks($link, $desc, $pages_matched) {

From ede2fcf4ebeaba70311d64c7c2e4f56a3a22de8c Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Wed, 8 Mar 2017 23:52:31 -0800
Subject: [PATCH 212/250] More linting and fixing

---
 core/database.class.php      | 8 ++++----
 ext/ouroboros_api/main.php   | 9 +++++++--
 themes/lite/layout.class.php | 2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/core/database.class.php b/core/database.class.php
index f287d0b47..27ed0341b 100644
--- a/core/database.class.php
+++ b/core/database.class.php
@@ -790,28 +790,28 @@ public function execute($query, $params=array()) {
 	/**
 	 * @param string $query
 	 * @param array $args
-	 * @return array|PDOStatement
+	 * @return PDOStatement
 	 */
 	public function get_all($query, $args=array()) {return $this->execute($query, $args);}
 
 	/**
 	 * @param string $query
 	 * @param array $args
-	 * @return mixed|null|PDOStatement
+	 * @return PDOStatement
 	 */
 	public function get_row($query, $args=array()) {return $this->execute($query, $args);}
 
 	/**
 	 * @param string $query
 	 * @param array $args
-	 * @return array|PDOStatement
+	 * @return PDOStatement
 	 */
 	public function get_col($query, $args=array()) {return $this->execute($query, $args);}
 
 	/**
 	 * @param string $query
 	 * @param array $args
-	 * @return array|PDOStatement
+	 * @return PDOStatement
 	 */
 	public function get_pairs($query, $args=array()) {return $this->execute($query, $args);}
 
diff --git a/ext/ouroboros_api/main.php b/ext/ouroboros_api/main.php
index 20d272944..8c8a5138f 100644
--- a/ext/ouroboros_api/main.php
+++ b/ext/ouroboros_api/main.php
@@ -59,6 +59,11 @@ class _SafeOuroborosImage
      * @var integer
      */
     public $width = null;
+    /**
+     * File extension
+     * @var string
+     */
+    public $file_ext = '';
     /**
      * File Size in bytes
      * @var integer
@@ -189,7 +194,7 @@ class _SafeOuroborosImage
      * Constructor
      * @param Image $img
      */
-    function __construct(Image $img)
+    public function __construct(Image $img)
     {
         global $config;
         // author
@@ -343,7 +348,7 @@ class _SafeOuroborosTag
     public $name = '';
     public $type = 0;
 
-    function __construct(array $tag)
+    public function __construct(array $tag)
     {
         $this->count = $tag['count'];
         $this->id = $tag['id'];
diff --git a/themes/lite/layout.class.php b/themes/lite/layout.class.php
index 6cef09e97..1728044ff 100644
--- a/themes/lite/layout.class.php
+++ b/themes/lite/layout.class.php
@@ -164,7 +164,7 @@ public function display_page(Page $page) {
 
 		$flash = $page->get_cookie("flash_message");
 		$flash_html = "";
-		if($flash) {
+		if(!empty($flash)) {
 			$flash_html = "<b id='flash'>".nl2br(html_escape($flash))." <a href='#' onclick=\"\$('#flash').hide(); return false;\">[X]</a></b>";
 		}
 

From 20455aa2fb0646c32d87958a8c9b4ae7ec73dd02 Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Thu, 9 Mar 2017 00:13:11 -0800
Subject: [PATCH 213/250] Test using PHP 7.1 on Travis as well

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 9edb54f00..446797460 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
 
 sudo: false
 

From f21648b46d704629425de5617cd70719e600cae3 Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Thu, 9 Mar 2017 00:54:48 -0800
Subject: [PATCH 214/250] Add phpunit to composer dependencies & update
 composer

---
 composer.json |    3 +-
 composer.lock | 1334 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 1323 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index 3bcd42188..4101ec857 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,7 @@
 
 	"require" : {
 		"php" : ">=5.4.8",
+		"phpunit/phpunit" : "*",
 
 		"flexihash/flexihash"       : "^2.0.0",
 		"ifixit/php-akismet"        : "1.*",
@@ -29,7 +30,7 @@
 
 		"bower-asset/jquery"         : "1.12.3",
 		"bower-asset/jquery-timeago" : "1.5.2",
-		"bower-asset/tablesorter"    : "2.0.5",
+		"bower-asset/tablesorter"    : "2.*",
 		"bower-asset/mediaelement"   : "2.21.1",
 		"bower-asset/js-cookie"      : "2.1.1"
 	},
diff --git a/composer.lock b/composer.lock
index 88b579e26..a3ff52048 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "7f3cebcb4b5b802a6e34719d10bbafc7",
-    "content-hash": "1b9fd588bc2d86a26b1760a6b2041d21",
+    "content-hash": "fa557e1b07c78579308549767c7dcd51",
     "packages": [
         {
             "name": "bower-asset/jquery",
@@ -185,16 +184,16 @@
         },
         {
             "name": "dapphp/securimage",
-            "version": "3.6.4",
+            "version": "3.6.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dapphp/securimage.git",
-                "reference": "2ed50264ae5541fec8d8c79e4c9b6235a7cfd506"
+                "reference": "3f5a84fd80b1a35d58332896c944142713a7e802"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dapphp/securimage/zipball/2ed50264ae5541fec8d8c79e4c9b6235a7cfd506",
-                "reference": "2ed50264ae5541fec8d8c79e4c9b6235a7cfd506",
+                "url": "https://api.github.com/repos/dapphp/securimage/zipball/3f5a84fd80b1a35d58332896c944142713a7e802",
+                "reference": "3f5a84fd80b1a35d58332896c944142713a7e802",
                 "shasum": ""
             },
             "require": {
@@ -228,7 +227,61 @@
                 "captcha",
                 "security"
             ],
-            "time": "2016-03-04 21:08:00"
+            "time": "2016-12-04T17:45:57+00:00"
+        },
+        {
+            "name": "doctrine/instantiator",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "5acd2bd8c2b600ad5cc4c9180ebf0a930604d6a5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/5acd2bd8c2b600ad5cc4c9180ebf0a930604d6a5",
+                "reference": "5acd2bd8c2b600ad5cc4c9180ebf0a930604d6a5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2017-02-16 16:15:51"
         },
         {
             "name": "flexihash/flexihash",
@@ -281,7 +334,7 @@
             ],
             "description": "Flexihash is a small PHP library which implements consistent hashing",
             "homepage": "https://github.com/pda/flexihash",
-            "time": "2016-04-22 21:03:23"
+            "time": "2016-04-22T21:03:23+00:00"
         },
         {
             "name": "google/recaptcha",
@@ -289,12 +342,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/google/recaptcha.git",
-                "reference": "f3390c376129f84d22734df1f94cc7db25006bbc"
+                "reference": "d3274db7c061770472b8eff8a7dbae0871f6cf03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/google/recaptcha/zipball/f3390c376129f84d22734df1f94cc7db25006bbc",
-                "reference": "f3390c376129f84d22734df1f94cc7db25006bbc",
+                "url": "https://api.github.com/repos/google/recaptcha/zipball/d3274db7c061770472b8eff8a7dbae0871f6cf03",
+                "reference": "d3274db7c061770472b8eff8a7dbae0871f6cf03",
                 "shasum": ""
             },
             "require": {
@@ -326,7 +379,7 @@
                 "recaptcha",
                 "spam"
             ],
-            "time": "2015-12-28 18:03:30"
+            "time": "2016-08-04 17:35:35"
         },
         {
             "name": "ifixit/php-akismet",
@@ -378,7 +431,1262 @@
                 "hashing",
                 "password"
             ],
-            "time": "2014-11-20 16:49:30"
+            "time": "2014-11-20T16:49:30+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "doctrine/collections": "1.*",
+                "phpunit/phpunit": "~4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "homepage": "https://github.com/myclabs/DeepCopy",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2017-01-26T22:05:40+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2015-12-27 11:43:31"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "3.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0@dev",
+                "phpdocumentor/type-resolver": "^0.2.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2016-09-30T07:12:33+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "time": "2016-11-25T06:54:22+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "abe41cb27f4e4207c6f54a09272969fe55e0bbff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/abe41cb27f4e4207c6f54a09272969fe55e0bbff",
+                "reference": "abe41cb27f4e4207c6f54a09272969fe55e0bbff",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5|^3.2",
+                "phpunit/phpunit": "^4.8 || ^5.6.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.7.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2017-03-03 17:09:02"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "4.0.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "cb9dd0ea37df29fa3c6ae5ac26c3408a7609cb4f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/cb9dd0ea37df29fa3c6ae5ac26c3408a7609cb4f",
+                "reference": "cb9dd0ea37df29fa3c6ae5ac26c3408a7609cb4f",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-file-iterator": "^1.3",
+                "phpunit/php-text-template": "^1.2",
+                "phpunit/php-token-stream": "^1.4.2 || ^2.0",
+                "sebastian/code-unit-reverse-lookup": "^1.0",
+                "sebastian/environment": "^1.3.2 || ^2.0",
+                "sebastian/version": "^1.0 || ^2.0"
+            },
+            "require-dev": {
+                "ext-xdebug": "^2.1.4",
+                "phpunit/phpunit": "^5.7"
+            },
+            "suggest": {
+                "ext-xdebug": "^2.5.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-03-07 10:28:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2016-10-03 07:40:28"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21T13:50:34+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "d107f347d368dd8a384601398280c7c608390ab7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/d107f347d368dd8a384601398280c7c608390ab7",
+                "reference": "d107f347d368dd8a384601398280c7c608390ab7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2017-03-07 15:42:04"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "9ddb181faa4a3841fe131c357fd01de75cbb4da9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9ddb181faa4a3841fe131c357fd01de75cbb4da9",
+                "reference": "9ddb181faa4a3841fe131c357fd01de75cbb4da9",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2017-03-07 07:36:57"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "5.5.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6e88e56c912133de6e99b87728cca7ed70c5f5",
+                "reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "myclabs/deep-copy": "~1.3",
+                "php": "^5.6 || ^7.0",
+                "phpspec/prophecy": "^1.3.1",
+                "phpunit/php-code-coverage": "^4.0.1",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "^1.0.6",
+                "phpunit/phpunit-mock-objects": "^3.2",
+                "sebastian/comparator": "~1.1",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "^1.3 || ^2.0",
+                "sebastian/exporter": "~1.2",
+                "sebastian/global-state": "~1.0",
+                "sebastian/object-enumerator": "~1.0",
+                "sebastian/resource-operations": "~1.0",
+                "sebastian/version": "~1.0|~2.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "3.0.2"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.5.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2016-08-26T07:11:44+00:00"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "3.4.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "4001a301f86fc006c32f532a741ab613f2bd8990"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/4001a301f86fc006c32f532a741ab613f2bd8990",
+                "reference": "4001a301f86fc006c32f532a741ab613f2bd8990",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-text-template": "^1.2",
+                "sebastian/exporter": "^1.2 || ^2.0"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2017-03-07 08:47:31"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "3488be0a7b346cd6e5361510ed07e88f9bea2e88"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/3488be0a7b346cd6e5361510ed07e88f9bea2e88",
+                "reference": "3488be0a7b346cd6e5361510ed07e88f9bea2e88",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "time": "2017-03-04 10:23:55"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "18a5d97c25f408f48acaf6d1b9f4079314c5996a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/18a5d97c25f408f48acaf6d1b9f4079314c5996a",
+                "reference": "18a5d97c25f408f48acaf6d1b9f4079314c5996a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2 || ~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2017-03-07 10:34:43"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "763d7adeb8c35d2af2b04c0f6cafeee059074dfb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/763d7adeb8c35d2af2b04c0f6cafeee059074dfb",
+                "reference": "763d7adeb8c35d2af2b04c0f6cafeee059074dfb",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2017-03-07 07:26:53"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "144fedf9aa8e3f1c52199f3634eb699cb59741d9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/144fedf9aa8e3f1c52199f3634eb699cb59741d9",
+                "reference": "144fedf9aa8e3f1c52199f3634eb699cb59741d9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2017-03-07 12:59:58"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.2.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/dcd43bcc0fd3551bd2ede0081882d549bb78225d",
+                "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0",
+                "sebastian/recursion-context": "^1.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2017-02-26 13:09:30"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "cea85a84b00f2795341ebbbca4fa396347f2494e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/cea85a84b00f2795341ebbbca4fa396347f2494e",
+                "reference": "cea85a84b00f2795341ebbbca4fa396347f2494e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2|~5.0"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2017-02-23 14:11:06"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "1.0.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "1a7e888dce73bd3c1deedb345fce00329c75b065"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1a7e888dce73bd3c1deedb345fce00329c75b065",
+                "reference": "1a7e888dce73bd3c1deedb345fce00329c75b065",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "time": "2016-10-03 07:42:27"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2016-10-03 07:41:43"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "fadc83f7c41fb2924e542635fea47ae546816ece"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/fadc83f7c41fb2924e542635fea47ae546816ece",
+                "reference": "fadc83f7c41fb2924e542635fea47ae546816ece",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "time": "2016-10-03 07:43:09"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2016-10-03 07:35:21"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "d1abb473764f82339862b114b45b3cd424b2d1a3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/d1abb473764f82339862b114b45b3cd424b2d1a3",
+                "reference": "d1abb473764f82339862b114b45b3cd424b2d1a3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "require-dev": {
+                "symfony/console": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-07 16:54:31"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "4a8bf11547e139e77b651365113fc12850c43d9a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/4a8bf11547e139e77b651365113fc12850c43d9a",
+                "reference": "4a8bf11547e139e77b651365113fc12850c43d9a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2016-11-23 20:04:41"
         }
     ],
     "packages-dev": [],

From 9b7627dededeccea89aabe58f6a3feacbda23cce Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Thu, 9 Mar 2017 01:09:34 -0800
Subject: [PATCH 215/250] PHP versions 5.5 is EOL now.

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 446797460..4e3727a18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 language: php
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
   - 7.1

From ab27e2d2a5e5c11efb54839be470d64caa4bd91d Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Thu, 9 Mar 2017 01:12:27 -0800
Subject: [PATCH 216/250] Bump PHP version up to 5.6

---
 README.markdown | 2 +-
 composer.json   | 2 +-
 composer.lock   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.markdown b/README.markdown
index 0b08f7b9c..c1482904d 100644
--- a/README.markdown
+++ b/README.markdown
@@ -29,7 +29,7 @@ check out one of the versioned branches.
 # Requirements
 
 - MySQL/MariaDB 5.1+ (with experimental support for PostgreSQL 9+ and SQLite 3)
-- [Stable PHP](https://en.wikipedia.org/wiki/PHP#Release_history) (5.5 as of writing)
+- [Stable PHP](https://en.wikipedia.org/wiki/PHP#Release_history) (5.6+ as of writing)
 - GD or ImageMagick
 
 # Installation
diff --git a/composer.json b/composer.json
index 4101ec857..6f1cbc84b 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
 	],
 
 	"require" : {
-		"php" : ">=5.4.8",
+		"php" : ">=5.6",
 		"phpunit/phpunit" : "*",
 
 		"flexihash/flexihash"       : "^2.0.0",
diff --git a/composer.lock b/composer.lock
index a3ff52048..24d84951d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "fa557e1b07c78579308549767c7dcd51",
+    "content-hash": "5ce7a26b4b4af7a50993ac213aea963b",
     "packages": [
         {
             "name": "bower-asset/jquery",
@@ -1696,7 +1696,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=5.4.8"
+        "php": ">=5.6"
     },
     "platform-dev": []
 }

From c1e115e075d3533ca8494ca5c4d5d957b9d55de2 Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Thu, 9 Mar 2017 01:22:45 -0800
Subject: [PATCH 217/250] Test removing explict phpunit dependency from
 composer

---
 composer.json |    1 -
 composer.lock | 1311 +------------------------------------------------
 2 files changed, 1 insertion(+), 1311 deletions(-)

diff --git a/composer.json b/composer.json
index 6f1cbc84b..0e9a1c5b0 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,6 @@
 
 	"require" : {
 		"php" : ">=5.6",
-		"phpunit/phpunit" : "*",
 
 		"flexihash/flexihash"       : "^2.0.0",
 		"ifixit/php-akismet"        : "1.*",
diff --git a/composer.lock b/composer.lock
index 24d84951d..a35286cbe 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "5ce7a26b4b4af7a50993ac213aea963b",
+    "content-hash": "87a3135435232aa90ec13a55e8e8e9af",
     "packages": [
         {
             "name": "bower-asset/jquery",
@@ -229,60 +229,6 @@
             ],
             "time": "2016-12-04T17:45:57+00:00"
         },
-        {
-            "name": "doctrine/instantiator",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "5acd2bd8c2b600ad5cc4c9180ebf0a930604d6a5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/5acd2bd8c2b600ad5cc4c9180ebf0a930604d6a5",
-                "reference": "5acd2bd8c2b600ad5cc4c9180ebf0a930604d6a5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2017-02-16 16:15:51"
-        },
         {
             "name": "flexihash/flexihash",
             "version": "v2.0.2",
@@ -432,1261 +378,6 @@
                 "password"
             ],
             "time": "2014-11-20T16:49:30+00:00"
-        },
-        {
-            "name": "myclabs/deep-copy",
-            "version": "1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe",
-                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "doctrine/collections": "1.*",
-                "phpunit/phpunit": "~4.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Create deep copies (clones) of your objects",
-            "homepage": "https://github.com/myclabs/DeepCopy",
-            "keywords": [
-                "clone",
-                "copy",
-                "duplicate",
-                "object",
-                "object graph"
-            ],
-            "time": "2017-01-26T22:05:40+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "time": "2015-12-27 11:43:31"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "3.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
-                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5",
-                "phpdocumentor/reflection-common": "^1.0@dev",
-                "phpdocumentor/type-resolver": "^0.2.0",
-                "webmozart/assert": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^4.4"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2016-09-30T07:12:33+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "0.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
-                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5",
-                "phpdocumentor/reflection-common": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "time": "2016-11-25T06:54:22+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "abe41cb27f4e4207c6f54a09272969fe55e0bbff"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/abe41cb27f4e4207c6f54a09272969fe55e0bbff",
-                "reference": "abe41cb27f4e4207c6f54a09272969fe55e0bbff",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
-                "sebastian/comparator": "^1.1|^2.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8 || ^5.6.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.7.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2017-03-03 17:09:02"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "4.0.x-dev",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "cb9dd0ea37df29fa3c6ae5ac26c3408a7609cb4f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/cb9dd0ea37df29fa3c6ae5ac26c3408a7609cb4f",
-                "reference": "cb9dd0ea37df29fa3c6ae5ac26c3408a7609cb4f",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-xmlwriter": "*",
-                "php": "^5.6 || ^7.0",
-                "phpunit/php-file-iterator": "^1.3",
-                "phpunit/php-text-template": "^1.2",
-                "phpunit/php-token-stream": "^1.4.2 || ^2.0",
-                "sebastian/code-unit-reverse-lookup": "^1.0",
-                "sebastian/environment": "^1.3.2 || ^2.0",
-                "sebastian/version": "^1.0 || ^2.0"
-            },
-            "require-dev": {
-                "ext-xdebug": "^2.1.4",
-                "phpunit/phpunit": "^5.7"
-            },
-            "suggest": {
-                "ext-xdebug": "^2.5.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2017-03-07 10:28:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
-                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2016-10-03 07:40:28"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21T13:50:34+00:00"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "d107f347d368dd8a384601398280c7c608390ab7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/d107f347d368dd8a384601398280c7c608390ab7",
-                "reference": "d107f347d368dd8a384601398280c7c608390ab7",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2017-03-07 15:42:04"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "9ddb181faa4a3841fe131c357fd01de75cbb4da9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9ddb181faa4a3841fe131c357fd01de75cbb4da9",
-                "reference": "9ddb181faa4a3841fe131c357fd01de75cbb4da9",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2017-03-07 07:36:57"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "5.5.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6e88e56c912133de6e99b87728cca7ed70c5f5",
-                "reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "myclabs/deep-copy": "~1.3",
-                "php": "^5.6 || ^7.0",
-                "phpspec/prophecy": "^1.3.1",
-                "phpunit/php-code-coverage": "^4.0.1",
-                "phpunit/php-file-iterator": "~1.4",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "^3.2",
-                "sebastian/comparator": "~1.1",
-                "sebastian/diff": "~1.2",
-                "sebastian/environment": "^1.3 || ^2.0",
-                "sebastian/exporter": "~1.2",
-                "sebastian/global-state": "~1.0",
-                "sebastian/object-enumerator": "~1.0",
-                "sebastian/resource-operations": "~1.0",
-                "sebastian/version": "~1.0|~2.0",
-                "symfony/yaml": "~2.1|~3.0"
-            },
-            "conflict": {
-                "phpdocumentor/reflection-docblock": "3.0.2"
-            },
-            "suggest": {
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.5.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2016-08-26T07:11:44+00:00"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "3.4.x-dev",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "4001a301f86fc006c32f532a741ab613f2bd8990"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/4001a301f86fc006c32f532a741ab613f2bd8990",
-                "reference": "4001a301f86fc006c32f532a741ab613f2bd8990",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.6 || ^7.0",
-                "phpunit/php-text-template": "^1.2",
-                "sebastian/exporter": "^1.2 || ^2.0"
-            },
-            "conflict": {
-                "phpunit/phpunit": "<5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2017-03-07 08:47:31"
-        },
-        {
-            "name": "sebastian/code-unit-reverse-lookup",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "3488be0a7b346cd6e5361510ed07e88f9bea2e88"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/3488be0a7b346cd6e5361510ed07e88f9bea2e88",
-                "reference": "3488be0a7b346cd6e5361510ed07e88f9bea2e88",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Looks up which function or method a line of code belongs to",
-            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04 10:23:55"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.2.x-dev",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "18a5d97c25f408f48acaf6d1b9f4079314c5996a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/18a5d97c25f408f48acaf6d1b9f4079314c5996a",
-                "reference": "18a5d97c25f408f48acaf6d1b9f4079314c5996a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2 || ~2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2017-03-07 10:34:43"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "763d7adeb8c35d2af2b04c0f6cafeee059074dfb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/763d7adeb8c35d2af2b04c0f6cafeee059074dfb",
-                "reference": "763d7adeb8c35d2af2b04c0f6cafeee059074dfb",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2017-03-07 07:26:53"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "144fedf9aa8e3f1c52199f3634eb699cb59741d9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/144fedf9aa8e3f1c52199f3634eb699cb59741d9",
-                "reference": "144fedf9aa8e3f1c52199f3634eb699cb59741d9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2017-03-07 12:59:58"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.2.x-dev",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/dcd43bcc0fd3551bd2ede0081882d549bb78225d",
-                "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0",
-                "sebastian/recursion-context": "^1.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2017-02-26 13:09:30"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.1.x-dev",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "cea85a84b00f2795341ebbbca4fa396347f2494e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/cea85a84b00f2795341ebbbca4fa396347f2494e",
-                "reference": "cea85a84b00f2795341ebbbca4fa396347f2494e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2|~5.0"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2017-02-23 14:11:06"
-        },
-        {
-            "name": "sebastian/object-enumerator",
-            "version": "1.0.x-dev",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "1a7e888dce73bd3c1deedb345fce00329c75b065"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1a7e888dce73bd3c1deedb345fce00329c75b065",
-                "reference": "1a7e888dce73bd3c1deedb345fce00329c75b065",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2016-10-03 07:42:27"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "1.0.x-dev",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
-                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2016-10-03 07:41:43"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "fadc83f7c41fb2924e542635fea47ae546816ece"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/fadc83f7c41fb2924e542635fea47ae546816ece",
-                "reference": "fadc83f7c41fb2924e542635fea47ae546816ece",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2016-10-03 07:43:09"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03 07:35:21"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "d1abb473764f82339862b114b45b3cd424b2d1a3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/d1abb473764f82339862b114b45b3cd424b2d1a3",
-                "reference": "d1abb473764f82339862b114b45b3cd424b2d1a3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "require-dev": {
-                "symfony/console": "~2.8|~3.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-03-07 16:54:31"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "4a8bf11547e139e77b651365113fc12850c43d9a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/4a8bf11547e139e77b651365113fc12850c43d9a",
-                "reference": "4a8bf11547e139e77b651365113fc12850c43d9a",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "time": "2016-11-23 20:04:41"
         }
     ],
     "packages-dev": [],

From 9a906d4ecfcc9a39b4994fb50086e420e315a4a5 Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Thu, 9 Mar 2017 09:27:52 +0000
Subject: [PATCH 218/250] Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 core/database.class.php | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/core/database.class.php b/core/database.class.php
index 27ed0341b..993027589 100644
--- a/core/database.class.php
+++ b/core/database.class.php
@@ -263,11 +263,32 @@ public function create_table_sql($name, $data) {
 // }}}
 // {{{ cache engines
 interface CacheEngine {
+
+	/**
+	 * @param string $key
+	 */
 	public function get($key);
+
+	/**
+	 * @param string $key
+	 *
+	 * @return void
+	 */
 	public function set($key, $val, $time=0);
+
+	/**
+	 * @return void
+	 */
 	public function delete($key);
 
+	/**
+	 * @return integer
+	 */
 	public function get_hits();
+
+	/**
+	 * @return integer
+	 */
 	public function get_misses();
 }
 class NoCache implements CacheEngine {
@@ -818,7 +839,7 @@ public function get_pairs($query, $args=array()) {return $this->execute($query,
 	/**
 	 * @param string $query
 	 * @param array $args
-	 * @return mixed|PDOStatement
+	 * @return PDOStatement
 	 */
 	public function get_one($query, $args=array()) {return $this->execute($query, $args);}
 

From 9cf325d19511ae414bb84483c299b971381e7f76 Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Thu, 9 Mar 2017 01:31:41 -0800
Subject: [PATCH 219/250] Try global namespace

---
 tests/bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 453040b9c..73172759c 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -16,7 +16,7 @@
 	$userPage->onUserCreation(new UserCreationEvent("test", "test", ""));
 }
 
-abstract class ShimmiePHPUnitTestCase extends PHPUnit_Framework_TestCase {
+abstract class ShimmiePHPUnitTestCase extends \PHPUnit_Framework_TestCase {
 	protected $backupGlobalsBlacklist = array('database', 'config');
 	private $images = array();
 

From fef219c853d06e44747f59f61a89968a16b3f2dc Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Thu, 9 Mar 2017 10:32:00 -0800
Subject: [PATCH 220/250] Add explicit phpunit dependency back

---
 composer.json |    1 +
 composer.lock | 1323 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 1317 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 0e9a1c5b0..ca220c4cb 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,7 @@
 
 	"require" : {
 		"php" : ">=5.6",
+		"phpunit/phpunit" : "5.*",
 
 		"flexihash/flexihash"       : "^2.0.0",
 		"ifixit/php-akismet"        : "1.*",
diff --git a/composer.lock b/composer.lock
index a35286cbe..b985832cf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "87a3135435232aa90ec13a55e8e8e9af",
+    "content-hash": "eab4f507f52c24d89c6e53a28c21ee8e",
     "packages": [
         {
             "name": "bower-asset/jquery",
@@ -229,6 +229,60 @@
             ],
             "time": "2016-12-04T17:45:57+00:00"
         },
+        {
+            "name": "doctrine/instantiator",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "5acd2bd8c2b600ad5cc4c9180ebf0a930604d6a5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/5acd2bd8c2b600ad5cc4c9180ebf0a930604d6a5",
+                "reference": "5acd2bd8c2b600ad5cc4c9180ebf0a930604d6a5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2017-02-16 16:15:51"
+        },
         {
             "name": "flexihash/flexihash",
             "version": "v2.0.2",
@@ -288,19 +342,19 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/google/recaptcha.git",
-                "reference": "d3274db7c061770472b8eff8a7dbae0871f6cf03"
+                "reference": "29feb2a0e360bacd541680f270f255a2702c75b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/google/recaptcha/zipball/d3274db7c061770472b8eff8a7dbae0871f6cf03",
-                "reference": "d3274db7c061770472b8eff8a7dbae0871f6cf03",
+                "url": "https://api.github.com/repos/google/recaptcha/zipball/29feb2a0e360bacd541680f270f255a2702c75b3",
+                "reference": "29feb2a0e360bacd541680f270f255a2702c75b3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.2"
+                "php": ">=5.5"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.5.*"
+                "phpunit/phpunit": "^4.8"
             },
             "type": "library",
             "extra": {
@@ -325,7 +379,7 @@
                 "recaptcha",
                 "spam"
             ],
-            "time": "2016-08-04 17:35:35"
+            "time": "2017-03-09 18:21:55"
         },
         {
             "name": "ifixit/php-akismet",
@@ -378,6 +432,1261 @@
                 "password"
             ],
             "time": "2014-11-20T16:49:30+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "doctrine/collections": "1.*",
+                "phpunit/phpunit": "~4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "homepage": "https://github.com/myclabs/DeepCopy",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2017-01-26T22:05:40+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2015-12-27 11:43:31"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "3.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0@dev",
+                "phpdocumentor/type-resolver": "^0.2.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2016-09-30T07:12:33+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "time": "2016-11-25T06:54:22+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "abe41cb27f4e4207c6f54a09272969fe55e0bbff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/abe41cb27f4e4207c6f54a09272969fe55e0bbff",
+                "reference": "abe41cb27f4e4207c6f54a09272969fe55e0bbff",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5|^3.2",
+                "phpunit/phpunit": "^4.8 || ^5.6.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.7.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2017-03-03 17:09:02"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "4.0.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "cb9dd0ea37df29fa3c6ae5ac26c3408a7609cb4f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/cb9dd0ea37df29fa3c6ae5ac26c3408a7609cb4f",
+                "reference": "cb9dd0ea37df29fa3c6ae5ac26c3408a7609cb4f",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-file-iterator": "^1.3",
+                "phpunit/php-text-template": "^1.2",
+                "phpunit/php-token-stream": "^1.4.2 || ^2.0",
+                "sebastian/code-unit-reverse-lookup": "^1.0",
+                "sebastian/environment": "^1.3.2 || ^2.0",
+                "sebastian/version": "^1.0 || ^2.0"
+            },
+            "require-dev": {
+                "ext-xdebug": "^2.1.4",
+                "phpunit/phpunit": "^5.7"
+            },
+            "suggest": {
+                "ext-xdebug": "^2.5.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-03-07 10:28:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2016-10-03 07:40:28"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21T13:50:34+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "d107f347d368dd8a384601398280c7c608390ab7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/d107f347d368dd8a384601398280c7c608390ab7",
+                "reference": "d107f347d368dd8a384601398280c7c608390ab7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2017-03-07 15:42:04"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "9ddb181faa4a3841fe131c357fd01de75cbb4da9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9ddb181faa4a3841fe131c357fd01de75cbb4da9",
+                "reference": "9ddb181faa4a3841fe131c357fd01de75cbb4da9",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2017-03-07 07:36:57"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "5.5.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6e88e56c912133de6e99b87728cca7ed70c5f5",
+                "reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "myclabs/deep-copy": "~1.3",
+                "php": "^5.6 || ^7.0",
+                "phpspec/prophecy": "^1.3.1",
+                "phpunit/php-code-coverage": "^4.0.1",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "^1.0.6",
+                "phpunit/phpunit-mock-objects": "^3.2",
+                "sebastian/comparator": "~1.1",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "^1.3 || ^2.0",
+                "sebastian/exporter": "~1.2",
+                "sebastian/global-state": "~1.0",
+                "sebastian/object-enumerator": "~1.0",
+                "sebastian/resource-operations": "~1.0",
+                "sebastian/version": "~1.0|~2.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "3.0.2"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.5.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2016-08-26T07:11:44+00:00"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "3.4.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "4001a301f86fc006c32f532a741ab613f2bd8990"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/4001a301f86fc006c32f532a741ab613f2bd8990",
+                "reference": "4001a301f86fc006c32f532a741ab613f2bd8990",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-text-template": "^1.2",
+                "sebastian/exporter": "^1.2 || ^2.0"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2017-03-07 08:47:31"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "3488be0a7b346cd6e5361510ed07e88f9bea2e88"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/3488be0a7b346cd6e5361510ed07e88f9bea2e88",
+                "reference": "3488be0a7b346cd6e5361510ed07e88f9bea2e88",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "time": "2017-03-04 10:23:55"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "18a5d97c25f408f48acaf6d1b9f4079314c5996a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/18a5d97c25f408f48acaf6d1b9f4079314c5996a",
+                "reference": "18a5d97c25f408f48acaf6d1b9f4079314c5996a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2 || ~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2017-03-07 10:34:43"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "763d7adeb8c35d2af2b04c0f6cafeee059074dfb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/763d7adeb8c35d2af2b04c0f6cafeee059074dfb",
+                "reference": "763d7adeb8c35d2af2b04c0f6cafeee059074dfb",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2017-03-07 07:26:53"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "144fedf9aa8e3f1c52199f3634eb699cb59741d9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/144fedf9aa8e3f1c52199f3634eb699cb59741d9",
+                "reference": "144fedf9aa8e3f1c52199f3634eb699cb59741d9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2017-03-07 12:59:58"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.2.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/dcd43bcc0fd3551bd2ede0081882d549bb78225d",
+                "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0",
+                "sebastian/recursion-context": "^1.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2017-02-26 13:09:30"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "cea85a84b00f2795341ebbbca4fa396347f2494e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/cea85a84b00f2795341ebbbca4fa396347f2494e",
+                "reference": "cea85a84b00f2795341ebbbca4fa396347f2494e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2|~5.0"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2017-02-23 14:11:06"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "1.0.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "1a7e888dce73bd3c1deedb345fce00329c75b065"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1a7e888dce73bd3c1deedb345fce00329c75b065",
+                "reference": "1a7e888dce73bd3c1deedb345fce00329c75b065",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "time": "2016-10-03 07:42:27"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2016-10-03 07:41:43"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "fadc83f7c41fb2924e542635fea47ae546816ece"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/fadc83f7c41fb2924e542635fea47ae546816ece",
+                "reference": "fadc83f7c41fb2924e542635fea47ae546816ece",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "time": "2016-10-03 07:43:09"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2016-10-03 07:35:21"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "d1abb473764f82339862b114b45b3cd424b2d1a3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/d1abb473764f82339862b114b45b3cd424b2d1a3",
+                "reference": "d1abb473764f82339862b114b45b3cd424b2d1a3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "require-dev": {
+                "symfony/console": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-07 16:54:31"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "4a8bf11547e139e77b651365113fc12850c43d9a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/4a8bf11547e139e77b651365113fc12850c43d9a",
+                "reference": "4a8bf11547e139e77b651365113fc12850c43d9a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2016-11-23 20:04:41"
         }
     ],
     "packages-dev": [],

From d0b0c7f93d5d03f57cdd13f384928dcb6df59823 Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Thu, 9 Mar 2017 21:58:14 -0800
Subject: [PATCH 221/250] More linting with PHPDoc comments

---
 core/database.class.php | 10 ++++++++--
 core/util.inc.php       | 33 ++++++++++++++++++++-------------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/core/database.class.php b/core/database.class.php
index 993027589..40575f33e 100644
--- a/core/database.class.php
+++ b/core/database.class.php
@@ -266,12 +266,14 @@ interface CacheEngine {
 
 	/**
 	 * @param string $key
+	 * @return mixed
 	 */
 	public function get($key);
 
 	/**
 	 * @param string $key
-	 *
+	 * @param mixed $val
+	 * @param integer $time
 	 * @return void
 	 */
 	public function set($key, $val, $time=0);
@@ -345,7 +347,7 @@ public function get($key) {
 	/**
 	 * @param string $key
 	 * @param mixed $val
-	 * @param int $time
+	 * @param integer $time
 	 */
 	public function set($key, $val, $time=0) {
 		assert('!is_null($key)');
@@ -422,6 +424,10 @@ class Database {
 	 * @var null|PDO
 	 */
 	private $db = null;
+	
+	/**
+	 * @var float
+	 */
 	public $dbtime = 0.0;
 
 	/**
diff --git a/core/util.inc.php b/core/util.inc.php
index 1d5460f9a..f0d02c54c 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -8,7 +8,7 @@
 /**
  * Make some data safe for printing into HTML
  *
- * @param $input
+ * @param string $input
  * @return string
  */
 function html_escape($input) {
@@ -18,7 +18,7 @@ function html_escape($input) {
 /**
  * Unescape data that was made safe for printing into HTML
  *
- * @param $input
+ * @param string $input
  * @return string
  */
 function html_unescape($input) {
@@ -28,7 +28,7 @@ function html_unescape($input) {
 /**
  * Make sure some data is safe to be used in integer context
  *
- * @param $input
+ * @param string $input
  * @return int
  */
 function int_escape($input) {
@@ -42,7 +42,7 @@ function int_escape($input) {
 /**
  * Make sure some data is safe to be used in URL context
  *
- * @param $input
+ * @param string $input
  * @return string
  */
 function url_escape($input) {
@@ -77,7 +77,7 @@ function url_escape($input) {
 /**
  * Make sure some data is safe to be used in SQL context
  *
- * @param $input
+ * @param string $input
  * @return string
  */
 function sql_escape($input) {
@@ -125,7 +125,7 @@ function bool_escape($input) {
  * Some functions require a callback function for escaping,
  * but we might not want to alter the data
  *
- * @param $input
+ * @param string $input
  * @return string
  */
 function no_escape($input) {
@@ -202,7 +202,7 @@ function truncate($string, $limit, $break=" ", $pad="...") {
 /**
  * Turn a human readable filesize into an integer, eg 1KB -> 1024
  *
- * @param $limit
+ * @param string|integer $limit
  * @return int
  */
 function parse_shorthand_int($limit) {
@@ -232,7 +232,7 @@ function parse_shorthand_int($limit) {
 /**
  * Turn an integer into a human readable filesize, eg 1024 -> 1KB
  *
- * @param $int
+ * @param integer $int
  * @return string
  */
 function to_shorthand_int($int) {
@@ -254,7 +254,7 @@ function to_shorthand_int($int) {
 /**
  * Turn a date into a time, a date, an "X minutes ago...", etc
  *
- * @param $date
+ * @param string $date
  * @param bool $html
  * @return string
  */
@@ -267,7 +267,7 @@ function autodate($date, $html=true) {
 /**
  * Check if a given string is a valid date-time. ( Format: yyyy-mm-dd hh:mm:ss )
  *
- * @param $dateTime
+ * @param string $dateTime
  * @return bool
  */
 function isValidDateTime($dateTime) {
@@ -283,7 +283,7 @@ function isValidDateTime($dateTime) {
 /**
  * Check if a given string is a valid date. ( Format: yyyy-mm-dd )
  *
- * @param $date
+ * @param string $date
  * @return bool
  */
 function isValidDate($date) {
@@ -297,6 +297,9 @@ function isValidDate($date) {
 	return false;
 }
 
+/**
+ * @param string[] $inputs
+ */
 function validate_input($inputs) {
 	$outputs = array();
 
@@ -391,8 +394,8 @@ function validate_input($inputs) {
  *
  * FIXME: also check that IP ban ext is installed
  *
- * @param $ip
- * @param $ban_reason
+ * @param string $ip
+ * @param string $ban_reason
  * @return string
  */
 function show_ip($ip, $ban_reason) {
@@ -616,6 +619,7 @@ function zglob($pattern) {
 
 /**
  * Gets contact link as mailto: or http:
+ * @return string
  */
 function contact_link() {
 	global $config;
@@ -1734,6 +1738,9 @@ function _get_user() {
 	return $user;
 }
 
+/**
+ * @return string
+ */
 function _get_query() {
 	return @$_POST["q"]?:@$_GET["q"];
 }

From d62304cf70882279153d6885d1e783aa55555b42 Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Thu, 9 Mar 2017 22:28:48 -0800
Subject: [PATCH 222/250] more linting

---
 core/extension.class.php | 3 +++
 core/util.inc.php        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/extension.class.php b/core/extension.class.php
index e3931935e..dc8a1ccd0 100644
--- a/core/extension.class.php
+++ b/core/extension.class.php
@@ -92,6 +92,9 @@ public function __construct() {
 		$this->theme = $this->get_theme_object(get_called_class());
 	}
 
+	/**
+	 * @return boolean
+	 */
 	public function is_live() {
 		global $database;
 		return (
diff --git a/core/util.inc.php b/core/util.inc.php
index f0d02c54c..29e525b3e 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -90,7 +90,7 @@ function sql_escape($input) {
  * Turn all manner of HTML / INI / JS / DB booleans into a PHP one
  *
  * @param mixed $input
- * @return bool
+ * @return boolean
  */
 function bool_escape($input) {
 	/*

From 9e7787de0c222fdb88489f93d6904f5c0b4b57ea Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Thu, 9 Mar 2017 22:55:32 -0800
Subject: [PATCH 223/250] From Scrutinizer: The case 'r' would never be reached
 due to the default appearing before it.

---
 ext/tag_editcloud/main.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ext/tag_editcloud/main.php b/ext/tag_editcloud/main.php
index f9325aae8..854893bcb 100644
--- a/ext/tag_editcloud/main.php
+++ b/ext/tag_editcloud/main.php
@@ -83,18 +83,6 @@ private function build_tag_map(Image $image) {
 		}
 
 		switch($sort_method) {
-			case 'a':
-			case 'p':
-			default:
-				$order_by = $sort_method == 'a' ? "tag" : "count DESC";
-				$tag_data = $database->get_all("
-					SELECT tag, FLOOR(LN(LN(count - :tag_min1 + 1)+1)*150)/200 AS scaled, count
-					FROM tags
-					WHERE count >= :tag_min2
-					ORDER BY $order_by
-					LIMIT :limit",
-					array("tag_min1" => $tags_min, "tag_min2" => $tags_min, "limit" => $max_count));
-				break;
 			case 'r':
 				$relevant_tags = array_diff($image->get_tag_array(),$ignore_tags);
 				if(count($relevant_tags) == 0) {
@@ -113,6 +101,18 @@ private function build_tag_map(Image $image) {
 					LIMIT :limit",
 					array("tag_min1" => $tags_min, "tag_min2" => $tags_min, "limit" => $max_count));
 				break;
+			case 'a':
+			case 'p':
+			default:
+				$order_by = $sort_method == 'a' ? "tag" : "count DESC";
+				$tag_data = $database->get_all("
+					SELECT tag, FLOOR(LN(LN(count - :tag_min1 + 1)+1)*150)/200 AS scaled, count
+					FROM tags
+					WHERE count >= :tag_min2
+					ORDER BY $order_by
+					LIMIT :limit",
+					array("tag_min1" => $tags_min, "tag_min2" => $tags_min, "limit" => $max_count));
+				break;
 		}
 
 		$counter = 1;

From ab9dc0c51184bac706712b780fb06492d9edc380 Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Fri, 10 Mar 2017 00:28:47 -0800
Subject: [PATCH 224/250] Move phpunit to require-dev in composer.json

---
 composer.json |   5 ++-
 composer.lock | 121 +++++++++++++++++++++++++-------------------------
 2 files changed, 65 insertions(+), 61 deletions(-)

diff --git a/composer.json b/composer.json
index ca220c4cb..be55a2ce5 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,6 @@
 
 	"require" : {
 		"php" : ">=5.6",
-		"phpunit/phpunit" : "5.*",
 
 		"flexihash/flexihash"       : "^2.0.0",
 		"ifixit/php-akismet"        : "1.*",
@@ -35,6 +34,10 @@
 		"bower-asset/js-cookie"      : "2.1.1"
 	},
 
+	"require-dev" : {
+		"phpunit/phpunit" : "5.*"
+	},
+
 	"vendor-copy": {
 		"vendor/bower-asset/jquery/dist/jquery.min.js"                : "lib/vendor/js/jquery-1.12.3.min.js",
 		"vendor/bower-asset/jquery/dist/jquery.min.map"               : "lib/vendor/js/jquery-1.12.3.min.map",
diff --git a/composer.lock b/composer.lock
index b985832cf..ba693df23 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "eab4f507f52c24d89c6e53a28c21ee8e",
+    "content-hash": "d05a90197ed0f471b2a5494e3d612785",
     "packages": [
         {
             "name": "bower-asset/jquery",
@@ -229,60 +229,6 @@
             ],
             "time": "2016-12-04T17:45:57+00:00"
         },
-        {
-            "name": "doctrine/instantiator",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "5acd2bd8c2b600ad5cc4c9180ebf0a930604d6a5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/5acd2bd8c2b600ad5cc4c9180ebf0a930604d6a5",
-                "reference": "5acd2bd8c2b600ad5cc4c9180ebf0a930604d6a5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2017-02-16 16:15:51"
-        },
         {
             "name": "flexihash/flexihash",
             "version": "v2.0.2",
@@ -342,12 +288,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/google/recaptcha.git",
-                "reference": "29feb2a0e360bacd541680f270f255a2702c75b3"
+                "reference": "6990961e664372ddbed7ebc1cd673da7077552e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/google/recaptcha/zipball/29feb2a0e360bacd541680f270f255a2702c75b3",
-                "reference": "29feb2a0e360bacd541680f270f255a2702c75b3",
+                "url": "https://api.github.com/repos/google/recaptcha/zipball/6990961e664372ddbed7ebc1cd673da7077552e5",
+                "reference": "6990961e664372ddbed7ebc1cd673da7077552e5",
                 "shasum": ""
             },
             "require": {
@@ -379,7 +325,7 @@
                 "recaptcha",
                 "spam"
             ],
-            "time": "2017-03-09 18:21:55"
+            "time": "2017-03-09 18:57:45"
         },
         {
             "name": "ifixit/php-akismet",
@@ -432,6 +378,62 @@
                 "password"
             ],
             "time": "2014-11-20T16:49:30+00:00"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "5acd2bd8c2b600ad5cc4c9180ebf0a930604d6a5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/5acd2bd8c2b600ad5cc4c9180ebf0a930604d6a5",
+                "reference": "5acd2bd8c2b600ad5cc4c9180ebf0a930604d6a5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2017-02-16 16:15:51"
         },
         {
             "name": "myclabs/deep-copy",
@@ -1689,7 +1691,6 @@
             "time": "2016-11-23 20:04:41"
         }
     ],
-    "packages-dev": [],
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": [],

From df38c7978c339b72f107b571ea470f41ef802e43 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 10 Mar 2017 15:49:58 +0000
Subject: [PATCH 225/250] remove composer dependency on composer-asset-plugin &
 use asset-packagist instead This works the exact same, but without the
 requirement of a globally installed plugin This _may_ require a "composer
 global remove composer-asset-plugin remove" to work correctly.

---
 README.markdown | 5 ++---
 composer.json   | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.markdown b/README.markdown
index c1482904d..7660134c2 100644
--- a/README.markdown
+++ b/README.markdown
@@ -47,9 +47,8 @@ check out one of the versioned branches.
 1. Download shimmie via the "Download Zip" button on the [develop](https://github.com/shish/shimmie2/tree/develop) branch.
 2. Unzip shimmie into a folder on the web host
 3. Install [Composer](https://getcomposer.org/). (If you don't already have it)
-4. Run `composer global require "fxp/composer-asset-plugin:~1.1" --no-plugins`. (This is installed globally due to a known composer bug)
-5. Run `composer install` in the shimmie folder.
-6. Follow instructions noted in "Installation" starting from step 3.
+4. Run `composer install` in the shimmie folder.
+5. Follow instructions noted in "Installation" starting from step 3.
 
 ## Upgrade from 2.3.X
 
diff --git a/composer.json b/composer.json
index be55a2ce5..3405d8455 100644
--- a/composer.json
+++ b/composer.json
@@ -4,6 +4,10 @@
 	"minimum-stability" : "dev",
 
 	"repositories" : [
+		{
+			"type": "composer",
+			"url": "https://asset-packagist.org"
+		},
 		{
 			"type" : "package",
 			"package" : {

From 810ad041b75c9c4356b7325daa9e1386281d2bd4 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 10 Mar 2017 15:55:09 +0000
Subject: [PATCH 226/250] update composer.lock

---
 composer.lock | 124 ++++++++++++++++++++++++++------------------------
 1 file changed, 64 insertions(+), 60 deletions(-)

diff --git a/composer.lock b/composer.lock
index ba693df23..3b69c0180 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "d05a90197ed0f471b2a5494e3d612785",
+    "content-hash": "0ebb6cb4c51f9109b9cd7947f6b9f767",
     "packages": [
         {
             "name": "bower-asset/jquery",
@@ -107,12 +107,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/johndyer/mediaelement.git",
-                "reference": "68ae308b2ac4ac6648c06f68db9f8902370a3249"
+                "reference": "6e80b260172f4ddc3b0bbee046775d2ba4c6f9b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/johndyer/mediaelement/zipball/68ae308b2ac4ac6648c06f68db9f8902370a3249",
-                "reference": "68ae308b2ac4ac6648c06f68db9f8902370a3249",
+                "url": "https://api.github.com/repos/johndyer/mediaelement/zipball/6e80b260172f4ddc3b0bbee046775d2ba4c6f9b7",
+                "reference": "6e80b260172f4ddc3b0bbee046775d2ba4c6f9b7",
                 "shasum": ""
             },
             "type": "bower-asset-library",
@@ -433,7 +433,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2017-02-16 16:15:51"
+            "time": "2017-02-16T16:15:51+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -529,7 +529,7 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2015-12-27 11:43:31"
+            "time": "2015-12-27T11:43:31+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -684,7 +684,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2017-03-03 17:09:02"
+            "time": "2017-03-03T17:09:02+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -747,7 +747,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-03-07 10:28:00"
+            "time": "2017-03-07T10:28:00+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -794,7 +794,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2016-10-03 07:40:28"
+            "time": "2016-10-03T07:40:28+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -884,7 +884,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2017-03-07 15:42:04"
+            "time": "2017-03-07T15:42:04+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
@@ -933,50 +933,54 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2017-03-07 07:36:57"
+            "time": "2017-03-07T07:36:57+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "5.5.4",
+            "version": "5.7.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5"
+                "reference": "d421807ce5f372ecaf0bff3a5d41f5c60a18329f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6e88e56c912133de6e99b87728cca7ed70c5f5",
-                "reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d421807ce5f372ecaf0bff3a5d41f5c60a18329f",
+                "reference": "d421807ce5f372ecaf0bff3a5d41f5c60a18329f",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
                 "myclabs/deep-copy": "~1.3",
                 "php": "^5.6 || ^7.0",
-                "phpspec/prophecy": "^1.3.1",
-                "phpunit/php-code-coverage": "^4.0.1",
+                "phpspec/prophecy": "^1.6.2",
+                "phpunit/php-code-coverage": "^4.0.4",
                 "phpunit/php-file-iterator": "~1.4",
                 "phpunit/php-text-template": "~1.2",
                 "phpunit/php-timer": "^1.0.6",
                 "phpunit/phpunit-mock-objects": "^3.2",
-                "sebastian/comparator": "~1.1",
+                "sebastian/comparator": "^1.2.4",
                 "sebastian/diff": "~1.2",
-                "sebastian/environment": "^1.3 || ^2.0",
-                "sebastian/exporter": "~1.2",
-                "sebastian/global-state": "~1.0",
-                "sebastian/object-enumerator": "~1.0",
+                "sebastian/environment": "^1.3.4 || ^2.0",
+                "sebastian/exporter": "~2.0",
+                "sebastian/global-state": "^1.1",
+                "sebastian/object-enumerator": "~2.0",
                 "sebastian/resource-operations": "~1.0",
-                "sebastian/version": "~1.0|~2.0",
+                "sebastian/version": "~1.0.3|~2.0",
                 "symfony/yaml": "~2.1|~3.0"
             },
             "conflict": {
                 "phpdocumentor/reflection-docblock": "3.0.2"
             },
+            "require-dev": {
+                "ext-pdo": "*"
+            },
             "suggest": {
+                "ext-xdebug": "*",
                 "phpunit/php-invoker": "~1.1"
             },
             "bin": [
@@ -985,7 +989,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.5.x-dev"
+                    "dev-master": "5.7.x-dev"
                 }
             },
             "autoload": {
@@ -1011,7 +1015,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-08-26T07:11:44+00:00"
+            "time": "2017-03-09T13:47:42+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -1070,7 +1074,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2017-03-07 08:47:31"
+            "time": "2017-03-07T08:47:31+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -1115,7 +1119,7 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04 10:23:55"
+            "time": "2017-03-04T10:23:55+00:00"
         },
         {
             "name": "sebastian/comparator",
@@ -1179,7 +1183,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2017-03-07 10:34:43"
+            "time": "2017-03-07T10:34:43+00:00"
         },
         {
             "name": "sebastian/diff",
@@ -1231,7 +1235,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2017-03-07 07:26:53"
+            "time": "2017-03-07T07:26:53+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -1281,25 +1285,25 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2017-03-07 12:59:58"
+            "time": "2017-03-07T12:59:58+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "1.2.x-dev",
+            "version": "2.0.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d"
+                "reference": "5e8e30670c3f36481e75211dbbcfd029a41ebf07"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/dcd43bcc0fd3551bd2ede0081882d549bb78225d",
-                "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/5e8e30670c3f36481e75211dbbcfd029a41ebf07",
+                "reference": "5e8e30670c3f36481e75211dbbcfd029a41ebf07",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.3 || ^7.0",
-                "sebastian/recursion-context": "^1.0"
+                "sebastian/recursion-context": "^2.0"
             },
             "require-dev": {
                 "ext-mbstring": "*",
@@ -1308,7 +1312,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -1348,7 +1352,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2017-02-26 13:09:30"
+            "time": "2017-03-07T10:36:49+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -1399,33 +1403,33 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2017-02-23 14:11:06"
+            "time": "2017-02-23T14:11:06+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "1.0.x-dev",
+            "version": "2.0.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "1a7e888dce73bd3c1deedb345fce00329c75b065"
+                "reference": "c956fe7a68318639f694fc6bba0c89b7cdf1b08c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1a7e888dce73bd3c1deedb345fce00329c75b065",
-                "reference": "1a7e888dce73bd3c1deedb345fce00329c75b065",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/c956fe7a68318639f694fc6bba0c89b7cdf1b08c",
+                "reference": "c956fe7a68318639f694fc6bba0c89b7cdf1b08c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6",
-                "sebastian/recursion-context": "~1.0"
+                "php": "^5.6 || ^7.0",
+                "sebastian/recursion-context": "^2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~5"
+                "phpunit/phpunit": "^5.7"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -1445,20 +1449,20 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2016-10-03 07:42:27"
+            "time": "2017-03-07T10:37:45+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "1.0.x-dev",
+            "version": "2.0.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
+                "reference": "7e4d7c56f6e65d215f71ad913a5256e5439aca1c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
-                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/7e4d7c56f6e65d215f71ad913a5256e5439aca1c",
+                "reference": "7e4d7c56f6e65d215f71ad913a5256e5439aca1c",
                 "shasum": ""
             },
             "require": {
@@ -1470,7 +1474,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -1498,7 +1502,7 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2016-10-03 07:41:43"
+            "time": "2017-03-08T08:21:15+00:00"
         },
         {
             "name": "sebastian/resource-operations",
@@ -1540,7 +1544,7 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2016-10-03 07:43:09"
+            "time": "2016-10-03T07:43:09+00:00"
         },
         {
             "name": "sebastian/version",
@@ -1583,7 +1587,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03 07:35:21"
+            "time": "2016-10-03T07:35:21+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -1638,7 +1642,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-03-07 16:54:31"
+            "time": "2017-03-07T16:54:31+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -1688,7 +1692,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2016-11-23 20:04:41"
+            "time": "2016-11-23T20:04:41+00:00"
         }
     ],
     "aliases": [],

From 915acda6c72c6989b1deef184b004950dc58aad7 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 10 Mar 2017 15:56:09 +0000
Subject: [PATCH 227/250] update PHP-Akismet to PHP7 Compatable version

---
 composer.json |  4 ++--
 composer.lock | 48 ++++++++++++++++++++++++------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/composer.json b/composer.json
index 3405d8455..69649588c 100644
--- a/composer.json
+++ b/composer.json
@@ -12,11 +12,11 @@
 			"type" : "package",
 			"package" : {
 				"name" : "ifixit/php-akismet",
-				"version" : "1.0",
+				"version" : "1.1",
 				"source" : {
 					"url"       : "https://github.com/iFixit/php-akismet.git",
 					"type"      : "git",
-					"reference" : "126b4b9182230678a585338be4cfca24c9129dc9"
+					"reference" : "fd4ff50eb577457c1b7b887401663e91e77625ae"
 				}
 			}
 		}
diff --git a/composer.lock b/composer.lock
index 3b69c0180..380d43ffd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "0ebb6cb4c51f9109b9cd7947f6b9f767",
+    "content-hash": "be4e960941e4b31dae58e41f2adcf2f3",
     "packages": [
         {
             "name": "bower-asset/jquery",
@@ -329,11 +329,11 @@
         },
         {
             "name": "ifixit/php-akismet",
-            "version": "1.0",
+            "version": "1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/iFixit/php-akismet.git",
-                "reference": "126b4b9182230678a585338be4cfca24c9129dc9"
+                "reference": "fd4ff50eb577457c1b7b887401663e91e77625ae"
             },
             "type": "library"
         },
@@ -433,7 +433,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2017-02-16T16:15:51+00:00"
+            "time": "2017-02-16 16:15:51"
         },
         {
             "name": "myclabs/deep-copy",
@@ -529,7 +529,7 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2015-12-27T11:43:31+00:00"
+            "time": "2015-12-27 11:43:31"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -684,7 +684,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2017-03-03T17:09:02+00:00"
+            "time": "2017-03-03 17:09:02"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -747,7 +747,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-03-07T10:28:00+00:00"
+            "time": "2017-03-07 10:28:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -794,7 +794,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2016-10-03T07:40:28+00:00"
+            "time": "2016-10-03 07:40:28"
         },
         {
             "name": "phpunit/php-text-template",
@@ -884,7 +884,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2017-03-07T15:42:04+00:00"
+            "time": "2017-03-07 15:42:04"
         },
         {
             "name": "phpunit/php-token-stream",
@@ -933,7 +933,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2017-03-07T07:36:57+00:00"
+            "time": "2017-03-07 07:36:57"
         },
         {
             "name": "phpunit/phpunit",
@@ -1015,7 +1015,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-03-09T13:47:42+00:00"
+            "time": "2017-03-09 13:47:42"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -1074,7 +1074,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2017-03-07T08:47:31+00:00"
+            "time": "2017-03-07 08:47:31"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -1119,7 +1119,7 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04T10:23:55+00:00"
+            "time": "2017-03-04 10:23:55"
         },
         {
             "name": "sebastian/comparator",
@@ -1183,7 +1183,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2017-03-07T10:34:43+00:00"
+            "time": "2017-03-07 10:34:43"
         },
         {
             "name": "sebastian/diff",
@@ -1235,7 +1235,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2017-03-07T07:26:53+00:00"
+            "time": "2017-03-07 07:26:53"
         },
         {
             "name": "sebastian/environment",
@@ -1285,7 +1285,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2017-03-07T12:59:58+00:00"
+            "time": "2017-03-07 12:59:58"
         },
         {
             "name": "sebastian/exporter",
@@ -1352,7 +1352,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2017-03-07T10:36:49+00:00"
+            "time": "2017-03-07 10:36:49"
         },
         {
             "name": "sebastian/global-state",
@@ -1403,7 +1403,7 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2017-02-23T14:11:06+00:00"
+            "time": "2017-02-23 14:11:06"
         },
         {
             "name": "sebastian/object-enumerator",
@@ -1449,7 +1449,7 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2017-03-07T10:37:45+00:00"
+            "time": "2017-03-07 10:37:45"
         },
         {
             "name": "sebastian/recursion-context",
@@ -1502,7 +1502,7 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2017-03-08T08:21:15+00:00"
+            "time": "2017-03-08 08:21:15"
         },
         {
             "name": "sebastian/resource-operations",
@@ -1544,7 +1544,7 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2016-10-03T07:43:09+00:00"
+            "time": "2016-10-03 07:43:09"
         },
         {
             "name": "sebastian/version",
@@ -1587,7 +1587,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03T07:35:21+00:00"
+            "time": "2016-10-03 07:35:21"
         },
         {
             "name": "symfony/yaml",
@@ -1642,7 +1642,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-03-07T16:54:31+00:00"
+            "time": "2017-03-07 16:54:31"
         },
         {
             "name": "webmozart/assert",
@@ -1692,7 +1692,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2016-11-23T20:04:41+00:00"
+            "time": "2016-11-23 20:04:41"
         }
     ],
     "aliases": [],

From 6006530b3dc6e502eeada6c777fe534bb48e8a3a Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 10 Mar 2017 16:05:18 +0000
Subject: [PATCH 228/250] password_compat is not required on PHP 5.5+

---
 composer.json |  1 -
 composer.lock | 44 +-------------------------------------------
 2 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/composer.json b/composer.json
index 69649588c..7a4b1c623 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,6 @@
 		"ifixit/php-akismet"        : "1.*",
 		"google/recaptcha"          : "~1.1",
 		"dapphp/securimage"         : "3.6.*",
-		"ircmaxell/password-compat" : "1.0.4",
 
 		"bower-asset/jquery"         : "1.12.3",
 		"bower-asset/jquery-timeago" : "1.5.2",
diff --git a/composer.lock b/composer.lock
index 380d43ffd..4eed5ce6a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "be4e960941e4b31dae58e41f2adcf2f3",
+    "content-hash": "a450c93bec1d8f352be123e31bf84ac6",
     "packages": [
         {
             "name": "bower-asset/jquery",
@@ -336,48 +336,6 @@
                 "reference": "fd4ff50eb577457c1b7b887401663e91e77625ae"
             },
             "type": "library"
-        },
-        {
-            "name": "ircmaxell/password-compat",
-            "version": "v1.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ircmaxell/password_compat.git",
-                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
-                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
-                "shasum": ""
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "lib/password.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Anthony Ferrara",
-                    "email": "ircmaxell@php.net",
-                    "homepage": "http://blog.ircmaxell.com"
-                }
-            ],
-            "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
-            "homepage": "https://github.com/ircmaxell/password_compat",
-            "keywords": [
-                "hashing",
-                "password"
-            ],
-            "time": "2014-11-20T16:49:30+00:00"
         }
     ],
     "packages-dev": [

From 07d57f20e85faef356dcbac4acac26538e234d9d Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 10 Mar 2017 16:10:48 +0000
Subject: [PATCH 229/250] this is no longer needed

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4e3727a18..071a64b28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,6 @@ install:
   - if [[ "$DB" == "mysql" ]]; then mysql -e "CREATE DATABASE shimmie;" -uroot; fi
   - if [[ "$DB" == "mysql" ]]; then echo '<?php define("DATABASE_DSN", "mysql:user=root;password=;host=localhost;dbname=shimmie");' > data/config/auto_install.conf.php ; fi
   - if [[ "$DB" == "sqlite" ]]; then echo '<?php define("DATABASE_DSN", "sqlite:shimmie.sqlite");' > data/config/auto_install.conf.php ; fi
-  - composer global require "fxp/composer-asset-plugin:~1.1" --no-plugins
   - composer install
   - php install.php
 

From 68d9ec50c360818fa94fc2ab1cb7571f4b8efaf7 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 10 Mar 2017 16:21:07 +0000
Subject: [PATCH 230/250] specify composer phpunit

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 071a64b28..309247f73 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ install:
   - php install.php
 
 script:
-  - phpunit --configuration tests/phpunit.xml --coverage-clover=data/coverage.clover
+  - vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover=data/coverage.clover
 
 after_failure:
   - head -n 100 data/config/*

From 256d09a3ecd8a65bbfcfd5cacdee510baedc06da Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 10 Mar 2017 16:22:04 +0000
Subject: [PATCH 231/250] use multiline statements rather than multiple if
 statements

---
 .travis.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 309247f73..0743ff0de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,12 +25,18 @@ before_install:
 
 install:
   - mkdir -p data/config
-  - if [[ "$DB" == "pgsql" ]]; then psql -c "SELECT set_config('log_statement', 'all', false);" -U postgres; fi
-  - if [[ "$DB" == "pgsql" ]]; then psql -c "CREATE DATABASE shimmie;" -U postgres; fi
-  - if [[ "$DB" == "pgsql" ]]; then echo '<?php define("DATABASE_DSN", "pgsql:user=postgres;password=;host=;dbname=shimmie");' > data/config/auto_install.conf.php ; fi
-  - if [[ "$DB" == "mysql" ]]; then mysql -e "SET GLOBAL general_log = 'ON';" -uroot; fi
-  - if [[ "$DB" == "mysql" ]]; then mysql -e "CREATE DATABASE shimmie;" -uroot; fi
-  - if [[ "$DB" == "mysql" ]]; then echo '<?php define("DATABASE_DSN", "mysql:user=root;password=;host=localhost;dbname=shimmie");' > data/config/auto_install.conf.php ; fi
+  - |
+    if [[ "$DB" == "pgsql" ]]; then
+        psql -c "SELECT set_config('log_statement', 'all', false);" -U postgres ;
+        psql -c "CREATE DATABASE shimmie;" -U postgres ;
+        echo '<?php define("DATABASE_DSN", "pgsql:user=postgres;password=;host=;dbname=shimmie");' > data/config/auto_install.conf.php ;
+    fi
+  - |
+    if [[ "$DB" == "mysql" ]]; then
+        mysql -e "SET GLOBAL general_log = 'ON';" -uroot ;
+        mysql -e "CREATE DATABASE shimmie;" -uroot ;
+        echo '<?php define("DATABASE_DSN", "mysql:user=root;password=;host=localhost;dbname=shimmie");' > data/config/auto_install.conf.php ;
+    fi
   - if [[ "$DB" == "sqlite" ]]; then echo '<?php define("DATABASE_DSN", "sqlite:shimmie.sqlite");' > data/config/auto_install.conf.php ; fi
   - composer install
   - php install.php

From 84e86c4930b51f0da0a24a9b577da0c2aa77fc79 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 10 Mar 2017 17:05:15 +0000
Subject: [PATCH 232/250] use mime_content_type instead of getID3 + use proper
 MP4 mimetype

---
 ext/handle_mp3/main.php   | 22 ++++++++---------
 ext/handle_video/main.php | 50 ++++++++++++++++-----------------------
 2 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/ext/handle_mp3/main.php b/ext/handle_mp3/main.php
index 3ccd28716..64aa7d45f 100644
--- a/ext/handle_mp3/main.php
+++ b/ext/handle_mp3/main.php
@@ -30,13 +30,11 @@ protected function supported_ext($ext) {
 	 * @return Image|null
 	 */
 	protected function create_image_from_data($filename, $metadata) {
-		global $config;
-
 		$image = new Image();
 
-		// FIXME: need more flash format specs :|
-		$image->width = 0;
-		$image->height = 0;
+		//NOTE: No need to set width/height as we don't use it.
+		$image->width  = 1;
+		$image->height = 1;
 
 		$image->filesize  = $metadata['size'];
 		$image->hash      = $metadata['hash'];
@@ -66,15 +64,15 @@ protected function create_image_from_data($filename, $metadata) {
 	 * @return bool
 	 */
 	protected function check_contents($file) {
+		$success = FALSE;
+
 		if (file_exists($file)) {
-			require_once('lib/getid3/getid3/getid3.php');
-			$getID3 = new getID3;
-			$ThisFileInfo = $getID3->analyze($file, TRUE);
-			if (isset($ThisFileInfo['fileformat']) && $ThisFileInfo['fileformat'] == "mp3") {
-				return TRUE;
-			}
+			$mimeType = mime_content_type($file);
+
+			$success = ($mimeType == 'audio/mpeg');
 		}
-		return FALSE;
+
+		return $success;
 	}
 }
 
diff --git a/ext/handle_video/main.php b/ext/handle_video/main.php
index c84f60160..4edbcc327 100644
--- a/ext/handle_video/main.php
+++ b/ext/handle_video/main.php
@@ -12,8 +12,6 @@
  *  OGV, WEBM: HTML5<br>
  *  MP4's flash fallback is forced with a bit of Javascript as some browsers won't fallback if they can't play H.264.
  *  In the future, it may be necessary to change the user agent checks to reflect the current state of H.264 support.<br><br>
- *  Made possible by:<br>
- *  <a href='http://getid3.sourceforge.net/'>getID3()</a> - Gets media information with PHP (no bulky FFMPEG API required).<br>
  */
 
 class VideoFileHandler extends DataHandlerExtension {
@@ -145,31 +143,25 @@ protected function supported_ext($ext) {
 	 * @return Image
 	 */
 	protected function create_image_from_data($filename, $metadata) {
-
 		$image = new Image();
 
-		require_once('lib/getid3/getid3/getid3.php');
-		$getID3 = new getID3;
-		$ThisFileInfo = $getID3->analyze($filename);
-		
-		if (isset($ThisFileInfo['video']['resolution_x']) && isset($ThisFileInfo['video']['resolution_y'])) {
-			$image->width = $ThisFileInfo['video']['resolution_x'];
-			$image->height = $ThisFileInfo['video']['resolution_y'];
-		} else {
-			$image->width = 0;
-			$image->height = 0;
-		}
+		//NOTE: No need to set width/height as we don't use it.
+		$image->width  = 1;
+		$image->height = 1;
 		
-		switch ($ThisFileInfo['mime_type']) {
+		switch (mime_content_type($filename)) {
 			case "video/webm":
 				$image->ext = "webm";
 				break;
-			case "video/quicktime":
+			case "video/mp4":
 				$image->ext = "mp4";
 				break;
-			case "application/ogg":
+			case "video/ogg":
 				$image->ext = "ogv";
 				break;
+			case "video/flv":
+				$image->ext = "flv";
+				break;
 			case "video/x-flv":
 				$image->ext = "flv";
 				break;
@@ -189,20 +181,20 @@ protected function create_image_from_data($filename, $metadata) {
 	 * @return bool
 	 */
 	protected function check_contents($file) {
+		$success = FALSE;
 		if (file_exists($file)) {
-			require_once('lib/getid3/getid3/getid3.php');
-			$getID3 = new getID3;
-			$ThisFileInfo = $getID3->analyze($file);
-			if (isset($ThisFileInfo['mime_type']) && (
-					$ThisFileInfo['mime_type'] == "video/webm"      ||
-					$ThisFileInfo['mime_type'] == "video/quicktime" ||
-					$ThisFileInfo['mime_type'] == "application/ogg" ||
-					$ThisFileInfo['mime_type'] == 'video/x-flv')
-			) {
-				return TRUE;
-			}
+			$mimeType = mime_content_type($file);
+
+			$success = in_array($mimeType, [
+				'video/webm',
+				'video/mp4',
+				'video/ogg',
+				'video/flv',
+				'video/x-flv'
+			]);
 		}
-			return FALSE;
+
+		return $success;
 	}
 }
 

From 12d73c28a8a4f0abb3954a01594e6fe6fed247bd Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 10 Mar 2017 18:16:56 +0000
Subject: [PATCH 233/250] remove getID3 lib

---
 ext/handle_mp3/main.php                       |   14 -
 lib/getid3/THIS_HAS_BEEN_MODIFIED.txt         |    5 -
 lib/getid3/getid3/extension.cache.dbm.php     |  211 --
 lib/getid3/getid3/extension.cache.mysql.php   |  173 -
 lib/getid3/getid3/getid3.lib.php              | 1316 -------
 lib/getid3/getid3/getid3.php                  | 1747 ---------
 lib/getid3/getid3/module.archive.gzip.php     |  280 --
 lib/getid3/getid3/module.archive.rar.php      |   53 -
 lib/getid3/getid3/module.archive.szip.php     |   96 -
 lib/getid3/getid3/module.archive.tar.php      |  178 -
 lib/getid3/getid3/module.archive.zip.php      |  424 ---
 lib/getid3/getid3/module.audio-video.asf.php  | 2021 ----------
 lib/getid3/getid3/module.audio-video.bink.php |   73 -
 lib/getid3/getid3/module.audio-video.flv.php  |  731 ----
 .../getid3/module.audio-video.matroska.php    | 1706 ---------
 lib/getid3/getid3/module.audio-video.mpeg.php |  299 --
 lib/getid3/getid3/module.audio-video.nsv.php  |  226 --
 .../getid3/module.audio-video.quicktime.php   | 2134 -----------
 lib/getid3/getid3/module.audio-video.real.php |  530 ---
 lib/getid3/getid3/module.audio-video.riff.php | 2409 ------------
 lib/getid3/getid3/module.audio-video.swf.php  |  142 -
 lib/getid3/getid3/module.audio.aa.php         |   59 -
 lib/getid3/getid3/module.audio.aac.php        |  515 ---
 lib/getid3/getid3/module.audio.ac3.php        |  473 ---
 lib/getid3/getid3/module.audio.au.php         |  165 -
 lib/getid3/getid3/module.audio.avr.php        |  127 -
 lib/getid3/getid3/module.audio.bonk.php       |  230 --
 lib/getid3/getid3/module.audio.dss.php        |   75 -
 lib/getid3/getid3/module.audio.dts.php        |  246 --
 lib/getid3/getid3/module.audio.flac.php       |  480 ---
 lib/getid3/getid3/module.audio.la.php         |  229 --
 lib/getid3/getid3/module.audio.lpac.php       |  130 -
 lib/getid3/getid3/module.audio.midi.php       |  526 ---
 lib/getid3/getid3/module.audio.mod.php        |  101 -
 lib/getid3/getid3/module.audio.monkey.php     |  205 -
 lib/getid3/getid3/module.audio.mp3.php        | 2011 ----------
 lib/getid3/getid3/module.audio.mpc.php        |  509 ---
 lib/getid3/getid3/module.audio.ogg.php        |  705 ----
 lib/getid3/getid3/module.audio.optimfrog.php  |  429 ---
 lib/getid3/getid3/module.audio.rkau.php       |   94 -
 lib/getid3/getid3/module.audio.shorten.php    |  183 -
 lib/getid3/getid3/module.audio.tta.php        |  109 -
 lib/getid3/getid3/module.audio.voc.php        |  207 -
 lib/getid3/getid3/module.audio.vqf.php        |  162 -
 lib/getid3/getid3/module.audio.wavpack.php    |  400 --
 lib/getid3/getid3/module.graphic.bmp.php      |  690 ----
 lib/getid3/getid3/module.graphic.efax.php     |   53 -
 lib/getid3/getid3/module.graphic.gif.php      |  184 -
 lib/getid3/getid3/module.graphic.jpg.php      |  338 --
 lib/getid3/getid3/module.graphic.pcd.php      |  134 -
 lib/getid3/getid3/module.graphic.png.php      |  520 ---
 lib/getid3/getid3/module.graphic.svg.php      |  104 -
 lib/getid3/getid3/module.graphic.tiff.php     |  227 --
 lib/getid3/getid3/module.misc.cue.php         |  312 --
 lib/getid3/getid3/module.misc.exe.php         |   61 -
 lib/getid3/getid3/module.misc.iso.php         |  389 --
 lib/getid3/getid3/module.misc.msoffice.php    |   40 -
 lib/getid3/getid3/module.misc.par2.php        |   33 -
 lib/getid3/getid3/module.misc.pdf.php         |   33 -
 lib/getid3/getid3/module.tag.apetag.php       |  372 --
 lib/getid3/getid3/module.tag.id3v1.php        |  362 --
 lib/getid3/getid3/module.tag.id3v2.php        | 3327 -----------------
 lib/getid3/getid3/module.tag.lyrics3.php      |  297 --
 lib/getid3/getid3/module.tag.xmp.php          |  766 ----
 lib/getid3/getid3/write.apetag.php            |  225 --
 lib/getid3/getid3/write.id3v1.php             |  138 -
 lib/getid3/getid3/write.id3v2.php             | 2050 ----------
 lib/getid3/getid3/write.lyrics3.php           |   73 -
 lib/getid3/getid3/write.metaflac.php          |  163 -
 lib/getid3/getid3/write.php                   |  615 ---
 lib/getid3/getid3/write.real.php              |  275 --
 lib/getid3/getid3/write.vorbiscomment.php     |  121 -
 lib/getid3/license.commercial.txt             |   27 -
 lib/getid3/license.txt                        |  340 --
 74 files changed, 35407 deletions(-)
 delete mode 100644 lib/getid3/THIS_HAS_BEEN_MODIFIED.txt
 delete mode 100644 lib/getid3/getid3/extension.cache.dbm.php
 delete mode 100644 lib/getid3/getid3/extension.cache.mysql.php
 delete mode 100644 lib/getid3/getid3/getid3.lib.php
 delete mode 100644 lib/getid3/getid3/getid3.php
 delete mode 100644 lib/getid3/getid3/module.archive.gzip.php
 delete mode 100644 lib/getid3/getid3/module.archive.rar.php
 delete mode 100644 lib/getid3/getid3/module.archive.szip.php
 delete mode 100644 lib/getid3/getid3/module.archive.tar.php
 delete mode 100644 lib/getid3/getid3/module.archive.zip.php
 delete mode 100644 lib/getid3/getid3/module.audio-video.asf.php
 delete mode 100644 lib/getid3/getid3/module.audio-video.bink.php
 delete mode 100644 lib/getid3/getid3/module.audio-video.flv.php
 delete mode 100644 lib/getid3/getid3/module.audio-video.matroska.php
 delete mode 100644 lib/getid3/getid3/module.audio-video.mpeg.php
 delete mode 100644 lib/getid3/getid3/module.audio-video.nsv.php
 delete mode 100644 lib/getid3/getid3/module.audio-video.quicktime.php
 delete mode 100644 lib/getid3/getid3/module.audio-video.real.php
 delete mode 100644 lib/getid3/getid3/module.audio-video.riff.php
 delete mode 100644 lib/getid3/getid3/module.audio-video.swf.php
 delete mode 100644 lib/getid3/getid3/module.audio.aa.php
 delete mode 100644 lib/getid3/getid3/module.audio.aac.php
 delete mode 100644 lib/getid3/getid3/module.audio.ac3.php
 delete mode 100644 lib/getid3/getid3/module.audio.au.php
 delete mode 100644 lib/getid3/getid3/module.audio.avr.php
 delete mode 100644 lib/getid3/getid3/module.audio.bonk.php
 delete mode 100644 lib/getid3/getid3/module.audio.dss.php
 delete mode 100644 lib/getid3/getid3/module.audio.dts.php
 delete mode 100644 lib/getid3/getid3/module.audio.flac.php
 delete mode 100644 lib/getid3/getid3/module.audio.la.php
 delete mode 100644 lib/getid3/getid3/module.audio.lpac.php
 delete mode 100644 lib/getid3/getid3/module.audio.midi.php
 delete mode 100644 lib/getid3/getid3/module.audio.mod.php
 delete mode 100644 lib/getid3/getid3/module.audio.monkey.php
 delete mode 100644 lib/getid3/getid3/module.audio.mp3.php
 delete mode 100644 lib/getid3/getid3/module.audio.mpc.php
 delete mode 100644 lib/getid3/getid3/module.audio.ogg.php
 delete mode 100644 lib/getid3/getid3/module.audio.optimfrog.php
 delete mode 100644 lib/getid3/getid3/module.audio.rkau.php
 delete mode 100644 lib/getid3/getid3/module.audio.shorten.php
 delete mode 100644 lib/getid3/getid3/module.audio.tta.php
 delete mode 100644 lib/getid3/getid3/module.audio.voc.php
 delete mode 100644 lib/getid3/getid3/module.audio.vqf.php
 delete mode 100644 lib/getid3/getid3/module.audio.wavpack.php
 delete mode 100644 lib/getid3/getid3/module.graphic.bmp.php
 delete mode 100644 lib/getid3/getid3/module.graphic.efax.php
 delete mode 100644 lib/getid3/getid3/module.graphic.gif.php
 delete mode 100644 lib/getid3/getid3/module.graphic.jpg.php
 delete mode 100644 lib/getid3/getid3/module.graphic.pcd.php
 delete mode 100644 lib/getid3/getid3/module.graphic.png.php
 delete mode 100644 lib/getid3/getid3/module.graphic.svg.php
 delete mode 100644 lib/getid3/getid3/module.graphic.tiff.php
 delete mode 100644 lib/getid3/getid3/module.misc.cue.php
 delete mode 100644 lib/getid3/getid3/module.misc.exe.php
 delete mode 100644 lib/getid3/getid3/module.misc.iso.php
 delete mode 100644 lib/getid3/getid3/module.misc.msoffice.php
 delete mode 100644 lib/getid3/getid3/module.misc.par2.php
 delete mode 100644 lib/getid3/getid3/module.misc.pdf.php
 delete mode 100644 lib/getid3/getid3/module.tag.apetag.php
 delete mode 100644 lib/getid3/getid3/module.tag.id3v1.php
 delete mode 100644 lib/getid3/getid3/module.tag.id3v2.php
 delete mode 100644 lib/getid3/getid3/module.tag.lyrics3.php
 delete mode 100644 lib/getid3/getid3/module.tag.xmp.php
 delete mode 100644 lib/getid3/getid3/write.apetag.php
 delete mode 100644 lib/getid3/getid3/write.id3v1.php
 delete mode 100644 lib/getid3/getid3/write.id3v2.php
 delete mode 100644 lib/getid3/getid3/write.lyrics3.php
 delete mode 100644 lib/getid3/getid3/write.metaflac.php
 delete mode 100644 lib/getid3/getid3/write.php
 delete mode 100644 lib/getid3/getid3/write.real.php
 delete mode 100644 lib/getid3/getid3/write.vorbiscomment.php
 delete mode 100644 lib/getid3/license.commercial.txt
 delete mode 100644 lib/getid3/license.txt

diff --git a/ext/handle_mp3/main.php b/ext/handle_mp3/main.php
index 64aa7d45f..c683ac557 100644
--- a/ext/handle_mp3/main.php
+++ b/ext/handle_mp3/main.php
@@ -38,20 +38,6 @@ protected function create_image_from_data($filename, $metadata) {
 
 		$image->filesize  = $metadata['size'];
 		$image->hash      = $metadata['hash'];
-		
-		//Cheat by using the filename to store artist/title if available
-		require_once('lib/getid3/getid3/getid3.php');
-		$getID3 = new getID3;
-		$ThisFileInfo = $getID3->analyze($filename, TRUE);
-		
-		if (isset($ThisFileInfo['tags']['id3v2']['artist'][0]) && isset($ThisFileInfo['tags']['id3v2']['title'][0])) {
-			$image->filename = $ThisFileInfo['tags']['id3v2']['artist'][0]." - ".$ThisFileInfo['tags']['id3v2']['title'][0].".mp3";
-		} else if (isset($ThisFileInfo['tags']['id3v1']['artist'][0]) && isset($ThisFileInfo['tags']['id3v1']['title'][0])) {
-			$image->filename = $ThisFileInfo['tags']['id3v1']['artist'][0]." - ".$ThisFileInfo['tags']['id3v1']['title'][0].".mp3";
-		} else {
-			$image->filename = $metadata['filename'];
-		}
-		
 		$image->ext       = $metadata['extension'];
 		$image->tag_array = $metadata['tags'];
 		$image->source    = $metadata['source'];
diff --git a/lib/getid3/THIS_HAS_BEEN_MODIFIED.txt b/lib/getid3/THIS_HAS_BEEN_MODIFIED.txt
deleted file mode 100644
index e2105a17b..000000000
--- a/lib/getid3/THIS_HAS_BEEN_MODIFIED.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-In compliance with GPL, this message is to notify you that getID3 has been modified.
-
-getid3.php was modified September 23, 2012 to add a boolean to force MP3 checking.
-
-It carries the same license as its original.
\ No newline at end of file
diff --git a/lib/getid3/getid3/extension.cache.dbm.php b/lib/getid3/getid3/extension.cache.dbm.php
deleted file mode 100644
index 9a88c22b2..000000000
--- a/lib/getid3/getid3/extension.cache.dbm.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// extension.cache.dbm.php - part of getID3()                  //
-// Please see readme.txt for more information                  //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// This extension written by Allan Hansen <ah�artemis*dk>      //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-/**
-* This is a caching extension for getID3(). It works the exact same
-* way as the getID3 class, but return cached information very fast
-*
-* Example:
-*
-*    Normal getID3 usage (example):
-*
-*       require_once 'getid3/getid3.php';
-*       $getID3 = new getID3;
-*       $getID3->encoding = 'UTF-8';
-*       $info1 = $getID3->analyze('file1.flac');
-*       $info2 = $getID3->analyze('file2.wv');
-*
-*    getID3_cached usage:
-*
-*       require_once 'getid3/getid3.php';
-*       require_once 'getid3/getid3/extension.cache.dbm.php';
-*       $getID3 = new getID3_cached('db3', '/tmp/getid3_cache.dbm',
-*                                          '/tmp/getid3_cache.lock');
-*       $getID3->encoding = 'UTF-8';
-*       $info1 = $getID3->analyze('file1.flac');
-*       $info2 = $getID3->analyze('file2.wv');
-*
-*
-* Supported Cache Types
-*
-*   SQL Databases:          (use extension.cache.mysql)
-*
-*   cache_type          cache_options
-*   -------------------------------------------------------------------
-*   mysql               host, database, username, password
-*
-*
-*   DBM-Style Databases:    (this extension)
-*
-*   cache_type          cache_options
-*   -------------------------------------------------------------------
-*   gdbm                dbm_filename, lock_filename
-*   ndbm                dbm_filename, lock_filename
-*   db2                 dbm_filename, lock_filename
-*   db3                 dbm_filename, lock_filename
-*   db4                 dbm_filename, lock_filename  (PHP5 required)
-*
-*   PHP must have write access to both dbm_filename and lock_filename.
-*
-*
-* Recommended Cache Types
-*
-*   Infrequent updates, many reads      any DBM
-*   Frequent updates                    mysql
-*/
-
-
-class getID3_cached_dbm extends getID3
-{
-
-	// public: constructor - see top of this file for cache type and cache_options
-	function getID3_cached_dbm($cache_type, $dbm_filename, $lock_filename) {
-
-		// Check for dba extension
-		if (!extension_loaded('dba')) {
-			throw new Exception('PHP is not compiled with dba support, required to use DBM style cache.');
-		}
-
-		// Check for specific dba driver
-		if (!function_exists('dba_handlers') || !in_array($cache_type, dba_handlers())) {
-			throw new Exception('PHP is not compiled --with '.$cache_type.' support, required to use DBM style cache.');
-		}
-
-		// Create lock file if needed
-		if (!file_exists($lock_filename)) {
-			if (!touch($lock_filename)) {
-				throw new Exception('failed to create lock file: '.$lock_filename);
-			}
-		}
-
-		// Open lock file for writing
-		if (!is_writeable($lock_filename)) {
-			throw new Exception('lock file: '.$lock_filename.' is not writable');
-		}
-		$this->lock = fopen($lock_filename, 'w');
-
-		// Acquire exclusive write lock to lock file
-		flock($this->lock, LOCK_EX);
-
-		// Create dbm-file if needed
-		if (!file_exists($dbm_filename)) {
-			if (!touch($dbm_filename)) {
-				throw new Exception('failed to create dbm file: '.$dbm_filename);
-			}
-		}
-
-		// Try to open dbm file for writing
-		$this->dba = dba_open($dbm_filename, 'w', $cache_type);
-		if (!$this->dba) {
-
-			// Failed - create new dbm file
-			$this->dba = dba_open($dbm_filename, 'n', $cache_type);
-
-			if (!$this->dba) {
-				throw new Exception('failed to create dbm file: '.$dbm_filename);
-			}
-
-			// Insert getID3 version number
-			dba_insert(getID3::VERSION, getID3::VERSION, $this->dba);
-		}
-
-		// Init misc values
-		$this->cache_type   = $cache_type;
-		$this->dbm_filename = $dbm_filename;
-
-		// Register destructor
-		register_shutdown_function(array($this, '__destruct'));
-
-		// Check version number and clear cache if changed
-		if (dba_fetch(getID3::VERSION, $this->dba) != getID3::VERSION) {
-			$this->clear_cache();
-		}
-
-		parent::getID3();
-	}
-
-
-
-	// public: destuctor
-	function __destruct() {
-
-		// Close dbm file
-		dba_close($this->dba);
-
-		// Release exclusive lock
-		flock($this->lock, LOCK_UN);
-
-		// Close lock file
-		fclose($this->lock);
-	}
-
-
-
-	// public: clear cache
-	function clear_cache() {
-
-		// Close dbm file
-		dba_close($this->dba);
-
-		// Create new dbm file
-		$this->dba = dba_open($this->dbm_filename, 'n', $this->cache_type);
-
-		if (!$this->dba) {
-			throw new Exception('failed to clear cache/recreate dbm file: '.$this->dbm_filename);
-		}
-
-		// Insert getID3 version number
-		dba_insert(getID3::VERSION, getID3::VERSION, $this->dba);
-
-		// Re-register shutdown function
-		register_shutdown_function(array($this, '__destruct'));
-	}
-
-
-
-	// public: analyze file
-	function analyze($filename) {
-
-		if (file_exists($filename)) {
-
-			// Calc key     filename::mod_time::size    - should be unique
-			$key = $filename.'::'.filemtime($filename).'::'.filesize($filename);
-
-			// Loopup key
-			$result = dba_fetch($key, $this->dba);
-
-			// Hit
-			if ($result !== false) {
-				return unserialize($result);
-			}
-		}
-
-		// Miss
-		$result = parent::analyze($filename);
-
-		// Save result
-		if (file_exists($filename)) {
-			dba_insert($key, serialize($result), $this->dba);
-		}
-
-		return $result;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/extension.cache.mysql.php b/lib/getid3/getid3/extension.cache.mysql.php
deleted file mode 100644
index 1e1f91fa1..000000000
--- a/lib/getid3/getid3/extension.cache.mysql.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// extension.cache.mysql.php - part of getID3()                //
-// Please see readme.txt for more information                  //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// This extension written by Allan Hansen <ah�artemis*dk>      //
-// Table name mod by Carlo Capocasa <calro�carlocapocasa*com>  //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-/**
-* This is a caching extension for getID3(). It works the exact same
-* way as the getID3 class, but return cached information very fast
-*
-* Example:  (see also demo.cache.mysql.php in /demo/)
-*
-*    Normal getID3 usage (example):
-*
-*       require_once 'getid3/getid3.php';
-*       $getID3 = new getID3;
-*       $getID3->encoding = 'UTF-8';
-*       $info1 = $getID3->analyze('file1.flac');
-*       $info2 = $getID3->analyze('file2.wv');
-*
-*    getID3_cached usage:
-*
-*       require_once 'getid3/getid3.php';
-*       require_once 'getid3/getid3/extension.cache.mysql.php';
-*       // 5th parameter (tablename) is optional, default is 'getid3_cache'
-*       $getID3 = new getID3_cached_mysql('localhost', 'database', 'username', 'password', 'tablename');
-*       $getID3->encoding = 'UTF-8';
-*       $info1 = $getID3->analyze('file1.flac');
-*       $info2 = $getID3->analyze('file2.wv');
-*
-*
-* Supported Cache Types    (this extension)
-*
-*   SQL Databases:
-*
-*   cache_type          cache_options
-*   -------------------------------------------------------------------
-*   mysql               host, database, username, password
-*
-*
-*   DBM-Style Databases:    (use extension.cache.dbm)
-*
-*   cache_type          cache_options
-*   -------------------------------------------------------------------
-*   gdbm                dbm_filename, lock_filename
-*   ndbm                dbm_filename, lock_filename
-*   db2                 dbm_filename, lock_filename
-*   db3                 dbm_filename, lock_filename
-*   db4                 dbm_filename, lock_filename  (PHP5 required)
-*
-*   PHP must have write access to both dbm_filename and lock_filename.
-*
-*
-* Recommended Cache Types
-*
-*   Infrequent updates, many reads      any DBM
-*   Frequent updates                    mysql
-*/
-
-
-class getID3_cached_mysql extends getID3
-{
-
-	// private vars
-	var $cursor;
-	var $connection;
-
-
-	// public: constructor - see top of this file for cache type and cache_options
-	function getID3_cached_mysql($host, $database, $username, $password, $table='getid3_cache') {
-
-		// Check for mysql support
-		if (!function_exists('mysql_pconnect')) {
-			throw new Exception('PHP not compiled with mysql support.');
-		}
-
-		// Connect to database
-		$this->connection = mysql_pconnect($host, $username, $password);
-		if (!$this->connection) {
-			throw new Exception('mysql_pconnect() failed - check permissions and spelling.');
-		}
-
-		// Select database
-		if (!mysql_select_db($database, $this->connection)) {
-			throw new Exception('Cannot use database '.$database);
-		}
-
-		// Set table
-		$this->table = $table;
-
-		// Create cache table if not exists
-		$this->create_table();
-
-		// Check version number and clear cache if changed
-		$version = '';
-		if ($this->cursor = mysql_query("SELECT `value` FROM `".mysql_real_escape_string($this->table)."` WHERE (`filename` = '".mysql_real_escape_string(getID3::VERSION)."') AND (`filesize` = '-1') AND (`filetime` = '-1') AND (`analyzetime` = '-1')", $this->connection)) {
-			list($version) = mysql_fetch_array($this->cursor);
-		}
-		if ($version != getID3::VERSION) {
-			$this->clear_cache();
-		}
-
-		parent::getID3();
-	}
-
-
-
-	// public: clear cache
-	function clear_cache() {
-
-		$this->cursor = mysql_query("DELETE FROM `".mysql_real_escape_string($this->table)."`", $this->connection);
-		$this->cursor = mysql_query("INSERT INTO `".mysql_real_escape_string($this->table)."` VALUES ('".getID3::VERSION."', -1, -1, -1, '".getID3::VERSION."')", $this->connection);
-	}
-
-
-
-	// public: analyze file
-	function analyze($filename) {
-
-		if (file_exists($filename)) {
-
-			// Short-hands
-			$filetime = filemtime($filename);
-			$filesize = filesize($filename);
-
-			// Lookup file
-			$this->cursor = mysql_query("SELECT `value` FROM `".mysql_real_escape_string($this->table)."` WHERE (`filename` = '".mysql_real_escape_string($filename)."') AND (`filesize` = '".mysql_real_escape_string($filesize)."') AND (`filetime` = '".mysql_real_escape_string($filetime)."')", $this->connection);
-			if (mysql_num_rows($this->cursor) > 0) {
-				// Hit
-				list($result) = mysql_fetch_array($this->cursor);
-				return unserialize(base64_decode($result));
-			}
-		}
-
-		// Miss
-		$analysis = parent::analyze($filename);
-
-		// Save result
-		if (file_exists($filename)) {
-			$this->cursor = mysql_query("INSERT INTO `".mysql_real_escape_string($this->table)."` (`filename`, `filesize`, `filetime`, `analyzetime`, `value`) VALUES ('".mysql_real_escape_string($filename)."', '".mysql_real_escape_string($filesize)."', '".mysql_real_escape_string($filetime)."', '".mysql_real_escape_string(time())."', '".mysql_real_escape_string(base64_encode(serialize($analysis)))."')", $this->connection);
-		}
-		return $analysis;
-	}
-
-
-
-	// private: (re)create sql table
-	function create_table($drop=false) {
-
-		$this->cursor = mysql_query("CREATE TABLE IF NOT EXISTS `".mysql_real_escape_string($this->table)."` (
-			`filename` VARCHAR(255) NOT NULL DEFAULT '',
-			`filesize` INT(11) NOT NULL DEFAULT '0',
-			`filetime` INT(11) NOT NULL DEFAULT '0',
-			`analyzetime` INT(11) NOT NULL DEFAULT '0',
-			`value` TEXT NOT NULL,
-			PRIMARY KEY (`filename`,`filesize`,`filetime`)) TYPE=MyISAM", $this->connection);
-		echo mysql_error($this->connection);
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/getid3.lib.php b/lib/getid3/getid3/getid3.lib.php
deleted file mode 100644
index fb677b768..000000000
--- a/lib/getid3/getid3/getid3.lib.php
+++ /dev/null
@@ -1,1316 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// getid3.lib.php - part of getID3()                           //
-// See readme.txt for more details                             //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_lib
-{
-
-	static function PrintHexBytes($string, $hex=true, $spaces=true, $htmlencoding='UTF-8') {
-		$returnstring = '';
-		for ($i = 0; $i < strlen($string); $i++) {
-			if ($hex) {
-				$returnstring .= str_pad(dechex(ord($string{$i})), 2, '0', STR_PAD_LEFT);
-			} else {
-				$returnstring .= ' '.(preg_match("#[\x20-\x7E]#", $string{$i}) ? $string{$i} : '�');
-			}
-			if ($spaces) {
-				$returnstring .= ' ';
-			}
-		}
-		if (!empty($htmlencoding)) {
-			if ($htmlencoding === true) {
-				$htmlencoding = 'UTF-8'; // prior to getID3 v1.9.0 the function's 4th parameter was boolean
-			}
-			$returnstring = htmlentities($returnstring, ENT_QUOTES, $htmlencoding);
-		}
-		return $returnstring;
-	}
-
-	static function trunc($floatnumber) {
-		// truncates a floating-point number at the decimal point
-		// returns int (if possible, otherwise float)
-		if ($floatnumber >= 1) {
-			$truncatednumber = floor($floatnumber);
-		} elseif ($floatnumber <= -1) {
-			$truncatednumber = ceil($floatnumber);
-		} else {
-			$truncatednumber = 0;
-		}
-		if (getid3_lib::intValueSupported($truncatednumber)) {
-			$truncatednumber = (int) $truncatednumber;
-		}
-		return $truncatednumber;
-	}
-
-
-	static function safe_inc(&$variable, $increment=1) {
-		if (isset($variable)) {
-			$variable += $increment;
-		} else {
-			$variable = $increment;
-		}
-		return true;
-	}
-
-	static function CastAsInt($floatnum) {
-		// convert to float if not already
-		$floatnum = (float) $floatnum;
-
-		// convert a float to type int, only if possible
-		if (getid3_lib::trunc($floatnum) == $floatnum) {
-			// it's not floating point
-			if (getid3_lib::intValueSupported($floatnum)) {
-				// it's within int range
-				$floatnum = (int) $floatnum;
-			}
-		}
-		return $floatnum;
-	}
-
-	public static function intValueSupported($num) {
-		// check if integers are 64-bit
-		static $hasINT64 = null;
-		if ($hasINT64 === null) { // 10x faster than is_null()
-			$hasINT64 = is_int(pow(2, 31)); // 32-bit int are limited to (2^31)-1
-			if (!$hasINT64 && !defined('PHP_INT_MIN')) {
-				define('PHP_INT_MIN', ~PHP_INT_MAX);
-			}
-		}
-		// if integers are 64-bit - no other check required
-		if ($hasINT64 || (($num <= PHP_INT_MAX) && ($num >= PHP_INT_MIN))) {
-			return true;
-		}
-		return false;
-	}
-
-	static function DecimalizeFraction($fraction) {
-		list($numerator, $denominator) = explode('/', $fraction);
-		return $numerator / ($denominator ? $denominator : 1);
-	}
-
-
-	static function DecimalBinary2Float($binarynumerator) {
-		$numerator   = getid3_lib::Bin2Dec($binarynumerator);
-		$denominator = getid3_lib::Bin2Dec('1'.str_repeat('0', strlen($binarynumerator)));
-		return ($numerator / $denominator);
-	}
-
-
-	static function NormalizeBinaryPoint($binarypointnumber, $maxbits=52) {
-		// http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/binary.html
-		if (strpos($binarypointnumber, '.') === false) {
-			$binarypointnumber = '0.'.$binarypointnumber;
-		} elseif ($binarypointnumber{0} == '.') {
-			$binarypointnumber = '0'.$binarypointnumber;
-		}
-		$exponent = 0;
-		while (($binarypointnumber{0} != '1') || (substr($binarypointnumber, 1, 1) != '.')) {
-			if (substr($binarypointnumber, 1, 1) == '.') {
-				$exponent--;
-				$binarypointnumber = substr($binarypointnumber, 2, 1).'.'.substr($binarypointnumber, 3);
-			} else {
-				$pointpos = strpos($binarypointnumber, '.');
-				$exponent += ($pointpos - 1);
-				$binarypointnumber = str_replace('.', '', $binarypointnumber);
-				$binarypointnumber = $binarypointnumber{0}.'.'.substr($binarypointnumber, 1);
-			}
-		}
-		$binarypointnumber = str_pad(substr($binarypointnumber, 0, $maxbits + 2), $maxbits + 2, '0', STR_PAD_RIGHT);
-		return array('normalized'=>$binarypointnumber, 'exponent'=>(int) $exponent);
-	}
-
-
-	static function Float2BinaryDecimal($floatvalue) {
-		// http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/binary.html
-		$maxbits = 128; // to how many bits of precision should the calculations be taken?
-		$intpart   = getid3_lib::trunc($floatvalue);
-		$floatpart = abs($floatvalue - $intpart);
-		$pointbitstring = '';
-		while (($floatpart != 0) && (strlen($pointbitstring) < $maxbits)) {
-			$floatpart *= 2;
-			$pointbitstring .= (string) getid3_lib::trunc($floatpart);
-			$floatpart -= getid3_lib::trunc($floatpart);
-		}
-		$binarypointnumber = decbin($intpart).'.'.$pointbitstring;
-		return $binarypointnumber;
-	}
-
-
-	static function Float2String($floatvalue, $bits) {
-		// http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee-expl.html
-		switch ($bits) {
-			case 32:
-				$exponentbits = 8;
-				$fractionbits = 23;
-				break;
-
-			case 64:
-				$exponentbits = 11;
-				$fractionbits = 52;
-				break;
-
-			default:
-				return false;
-				break;
-		}
-		if ($floatvalue >= 0) {
-			$signbit = '0';
-		} else {
-			$signbit = '1';
-		}
-		$normalizedbinary  = getid3_lib::NormalizeBinaryPoint(getid3_lib::Float2BinaryDecimal($floatvalue), $fractionbits);
-		$biasedexponent    = pow(2, $exponentbits - 1) - 1 + $normalizedbinary['exponent']; // (127 or 1023) +/- exponent
-		$exponentbitstring = str_pad(decbin($biasedexponent), $exponentbits, '0', STR_PAD_LEFT);
-		$fractionbitstring = str_pad(substr($normalizedbinary['normalized'], 2), $fractionbits, '0', STR_PAD_RIGHT);
-
-		return getid3_lib::BigEndian2String(getid3_lib::Bin2Dec($signbit.$exponentbitstring.$fractionbitstring), $bits % 8, false);
-	}
-
-
-	static function LittleEndian2Float($byteword) {
-		return getid3_lib::BigEndian2Float(strrev($byteword));
-	}
-
-
-	static function BigEndian2Float($byteword) {
-		// ANSI/IEEE Standard 754-1985, Standard for Binary Floating Point Arithmetic
-		// http://www.psc.edu/general/software/packages/ieee/ieee.html
-		// http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee.html
-
-		$bitword = getid3_lib::BigEndian2Bin($byteword);
-		if (!$bitword) {
-			return 0;
-		}
-		$signbit = $bitword{0};
-
-		switch (strlen($byteword) * 8) {
-			case 32:
-				$exponentbits = 8;
-				$fractionbits = 23;
-				break;
-
-			case 64:
-				$exponentbits = 11;
-				$fractionbits = 52;
-				break;
-
-			case 80:
-				// 80-bit Apple SANE format
-				// http://www.mactech.com/articles/mactech/Vol.06/06.01/SANENormalized/
-				$exponentstring = substr($bitword, 1, 15);
-				$isnormalized = intval($bitword{16});
-				$fractionstring = substr($bitword, 17, 63);
-				$exponent = pow(2, getid3_lib::Bin2Dec($exponentstring) - 16383);
-				$fraction = $isnormalized + getid3_lib::DecimalBinary2Float($fractionstring);
-				$floatvalue = $exponent * $fraction;
-				if ($signbit == '1') {
-					$floatvalue *= -1;
-				}
-				return $floatvalue;
-				break;
-
-			default:
-				return false;
-				break;
-		}
-		$exponentstring = substr($bitword, 1, $exponentbits);
-		$fractionstring = substr($bitword, $exponentbits + 1, $fractionbits);
-		$exponent = getid3_lib::Bin2Dec($exponentstring);
-		$fraction = getid3_lib::Bin2Dec($fractionstring);
-
-		if (($exponent == (pow(2, $exponentbits) - 1)) && ($fraction != 0)) {
-			// Not a Number
-			$floatvalue = false;
-		} elseif (($exponent == (pow(2, $exponentbits) - 1)) && ($fraction == 0)) {
-			if ($signbit == '1') {
-				$floatvalue = '-infinity';
-			} else {
-				$floatvalue = '+infinity';
-			}
-		} elseif (($exponent == 0) && ($fraction == 0)) {
-			if ($signbit == '1') {
-				$floatvalue = -0;
-			} else {
-				$floatvalue = 0;
-			}
-			$floatvalue = ($signbit ? 0 : -0);
-		} elseif (($exponent == 0) && ($fraction != 0)) {
-			// These are 'unnormalized' values
-			$floatvalue = pow(2, (-1 * (pow(2, $exponentbits - 1) - 2))) * getid3_lib::DecimalBinary2Float($fractionstring);
-			if ($signbit == '1') {
-				$floatvalue *= -1;
-			}
-		} elseif ($exponent != 0) {
-			$floatvalue = pow(2, ($exponent - (pow(2, $exponentbits - 1) - 1))) * (1 + getid3_lib::DecimalBinary2Float($fractionstring));
-			if ($signbit == '1') {
-				$floatvalue *= -1;
-			}
-		}
-		return (float) $floatvalue;
-	}
-
-
-	static function BigEndian2Int($byteword, $synchsafe=false, $signed=false) {
-		$intvalue = 0;
-		$bytewordlen = strlen($byteword);
-		if ($bytewordlen == 0) {
-			return false;
-		}
-		for ($i = 0; $i < $bytewordlen; $i++) {
-			if ($synchsafe) { // disregard MSB, effectively 7-bit bytes
-				//$intvalue = $intvalue | (ord($byteword{$i}) & 0x7F) << (($bytewordlen - 1 - $i) * 7); // faster, but runs into problems past 2^31 on 32-bit systems
-				$intvalue += (ord($byteword{$i}) & 0x7F) * pow(2, ($bytewordlen - 1 - $i) * 7);
-			} else {
-				$intvalue += ord($byteword{$i}) * pow(256, ($bytewordlen - 1 - $i));
-			}
-		}
-		if ($signed && !$synchsafe) {
-			// synchsafe ints are not allowed to be signed
-			if ($bytewordlen <= PHP_INT_SIZE) {
-				$signMaskBit = 0x80 << (8 * ($bytewordlen - 1));
-				if ($intvalue & $signMaskBit) {
-					$intvalue = 0 - ($intvalue & ($signMaskBit - 1));
-				}
-			} else {
-				throw new Exception('ERROR: Cannot have signed integers larger than '.(8 * PHP_INT_SIZE).'-bits ('.strlen($byteword).') in getid3_lib::BigEndian2Int()');
-			}
-		}
-		return getid3_lib::CastAsInt($intvalue);
-	}
-
-
-	static function LittleEndian2Int($byteword, $signed=false) {
-		return getid3_lib::BigEndian2Int(strrev($byteword), false, $signed);
-	}
-
-
-	static function BigEndian2Bin($byteword) {
-		$binvalue = '';
-		$bytewordlen = strlen($byteword);
-		for ($i = 0; $i < $bytewordlen; $i++) {
-			$binvalue .= str_pad(decbin(ord($byteword{$i})), 8, '0', STR_PAD_LEFT);
-		}
-		return $binvalue;
-	}
-
-
-	static function BigEndian2String($number, $minbytes=1, $synchsafe=false, $signed=false) {
-		if ($number < 0) {
-			throw new Exception('ERROR: getid3_lib::BigEndian2String() does not support negative numbers');
-		}
-		$maskbyte = (($synchsafe || $signed) ? 0x7F : 0xFF);
-		$intstring = '';
-		if ($signed) {
-			if ($minbytes > PHP_INT_SIZE) {
-				throw new Exception('ERROR: Cannot have signed integers larger than '.(8 * PHP_INT_SIZE).'-bits in getid3_lib::BigEndian2String()');
-			}
-			$number = $number & (0x80 << (8 * ($minbytes - 1)));
-		}
-		while ($number != 0) {
-			$quotient = ($number / ($maskbyte + 1));
-			$intstring = chr(ceil(($quotient - floor($quotient)) * $maskbyte)).$intstring;
-			$number = floor($quotient);
-		}
-		return str_pad($intstring, $minbytes, "\x00", STR_PAD_LEFT);
-	}
-
-
-	static function Dec2Bin($number) {
-		while ($number >= 256) {
-			$bytes[] = (($number / 256) - (floor($number / 256))) * 256;
-			$number = floor($number / 256);
-		}
-		$bytes[] = $number;
-		$binstring = '';
-		for ($i = 0; $i < count($bytes); $i++) {
-			$binstring = (($i == count($bytes) - 1) ? decbin($bytes[$i]) : str_pad(decbin($bytes[$i]), 8, '0', STR_PAD_LEFT)).$binstring;
-		}
-		return $binstring;
-	}
-
-
-	static function Bin2Dec($binstring, $signed=false) {
-		$signmult = 1;
-		if ($signed) {
-			if ($binstring{0} == '1') {
-				$signmult = -1;
-			}
-			$binstring = substr($binstring, 1);
-		}
-		$decvalue = 0;
-		for ($i = 0; $i < strlen($binstring); $i++) {
-			$decvalue += ((int) substr($binstring, strlen($binstring) - $i - 1, 1)) * pow(2, $i);
-		}
-		return getid3_lib::CastAsInt($decvalue * $signmult);
-	}
-
-
-	static function Bin2String($binstring) {
-		// return 'hi' for input of '0110100001101001'
-		$string = '';
-		$binstringreversed = strrev($binstring);
-		for ($i = 0; $i < strlen($binstringreversed); $i += 8) {
-			$string = chr(getid3_lib::Bin2Dec(strrev(substr($binstringreversed, $i, 8)))).$string;
-		}
-		return $string;
-	}
-
-
-	static function LittleEndian2String($number, $minbytes=1, $synchsafe=false) {
-		$intstring = '';
-		while ($number > 0) {
-			if ($synchsafe) {
-				$intstring = $intstring.chr($number & 127);
-				$number >>= 7;
-			} else {
-				$intstring = $intstring.chr($number & 255);
-				$number >>= 8;
-			}
-		}
-		return str_pad($intstring, $minbytes, "\x00", STR_PAD_RIGHT);
-	}
-
-
-	static function array_merge_clobber($array1, $array2) {
-		// written by kc�hireability*com
-		// taken from http://www.php.net/manual/en/function.array-merge-recursive.php
-		if (!is_array($array1) || !is_array($array2)) {
-			return false;
-		}
-		$newarray = $array1;
-		foreach ($array2 as $key => $val) {
-			if (is_array($val) && isset($newarray[$key]) && is_array($newarray[$key])) {
-				$newarray[$key] = getid3_lib::array_merge_clobber($newarray[$key], $val);
-			} else {
-				$newarray[$key] = $val;
-			}
-		}
-		return $newarray;
-	}
-
-
-	static function array_merge_noclobber($array1, $array2) {
-		if (!is_array($array1) || !is_array($array2)) {
-			return false;
-		}
-		$newarray = $array1;
-		foreach ($array2 as $key => $val) {
-			if (is_array($val) && isset($newarray[$key]) && is_array($newarray[$key])) {
-				$newarray[$key] = getid3_lib::array_merge_noclobber($newarray[$key], $val);
-			} elseif (!isset($newarray[$key])) {
-				$newarray[$key] = $val;
-			}
-		}
-		return $newarray;
-	}
-
-
-	static function ksort_recursive(&$theArray) {
-		ksort($theArray);
-		foreach ($theArray as $key => $value) {
-			if (is_array($value)) {
-				self::ksort_recursive($theArray[$key]);
-			}
-		}
-		return true;
-	}
-
-	static function fileextension($filename, $numextensions=1) {
-		if (strstr($filename, '.')) {
-			$reversedfilename = strrev($filename);
-			$offset = 0;
-			for ($i = 0; $i < $numextensions; $i++) {
-				$offset = strpos($reversedfilename, '.', $offset + 1);
-				if ($offset === false) {
-					return '';
-				}
-			}
-			return strrev(substr($reversedfilename, 0, $offset));
-		}
-		return '';
-	}
-
-
-	static function PlaytimeString($seconds) {
-		$sign = (($seconds < 0) ? '-' : '');
-		$seconds = abs($seconds);
-		$H = floor( $seconds                            / 3600);
-		$M = floor(($seconds - (3600 * $H)            ) /   60);
-		$S = round( $seconds - (3600 * $H) - (60 * $M)        );
-		return $sign.($H ? $H.':' : '').($H ? str_pad($M, 2, '0', STR_PAD_LEFT) : intval($M)).':'.str_pad($S, 2, 0, STR_PAD_LEFT);
-	}
-
-
-	static function DateMac2Unix($macdate) {
-		// Macintosh timestamp: seconds since 00:00h January 1, 1904
-		// UNIX timestamp:      seconds since 00:00h January 1, 1970
-		return getid3_lib::CastAsInt($macdate - 2082844800);
-	}
-
-
-	static function FixedPoint8_8($rawdata) {
-		return getid3_lib::BigEndian2Int(substr($rawdata, 0, 1)) + (float) (getid3_lib::BigEndian2Int(substr($rawdata, 1, 1)) / pow(2, 8));
-	}
-
-
-	static function FixedPoint16_16($rawdata) {
-		return getid3_lib::BigEndian2Int(substr($rawdata, 0, 2)) + (float) (getid3_lib::BigEndian2Int(substr($rawdata, 2, 2)) / pow(2, 16));
-	}
-
-
-	static function FixedPoint2_30($rawdata) {
-		$binarystring = getid3_lib::BigEndian2Bin($rawdata);
-		return getid3_lib::Bin2Dec(substr($binarystring, 0, 2)) + (float) (getid3_lib::Bin2Dec(substr($binarystring, 2, 30)) / pow(2, 30));
-	}
-
-
-	static function CreateDeepArray($ArrayPath, $Separator, $Value) {
-		// assigns $Value to a nested array path:
-		//   $foo = getid3_lib::CreateDeepArray('/path/to/my', '/', 'file.txt')
-		// is the same as:
-		//   $foo = array('path'=>array('to'=>'array('my'=>array('file.txt'))));
-		// or
-		//   $foo['path']['to']['my'] = 'file.txt';
-		while ($ArrayPath && ($ArrayPath{0} == $Separator)) {
-			$ArrayPath = substr($ArrayPath, 1);
-		}
-		if (($pos = strpos($ArrayPath, $Separator)) !== false) {
-			$ReturnedArray[substr($ArrayPath, 0, $pos)] = getid3_lib::CreateDeepArray(substr($ArrayPath, $pos + 1), $Separator, $Value);
-		} else {
-			$ReturnedArray[$ArrayPath] = $Value;
-		}
-		return $ReturnedArray;
-	}
-
-	static function array_max($arraydata, $returnkey=false) {
-		$maxvalue = false;
-		$maxkey = false;
-		foreach ($arraydata as $key => $value) {
-			if (!is_array($value)) {
-				if ($value > $maxvalue) {
-					$maxvalue = $value;
-					$maxkey = $key;
-				}
-			}
-		}
-		return ($returnkey ? $maxkey : $maxvalue);
-	}
-
-	static function array_min($arraydata, $returnkey=false) {
-		$minvalue = false;
-		$minkey = false;
-		foreach ($arraydata as $key => $value) {
-			if (!is_array($value)) {
-				if ($value > $minvalue) {
-					$minvalue = $value;
-					$minkey = $key;
-				}
-			}
-		}
-		return ($returnkey ? $minkey : $minvalue);
-	}
-
-	static function XML2array($XMLstring) {
-		if (function_exists('simplexml_load_string')) {
-			if (function_exists('get_object_vars')) {
-				$XMLobject = simplexml_load_string($XMLstring);
-				return self::SimpleXMLelement2array($XMLobject);
-			}
-		}
-		return false;
-	}
-
-	static function SimpleXMLelement2array($XMLobject) {
-		if (!is_object($XMLobject) && !is_array($XMLobject)) {
-			return $XMLobject;
-		}
-		$XMLarray = (is_object($XMLobject) ? get_object_vars($XMLobject) : $XMLobject);
-		foreach ($XMLarray as $key => $value) {
-			$XMLarray[$key] = self::SimpleXMLelement2array($value);
-		}
-		return $XMLarray;
-	}
-
-
-	// Allan Hansen <ah�artemis*dk>
-	// getid3_lib::md5_data() - returns md5sum for a file from startuing position to absolute end position
-	static function hash_data($file, $offset, $end, $algorithm) {
-		static $tempdir = '';
-		if (!getid3_lib::intValueSupported($end)) {
-			return false;
-		}
-		switch ($algorithm) {
-			case 'md5':
-				$hash_function = 'md5_file';
-				$unix_call     = 'md5sum';
-				$windows_call  = 'md5sum.exe';
-				$hash_length   = 32;
-				break;
-
-			case 'sha1':
-				$hash_function = 'sha1_file';
-				$unix_call     = 'sha1sum';
-				$windows_call  = 'sha1sum.exe';
-				$hash_length   = 40;
-				break;
-
-			default:
-				throw new Exception('Invalid algorithm ('.$algorithm.') in getid3_lib::hash_data()');
-				break;
-		}
-		$size = $end - $offset;
-		while (true) {
-			if (GETID3_OS_ISWINDOWS) {
-
-				// It seems that sha1sum.exe for Windows only works on physical files, does not accept piped data
-				// Fall back to create-temp-file method:
-				if ($algorithm == 'sha1') {
-					break;
-				}
-
-				$RequiredFiles = array('cygwin1.dll', 'head.exe', 'tail.exe', $windows_call);
-				foreach ($RequiredFiles as $required_file) {
-					if (!is_readable(GETID3_HELPERAPPSDIR.$required_file)) {
-						// helper apps not available - fall back to old method
-						break;
-					}
-				}
-				$commandline  = GETID3_HELPERAPPSDIR.'head.exe -c '.$end.' "'.escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $file)).'" | ';
-				$commandline .= GETID3_HELPERAPPSDIR.'tail.exe -c '.$size.' | ';
-				$commandline .= GETID3_HELPERAPPSDIR.$windows_call;
-
-			} else {
-
-				$commandline  = 'head -c'.$end.' '.escapeshellarg($file).' | ';
-				$commandline .= 'tail -c'.$size.' | ';
-				$commandline .= $unix_call;
-
-			}
-			if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
-				//throw new Exception('PHP running in Safe Mode - backtick operator not available, using slower non-system-call '.$algorithm.' algorithm');
-				break;
-			}
-			return substr(`$commandline`, 0, $hash_length);
-		}
-
-		if (empty($tempdir)) {
-			// yes this is ugly, feel free to suggest a better way
-			require_once(dirname(__FILE__).'/getid3.php');
-			$getid3_temp = new getID3();
-			$tempdir = $getid3_temp->tempdir;
-			unset($getid3_temp);
-		}
-		// try to create a temporary file in the system temp directory - invalid dirname should force to system temp dir
-		if (($data_filename = tempnam($tempdir, 'gI3')) === false) {
-			// can't find anywhere to create a temp file, just fail
-			return false;
-		}
-
-		// Init
-		$result = false;
-
-		// copy parts of file
-		try {
-			getid3_lib::CopyFileParts($file, $data_filename, $offset, $end - $offset);
-			$result = $hash_function($data_filename);
-		} catch (Exception $e) {
-			throw new Exception('getid3_lib::CopyFileParts() failed in getid_lib::hash_data(): '.$e->getMessage());
-		}
-		unlink($data_filename);
-		return $result;
-	}
-
-	static function CopyFileParts($filename_source, $filename_dest, $offset, $length) {
-		if (!getid3_lib::intValueSupported($offset + $length)) {
-			throw new Exception('cannot copy file portion, it extends beyond the '.round(PHP_INT_MAX / 1073741824).'GB limit');
-		}
-		if (is_readable($filename_source) && is_file($filename_source) && ($fp_src = fopen($filename_source, 'rb'))) {
-			if (($fp_dest = fopen($filename_dest, 'wb'))) {
-				if (fseek($fp_src, $offset, SEEK_SET) == 0) {
-					$byteslefttowrite = $length;
-					while (($byteslefttowrite > 0) && ($buffer = fread($fp_src, min($byteslefttowrite, getID3::FREAD_BUFFER_SIZE)))) {
-						$byteswritten = fwrite($fp_dest, $buffer, $byteslefttowrite);
-						$byteslefttowrite -= $byteswritten;
-					}
-					return true;
-				} else {
-					throw new Exception('failed to seek to offset '.$offset.' in '.$filename_source);
-				}
-				fclose($fp_dest);
-			} else {
-				throw new Exception('failed to create file for writing '.$filename_dest);
-			}
-			fclose($fp_src);
-		} else {
-			throw new Exception('failed to open file for reading '.$filename_source);
-		}
-		return false;
-	}
-
-	static function iconv_fallback_int_utf8($charval) {
-		if ($charval < 128) {
-			// 0bbbbbbb
-			$newcharstring = chr($charval);
-		} elseif ($charval < 2048) {
-			// 110bbbbb 10bbbbbb
-			$newcharstring  = chr(($charval >>   6) | 0xC0);
-			$newcharstring .= chr(($charval & 0x3F) | 0x80);
-		} elseif ($charval < 65536) {
-			// 1110bbbb 10bbbbbb 10bbbbbb
-			$newcharstring  = chr(($charval >>  12) | 0xE0);
-			$newcharstring .= chr(($charval >>   6) | 0xC0);
-			$newcharstring .= chr(($charval & 0x3F) | 0x80);
-		} else {
-			// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
-			$newcharstring  = chr(($charval >>  18) | 0xF0);
-			$newcharstring .= chr(($charval >>  12) | 0xC0);
-			$newcharstring .= chr(($charval >>   6) | 0xC0);
-			$newcharstring .= chr(($charval & 0x3F) | 0x80);
-		}
-		return $newcharstring;
-	}
-
-	// ISO-8859-1 => UTF-8
-	static function iconv_fallback_iso88591_utf8($string, $bom=false) {
-		if (function_exists('utf8_encode')) {
-			return utf8_encode($string);
-		}
-		// utf8_encode() unavailable, use getID3()'s iconv_fallback() conversions (possibly PHP is compiled without XML support)
-		$newcharstring = '';
-		if ($bom) {
-			$newcharstring .= "\xEF\xBB\xBF";
-		}
-		for ($i = 0; $i < strlen($string); $i++) {
-			$charval = ord($string{$i});
-			$newcharstring .= getid3_lib::iconv_fallback_int_utf8($charval);
-		}
-		return $newcharstring;
-	}
-
-	// ISO-8859-1 => UTF-16BE
-	static function iconv_fallback_iso88591_utf16be($string, $bom=false) {
-		$newcharstring = '';
-		if ($bom) {
-			$newcharstring .= "\xFE\xFF";
-		}
-		for ($i = 0; $i < strlen($string); $i++) {
-			$newcharstring .= "\x00".$string{$i};
-		}
-		return $newcharstring;
-	}
-
-	// ISO-8859-1 => UTF-16LE
-	static function iconv_fallback_iso88591_utf16le($string, $bom=false) {
-		$newcharstring = '';
-		if ($bom) {
-			$newcharstring .= "\xFF\xFE";
-		}
-		for ($i = 0; $i < strlen($string); $i++) {
-			$newcharstring .= $string{$i}."\x00";
-		}
-		return $newcharstring;
-	}
-
-	// ISO-8859-1 => UTF-16LE (BOM)
-	static function iconv_fallback_iso88591_utf16($string) {
-		return getid3_lib::iconv_fallback_iso88591_utf16le($string, true);
-	}
-
-	// UTF-8 => ISO-8859-1
-	static function iconv_fallback_utf8_iso88591($string) {
-		if (function_exists('utf8_decode')) {
-			return utf8_decode($string);
-		}
-		// utf8_decode() unavailable, use getID3()'s iconv_fallback() conversions (possibly PHP is compiled without XML support)
-		$newcharstring = '';
-		$offset = 0;
-		$stringlength = strlen($string);
-		while ($offset < $stringlength) {
-			if ((ord($string{$offset}) | 0x07) == 0xF7) {
-				// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
-						   ((ord($string{($offset + 1)}) & 0x3F) << 12) &
-						   ((ord($string{($offset + 2)}) & 0x3F) <<  6) &
-							(ord($string{($offset + 3)}) & 0x3F);
-				$offset += 4;
-			} elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
-				// 1110bbbb 10bbbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
-						   ((ord($string{($offset + 1)}) & 0x3F) <<  6) &
-							(ord($string{($offset + 2)}) & 0x3F);
-				$offset += 3;
-			} elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
-				// 110bbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x1F) <<  6) &
-							(ord($string{($offset + 1)}) & 0x3F);
-				$offset += 2;
-			} elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
-				// 0bbbbbbb
-				$charval = ord($string{$offset});
-				$offset += 1;
-			} else {
-				// error? throw some kind of warning here?
-				$charval = false;
-				$offset += 1;
-			}
-			if ($charval !== false) {
-				$newcharstring .= (($charval < 256) ? chr($charval) : '?');
-			}
-		}
-		return $newcharstring;
-	}
-
-	// UTF-8 => UTF-16BE
-	static function iconv_fallback_utf8_utf16be($string, $bom=false) {
-		$newcharstring = '';
-		if ($bom) {
-			$newcharstring .= "\xFE\xFF";
-		}
-		$offset = 0;
-		$stringlength = strlen($string);
-		while ($offset < $stringlength) {
-			if ((ord($string{$offset}) | 0x07) == 0xF7) {
-				// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
-						   ((ord($string{($offset + 1)}) & 0x3F) << 12) &
-						   ((ord($string{($offset + 2)}) & 0x3F) <<  6) &
-							(ord($string{($offset + 3)}) & 0x3F);
-				$offset += 4;
-			} elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
-				// 1110bbbb 10bbbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
-						   ((ord($string{($offset + 1)}) & 0x3F) <<  6) &
-							(ord($string{($offset + 2)}) & 0x3F);
-				$offset += 3;
-			} elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
-				// 110bbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x1F) <<  6) &
-							(ord($string{($offset + 1)}) & 0x3F);
-				$offset += 2;
-			} elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
-				// 0bbbbbbb
-				$charval = ord($string{$offset});
-				$offset += 1;
-			} else {
-				// error? throw some kind of warning here?
-				$charval = false;
-				$offset += 1;
-			}
-			if ($charval !== false) {
-				$newcharstring .= (($charval < 65536) ? getid3_lib::BigEndian2String($charval, 2) : "\x00".'?');
-			}
-		}
-		return $newcharstring;
-	}
-
-	// UTF-8 => UTF-16LE
-	static function iconv_fallback_utf8_utf16le($string, $bom=false) {
-		$newcharstring = '';
-		if ($bom) {
-			$newcharstring .= "\xFF\xFE";
-		}
-		$offset = 0;
-		$stringlength = strlen($string);
-		while ($offset < $stringlength) {
-			if ((ord($string{$offset}) | 0x07) == 0xF7) {
-				// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
-						   ((ord($string{($offset + 1)}) & 0x3F) << 12) &
-						   ((ord($string{($offset + 2)}) & 0x3F) <<  6) &
-							(ord($string{($offset + 3)}) & 0x3F);
-				$offset += 4;
-			} elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
-				// 1110bbbb 10bbbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
-						   ((ord($string{($offset + 1)}) & 0x3F) <<  6) &
-							(ord($string{($offset + 2)}) & 0x3F);
-				$offset += 3;
-			} elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
-				// 110bbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x1F) <<  6) &
-							(ord($string{($offset + 1)}) & 0x3F);
-				$offset += 2;
-			} elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
-				// 0bbbbbbb
-				$charval = ord($string{$offset});
-				$offset += 1;
-			} else {
-				// error? maybe throw some warning here?
-				$charval = false;
-				$offset += 1;
-			}
-			if ($charval !== false) {
-				$newcharstring .= (($charval < 65536) ? getid3_lib::LittleEndian2String($charval, 2) : '?'."\x00");
-			}
-		}
-		return $newcharstring;
-	}
-
-	// UTF-8 => UTF-16LE (BOM)
-	static function iconv_fallback_utf8_utf16($string) {
-		return getid3_lib::iconv_fallback_utf8_utf16le($string, true);
-	}
-
-	// UTF-16BE => UTF-8
-	static function iconv_fallback_utf16be_utf8($string) {
-		if (substr($string, 0, 2) == "\xFE\xFF") {
-			// strip BOM
-			$string = substr($string, 2);
-		}
-		$newcharstring = '';
-		for ($i = 0; $i < strlen($string); $i += 2) {
-			$charval = getid3_lib::BigEndian2Int(substr($string, $i, 2));
-			$newcharstring .= getid3_lib::iconv_fallback_int_utf8($charval);
-		}
-		return $newcharstring;
-	}
-
-	// UTF-16LE => UTF-8
-	static function iconv_fallback_utf16le_utf8($string) {
-		if (substr($string, 0, 2) == "\xFF\xFE") {
-			// strip BOM
-			$string = substr($string, 2);
-		}
-		$newcharstring = '';
-		for ($i = 0; $i < strlen($string); $i += 2) {
-			$charval = getid3_lib::LittleEndian2Int(substr($string, $i, 2));
-			$newcharstring .= getid3_lib::iconv_fallback_int_utf8($charval);
-		}
-		return $newcharstring;
-	}
-
-	// UTF-16BE => ISO-8859-1
-	static function iconv_fallback_utf16be_iso88591($string) {
-		if (substr($string, 0, 2) == "\xFE\xFF") {
-			// strip BOM
-			$string = substr($string, 2);
-		}
-		$newcharstring = '';
-		for ($i = 0; $i < strlen($string); $i += 2) {
-			$charval = getid3_lib::BigEndian2Int(substr($string, $i, 2));
-			$newcharstring .= (($charval < 256) ? chr($charval) : '?');
-		}
-		return $newcharstring;
-	}
-
-	// UTF-16LE => ISO-8859-1
-	static function iconv_fallback_utf16le_iso88591($string) {
-		if (substr($string, 0, 2) == "\xFF\xFE") {
-			// strip BOM
-			$string = substr($string, 2);
-		}
-		$newcharstring = '';
-		for ($i = 0; $i < strlen($string); $i += 2) {
-			$charval = getid3_lib::LittleEndian2Int(substr($string, $i, 2));
-			$newcharstring .= (($charval < 256) ? chr($charval) : '?');
-		}
-		return $newcharstring;
-	}
-
-	// UTF-16 (BOM) => ISO-8859-1
-	static function iconv_fallback_utf16_iso88591($string) {
-		$bom = substr($string, 0, 2);
-		if ($bom == "\xFE\xFF") {
-			return getid3_lib::iconv_fallback_utf16be_iso88591(substr($string, 2));
-		} elseif ($bom == "\xFF\xFE") {
-			return getid3_lib::iconv_fallback_utf16le_iso88591(substr($string, 2));
-		}
-		return $string;
-	}
-
-	// UTF-16 (BOM) => UTF-8
-	static function iconv_fallback_utf16_utf8($string) {
-		$bom = substr($string, 0, 2);
-		if ($bom == "\xFE\xFF") {
-			return getid3_lib::iconv_fallback_utf16be_utf8(substr($string, 2));
-		} elseif ($bom == "\xFF\xFE") {
-			return getid3_lib::iconv_fallback_utf16le_utf8(substr($string, 2));
-		}
-		return $string;
-	}
-
-	static function iconv_fallback($in_charset, $out_charset, $string) {
-
-		if ($in_charset == $out_charset) {
-			return $string;
-		}
-
-		// iconv() availble
-		if (function_exists('iconv')) {
-			if ($converted_string = @iconv($in_charset, $out_charset.'//TRANSLIT', $string)) {
-				switch ($out_charset) {
-					case 'ISO-8859-1':
-						$converted_string = rtrim($converted_string, "\x00");
-						break;
-				}
-				return $converted_string;
-			}
-
-			// iconv() may sometimes fail with "illegal character in input string" error message
-			// and return an empty string, but returning the unconverted string is more useful
-			return $string;
-		}
-
-
-		// iconv() not available
-		static $ConversionFunctionList = array();
-		if (empty($ConversionFunctionList)) {
-			$ConversionFunctionList['ISO-8859-1']['UTF-8']    = 'iconv_fallback_iso88591_utf8';
-			$ConversionFunctionList['ISO-8859-1']['UTF-16']   = 'iconv_fallback_iso88591_utf16';
-			$ConversionFunctionList['ISO-8859-1']['UTF-16BE'] = 'iconv_fallback_iso88591_utf16be';
-			$ConversionFunctionList['ISO-8859-1']['UTF-16LE'] = 'iconv_fallback_iso88591_utf16le';
-			$ConversionFunctionList['UTF-8']['ISO-8859-1']    = 'iconv_fallback_utf8_iso88591';
-			$ConversionFunctionList['UTF-8']['UTF-16']        = 'iconv_fallback_utf8_utf16';
-			$ConversionFunctionList['UTF-8']['UTF-16BE']      = 'iconv_fallback_utf8_utf16be';
-			$ConversionFunctionList['UTF-8']['UTF-16LE']      = 'iconv_fallback_utf8_utf16le';
-			$ConversionFunctionList['UTF-16']['ISO-8859-1']   = 'iconv_fallback_utf16_iso88591';
-			$ConversionFunctionList['UTF-16']['UTF-8']        = 'iconv_fallback_utf16_utf8';
-			$ConversionFunctionList['UTF-16LE']['ISO-8859-1'] = 'iconv_fallback_utf16le_iso88591';
-			$ConversionFunctionList['UTF-16LE']['UTF-8']      = 'iconv_fallback_utf16le_utf8';
-			$ConversionFunctionList['UTF-16BE']['ISO-8859-1'] = 'iconv_fallback_utf16be_iso88591';
-			$ConversionFunctionList['UTF-16BE']['UTF-8']      = 'iconv_fallback_utf16be_utf8';
-		}
-		if (isset($ConversionFunctionList[strtoupper($in_charset)][strtoupper($out_charset)])) {
-			$ConversionFunction = $ConversionFunctionList[strtoupper($in_charset)][strtoupper($out_charset)];
-			return getid3_lib::$ConversionFunction($string);
-		}
-		throw new Exception('PHP does not have iconv() support - cannot convert from '.$in_charset.' to '.$out_charset);
-	}
-
-
-	static function MultiByteCharString2HTML($string, $charset='ISO-8859-1') {
-		$string = (string) $string; // in case trying to pass a numeric (float, int) string, would otherwise return an empty string
-		$HTMLstring = '';
-
-		switch ($charset) {
-			case '1251':
-			case '1252':
-			case '866':
-			case '932':
-			case '936':
-			case '950':
-			case 'BIG5':
-			case 'BIG5-HKSCS':
-			case 'cp1251':
-			case 'cp1252':
-			case 'cp866':
-			case 'EUC-JP':
-			case 'EUCJP':
-			case 'GB2312':
-			case 'ibm866':
-			case 'ISO-8859-1':
-			case 'ISO-8859-15':
-			case 'ISO8859-1':
-			case 'ISO8859-15':
-			case 'KOI8-R':
-			case 'koi8-ru':
-			case 'koi8r':
-			case 'Shift_JIS':
-			case 'SJIS':
-			case 'win-1251':
-			case 'Windows-1251':
-			case 'Windows-1252':
-				$HTMLstring = htmlentities($string, ENT_COMPAT, $charset);
-				break;
-
-			case 'UTF-8':
-				$strlen = strlen($string);
-				for ($i = 0; $i < $strlen; $i++) {
-					$char_ord_val = ord($string{$i});
-					$charval = 0;
-					if ($char_ord_val < 0x80) {
-						$charval = $char_ord_val;
-					} elseif ((($char_ord_val & 0xF0) >> 4) == 0x0F  &&  $i+3 < $strlen) {
-						$charval  = (($char_ord_val & 0x07) << 18);
-						$charval += ((ord($string{++$i}) & 0x3F) << 12);
-						$charval += ((ord($string{++$i}) & 0x3F) << 6);
-						$charval +=  (ord($string{++$i}) & 0x3F);
-					} elseif ((($char_ord_val & 0xE0) >> 5) == 0x07  &&  $i+2 < $strlen) {
-						$charval  = (($char_ord_val & 0x0F) << 12);
-						$charval += ((ord($string{++$i}) & 0x3F) << 6);
-						$charval +=  (ord($string{++$i}) & 0x3F);
-					} elseif ((($char_ord_val & 0xC0) >> 6) == 0x03  &&  $i+1 < $strlen) {
-						$charval  = (($char_ord_val & 0x1F) << 6);
-						$charval += (ord($string{++$i}) & 0x3F);
-					}
-					if (($charval >= 32) && ($charval <= 127)) {
-						$HTMLstring .= htmlentities(chr($charval));
-					} else {
-						$HTMLstring .= '&#'.$charval.';';
-					}
-				}
-				break;
-
-			case 'UTF-16LE':
-				for ($i = 0; $i < strlen($string); $i += 2) {
-					$charval = getid3_lib::LittleEndian2Int(substr($string, $i, 2));
-					if (($charval >= 32) && ($charval <= 127)) {
-						$HTMLstring .= chr($charval);
-					} else {
-						$HTMLstring .= '&#'.$charval.';';
-					}
-				}
-				break;
-
-			case 'UTF-16BE':
-				for ($i = 0; $i < strlen($string); $i += 2) {
-					$charval = getid3_lib::BigEndian2Int(substr($string, $i, 2));
-					if (($charval >= 32) && ($charval <= 127)) {
-						$HTMLstring .= chr($charval);
-					} else {
-						$HTMLstring .= '&#'.$charval.';';
-					}
-				}
-				break;
-
-			default:
-				$HTMLstring = 'ERROR: Character set "'.$charset.'" not supported in MultiByteCharString2HTML()';
-				break;
-		}
-		return $HTMLstring;
-	}
-
-
-
-	static function RGADnameLookup($namecode) {
-		static $RGADname = array();
-		if (empty($RGADname)) {
-			$RGADname[0] = 'not set';
-			$RGADname[1] = 'Track Gain Adjustment';
-			$RGADname[2] = 'Album Gain Adjustment';
-		}
-
-		return (isset($RGADname[$namecode]) ? $RGADname[$namecode] : '');
-	}
-
-
-	static function RGADoriginatorLookup($originatorcode) {
-		static $RGADoriginator = array();
-		if (empty($RGADoriginator)) {
-			$RGADoriginator[0] = 'unspecified';
-			$RGADoriginator[1] = 'pre-set by artist/producer/mastering engineer';
-			$RGADoriginator[2] = 'set by user';
-			$RGADoriginator[3] = 'determined automatically';
-		}
-
-		return (isset($RGADoriginator[$originatorcode]) ? $RGADoriginator[$originatorcode] : '');
-	}
-
-
-	static function RGADadjustmentLookup($rawadjustment, $signbit) {
-		$adjustment = $rawadjustment / 10;
-		if ($signbit == 1) {
-			$adjustment *= -1;
-		}
-		return (float) $adjustment;
-	}
-
-
-	static function RGADgainString($namecode, $originatorcode, $replaygain) {
-		if ($replaygain < 0) {
-			$signbit = '1';
-		} else {
-			$signbit = '0';
-		}
-		$storedreplaygain = intval(round($replaygain * 10));
-		$gainstring  = str_pad(decbin($namecode), 3, '0', STR_PAD_LEFT);
-		$gainstring .= str_pad(decbin($originatorcode), 3, '0', STR_PAD_LEFT);
-		$gainstring .= $signbit;
-		$gainstring .= str_pad(decbin($storedreplaygain), 9, '0', STR_PAD_LEFT);
-
-		return $gainstring;
-	}
-
-	static function RGADamplitude2dB($amplitude) {
-		return 20 * log10($amplitude);
-	}
-
-
-	static function GetDataImageSize($imgData, &$imageinfo) {
-		static $tempdir = '';
-		if (empty($tempdir)) {
-			// yes this is ugly, feel free to suggest a better way
-			require_once(dirname(__FILE__).'/getid3.php');
-			$getid3_temp = new getID3();
-			$tempdir = $getid3_temp->tempdir;
-			unset($getid3_temp);
-		}
-		$GetDataImageSize = false;
-		if ($tempfilename = tempnam($tempdir, 'gI3')) {
-			if (is_writable($tempfilename) && is_file($tempfilename) && ($tmp = fopen($tempfilename, 'wb'))) {
-				fwrite($tmp, $imgData);
-				fclose($tmp);
-				$GetDataImageSize = @GetImageSize($tempfilename, $imageinfo);
-			}
-			unlink($tempfilename);
-		}
-		return $GetDataImageSize;
-	}
-
-	static function ImageTypesLookup($imagetypeid) {
-		static $ImageTypesLookup = array();
-		if (empty($ImageTypesLookup)) {
-			$ImageTypesLookup[1]  = 'gif';
-			$ImageTypesLookup[2]  = 'jpeg';
-			$ImageTypesLookup[3]  = 'png';
-			$ImageTypesLookup[4]  = 'swf';
-			$ImageTypesLookup[5]  = 'psd';
-			$ImageTypesLookup[6]  = 'bmp';
-			$ImageTypesLookup[7]  = 'tiff (little-endian)';
-			$ImageTypesLookup[8]  = 'tiff (big-endian)';
-			$ImageTypesLookup[9]  = 'jpc';
-			$ImageTypesLookup[10] = 'jp2';
-			$ImageTypesLookup[11] = 'jpx';
-			$ImageTypesLookup[12] = 'jb2';
-			$ImageTypesLookup[13] = 'swc';
-			$ImageTypesLookup[14] = 'iff';
-		}
-		return (isset($ImageTypesLookup[$imagetypeid]) ? $ImageTypesLookup[$imagetypeid] : '');
-	}
-
-	static function CopyTagsToComments(&$ThisFileInfo) {
-
-		// Copy all entries from ['tags'] into common ['comments']
-		if (!empty($ThisFileInfo['tags'])) {
-			foreach ($ThisFileInfo['tags'] as $tagtype => $tagarray) {
-				foreach ($tagarray as $tagname => $tagdata) {
-					foreach ($tagdata as $key => $value) {
-						if (!empty($value)) {
-							if (empty($ThisFileInfo['comments'][$tagname])) {
-
-								// fall through and append value
-
-							} elseif ($tagtype == 'id3v1') {
-
-								$newvaluelength = strlen(trim($value));
-								foreach ($ThisFileInfo['comments'][$tagname] as $existingkey => $existingvalue) {
-									$oldvaluelength = strlen(trim($existingvalue));
-									if (($newvaluelength <= $oldvaluelength) && (substr($existingvalue, 0, $newvaluelength) == trim($value))) {
-										// new value is identical but shorter-than (or equal-length to) one already in comments - skip
-										break 2;
-									}
-								}
-
-							} elseif (!is_array($value)) {
-
-								$newvaluelength = strlen(trim($value));
-								foreach ($ThisFileInfo['comments'][$tagname] as $existingkey => $existingvalue) {
-									$oldvaluelength = strlen(trim($existingvalue));
-									if (($newvaluelength > $oldvaluelength) && (substr(trim($value), 0, strlen($existingvalue)) == $existingvalue)) {
-										$ThisFileInfo['comments'][$tagname][$existingkey] = trim($value);
-										break 2;
-									}
-								}
-
-							}
-							if (is_array($value) || empty($ThisFileInfo['comments'][$tagname]) || !in_array(trim($value), $ThisFileInfo['comments'][$tagname])) {
-								$value = (is_string($value) ? trim($value) : $value);
-								$ThisFileInfo['comments'][$tagname][] = $value;
-							}
-						}
-					}
-				}
-			}
-
-			// Copy to ['comments_html']
-			foreach ($ThisFileInfo['comments'] as $field => $values) {
-				if ($field == 'picture') {
-					// pictures can take up a lot of space, and we don't need multiple copies of them
-					// let there be a single copy in [comments][picture], and not elsewhere
-					continue;
-				}
-				foreach ($values as $index => $value) {
-					if (is_array($value)) {
-						$ThisFileInfo['comments_html'][$field][$index] = $value;
-					} else {
-						$ThisFileInfo['comments_html'][$field][$index] = str_replace('&#0;', '', getid3_lib::MultiByteCharString2HTML($value, $ThisFileInfo['encoding']));
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-
-	static function EmbeddedLookup($key, $begin, $end, $file, $name) {
-
-		// Cached
-		static $cache;
-		if (isset($cache[$file][$name])) {
-			return (isset($cache[$file][$name][$key]) ? $cache[$file][$name][$key] : '');
-		}
-
-		// Init
-		$keylength  = strlen($key);
-		$line_count = $end - $begin - 7;
-
-		// Open php file
-		$fp = fopen($file, 'r');
-
-		// Discard $begin lines
-		for ($i = 0; $i < ($begin + 3); $i++) {
-			fgets($fp, 1024);
-		}
-
-		// Loop thru line
-		while (0 < $line_count--) {
-
-			// Read line
-			$line = ltrim(fgets($fp, 1024), "\t ");
-
-			// METHOD A: only cache the matching key - less memory but slower on next lookup of not-previously-looked-up key
-			//$keycheck = substr($line, 0, $keylength);
-			//if ($key == $keycheck)  {
-			//	$cache[$file][$name][$keycheck] = substr($line, $keylength + 1);
-			//	break;
-			//}
-
-			// METHOD B: cache all keys in this lookup - more memory but faster on next lookup of not-previously-looked-up key
-			//$cache[$file][$name][substr($line, 0, $keylength)] = trim(substr($line, $keylength + 1));
-			$explodedLine = explode("\t", $line, 2);
-			$ThisKey   = (isset($explodedLine[0]) ? $explodedLine[0] : '');
-			$ThisValue = (isset($explodedLine[1]) ? $explodedLine[1] : '');
-			$cache[$file][$name][$ThisKey] = trim($ThisValue);
-		}
-
-		// Close and return
-		fclose($fp);
-		return (isset($cache[$file][$name][$key]) ? $cache[$file][$name][$key] : '');
-	}
-
-	static function IncludeDependency($filename, $sourcefile, $DieOnFailure=false) {
-		global $GETID3_ERRORARRAY;
-
-		if (file_exists($filename)) {
-			if (include_once($filename)) {
-				return true;
-			} else {
-				$diemessage = basename($sourcefile).' depends on '.$filename.', which has errors';
-			}
-		} else {
-			$diemessage = basename($sourcefile).' depends on '.$filename.', which is missing';
-		}
-		if ($DieOnFailure) {
-			throw new Exception($diemessage);
-		} else {
-			$GETID3_ERRORARRAY[] = $diemessage;
-		}
-		return false;
-	}
-
-	public static function trimNullByte($string) {
-		return trim($string, "\x00");
-	}
-
-}
-
-?>
diff --git a/lib/getid3/getid3/getid3.php b/lib/getid3/getid3/getid3.php
deleted file mode 100644
index ca351bcd8..000000000
--- a/lib/getid3/getid3/getid3.php
+++ /dev/null
@@ -1,1747 +0,0 @@
-<?php
-//Modified from its original version - September 23, 2012
-//$forcemp3 added to analyze to force MP3 detection even if extension isn't .mp3
-
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// Please see readme.txt for more information                  //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-// attempt to define temp dir as something flexible but reliable
-$temp_dir = ini_get('upload_tmp_dir');
-if ($temp_dir && (!is_dir($temp_dir) || !is_readable($temp_dir))) {
-	$temp_dir = '';
-}
-if (!$temp_dir && function_exists('sys_get_temp_dir')) {
-	// PHP v5.2.1+
-	// sys_get_temp_dir() may give inaccessible temp dir, e.g. with open_basedir on virtual hosts
-	$temp_dir = sys_get_temp_dir();
-}
-$temp_dir = realpath($temp_dir);
-$open_basedir = ini_get('open_basedir');
-if ($open_basedir) {
-	// e.g. "/var/www/vhosts/getid3.org/httpdocs/:/tmp/"
-	$temp_dir     = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $temp_dir);
-	$open_basedir = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $open_basedir);
-	if (substr($temp_dir, -1, 1) != DIRECTORY_SEPARATOR) {
-		$temp_dir .= DIRECTORY_SEPARATOR;
-	}
-	$found_valid_tempdir = false;
-	$open_basedirs = explode(':', $open_basedir);
-	foreach ($open_basedirs as $basedir) {
-		if (substr($basedir, -1, 1) != DIRECTORY_SEPARATOR) {
-			$basedir .= DIRECTORY_SEPARATOR;
-		}
-		if (preg_match('#^'.preg_quote($basedir).'#', $temp_dir)) {
-			$found_valid_tempdir = true;
-			break;
-		}
-	}
-	if (!$found_valid_tempdir) {
-		$temp_dir = '';
-	}
-	unset($open_basedirs, $found_valid_tempdir, $basedir);
-}
-if (!$temp_dir) {
-	$temp_dir = '*'; // invalid directory name should force tempnam() to use system default temp dir
-}
-// $temp_dir = '/something/else/';  // feel free to override temp dir here if it works better for your system
-define('GETID3_TEMP_DIR', $temp_dir);
-unset($open_basedir, $temp_dir);
-
-
-// define a constant rather than looking up every time it is needed
-if (!defined('GETID3_OS_ISWINDOWS')) {
-	if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
-		define('GETID3_OS_ISWINDOWS', true);
-	} else {
-		define('GETID3_OS_ISWINDOWS', false);
-	}
-}
-
-// Get base path of getID3() - ONCE
-if (!defined('GETID3_INCLUDEPATH')) {
-	foreach (get_included_files() as $key => $val) {
-		if (basename($val) == 'getid3.php') {
-			define('GETID3_INCLUDEPATH', dirname($val).DIRECTORY_SEPARATOR);
-			break;
-		}
-	}
-}
-
-// End: Defines
-
-
-class getID3
-{
-	// public: Settings
-	public $encoding        = 'UTF-8';        // CASE SENSITIVE! - i.e. (must be supported by iconv()). Examples:  ISO-8859-1  UTF-8  UTF-16  UTF-16BE
-	public $encoding_id3v1  = 'ISO-8859-1';   // Should always be 'ISO-8859-1', but some tags may be written in other encodings such as 'EUC-CN' or 'CP1252'
-
-	// public: Optional tag checks - disable for speed.
-	public $option_tag_id3v1         = true;  // Read and process ID3v1 tags
-	public $option_tag_id3v2         = true;  // Read and process ID3v2 tags
-	public $option_tag_lyrics3       = true;  // Read and process Lyrics3 tags
-	public $option_tag_apetag        = true;  // Read and process APE tags
-	public $option_tags_process      = true;  // Copy tags to root key 'tags' and encode to $this->encoding
-	public $option_tags_html         = true;  // Copy tags to root key 'tags_html' properly translated from various encodings to HTML entities
-
-	// public: Optional tag/comment calucations
-	public $option_extra_info        = true;  // Calculate additional info such as bitrate, channelmode etc
-
-	// public: Optional handling of embedded attachments (e.g. images)
-	public $option_save_attachments  = true; // defaults to true (ATTACHMENTS_INLINE) for backward compatibility
-
-	// public: Optional calculations
-	public $option_md5_data          = false; // Get MD5 sum of data part - slow
-	public $option_md5_data_source   = false; // Use MD5 of source file if availble - only FLAC and OptimFROG
-	public $option_sha1_data         = false; // Get SHA1 sum of data part - slow
-	public $option_max_2gb_check     = null;  // Check whether file is larger than 2GB and thus not supported by 32-bit PHP (null: auto-detect based on PHP_INT_MAX)
-
-	// public: Read buffer size in bytes
-	public $option_fread_buffer_size = 32768;
-
-	// Public variables
-	public $filename;                         // Filename of file being analysed.
-	public $fp;                               // Filepointer to file being analysed.
-	public $info;                             // Result array.
-
-	// Protected variables
-	protected $startup_error   = '';
-	protected $startup_warning = '';
-	protected $memory_limit    = 0;
-
-	const VERSION           = '1.9.3-20111213';
-	const FREAD_BUFFER_SIZE = 32768;
-	var $tempdir            = GETID3_TEMP_DIR;
-
-	const ATTACHMENTS_NONE   = false;
-	const ATTACHMENTS_INLINE = true;
-
-	// public: constructor
-	public function __construct() {
-
-		// Check for PHP version
-		$required_php_version = '5.0.5';
-		if (version_compare(PHP_VERSION, $required_php_version, '<')) {
-			$this->startup_error .= 'getID3() requires PHP v'.$required_php_version.' or higher - you are running v'.PHP_VERSION;
-			return false;
-		}
-
-		// Check memory
-		$this->memory_limit = ini_get('memory_limit');
-		if (preg_match('#([0-9]+)M#i', $this->memory_limit, $matches)) {
-			// could be stored as "16M" rather than 16777216 for example
-			$this->memory_limit = $matches[1] * 1048576;
-		} elseif (preg_match('#([0-9]+)G#i', $this->memory_limit, $matches)) { // The 'G' modifier is available since PHP 5.1.0
-			// could be stored as "2G" rather than 2147483648 for example
-			$this->memory_limit = $matches[1] * 1073741824;
-		}
-		if ($this->memory_limit <= 0) {
-			// memory limits probably disabled
-		} elseif ($this->memory_limit <= 4194304) {
-			$this->startup_error .= 'PHP has less than 4MB available memory and will very likely run out. Increase memory_limit in php.ini';
-		} elseif ($this->memory_limit <= 12582912) {
-			$this->startup_warning .= 'PHP has less than 12MB available memory and might run out if all modules are loaded. Increase memory_limit in php.ini';
-		}
-
-		// Check safe_mode off
-		if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
-			$this->warning('WARNING: Safe mode is on, shorten support disabled, md5data/sha1data for ogg vorbis disabled, ogg vorbos/flac tag writing disabled.');
-		}
-
-		if (intval(ini_get('mbstring.func_overload')) > 0) {
-			$this->warning('WARNING: php.ini contains "mbstring.func_overload = '.ini_get('mbstring.func_overload').'", this may break things.');
-		}
-
-		// Check for magic_quotes_runtime
-		if (function_exists('get_magic_quotes_runtime')) {
-			if (get_magic_quotes_runtime()) {
-				return $this->startup_error('magic_quotes_runtime must be disabled before running getID3(). Surround getid3 block by set_magic_quotes_runtime(0) and set_magic_quotes_runtime(1).');
-			}
-		}
-
-		// Check for magic_quotes_gpc
-		if (function_exists('magic_quotes_gpc')) {
-			if (get_magic_quotes_gpc()) {
-				return $this->startup_error('magic_quotes_gpc must be disabled before running getID3(). Surround getid3 block by set_magic_quotes_gpc(0) and set_magic_quotes_gpc(1).');
-			}
-		}
-
-		// Load support library
-		if (!include_once(GETID3_INCLUDEPATH.'getid3.lib.php')) {
-			$this->startup_error .= 'getid3.lib.php is missing or corrupt';
-		}
-
-		if ($this->option_max_2gb_check === null) {
-			$this->option_max_2gb_check = (PHP_INT_MAX <= 2147483647);
-		}
-
-
-		// Needed for Windows only:
-		// Define locations of helper applications for Shorten, VorbisComment, MetaFLAC
-		//   as well as other helper functions such as head, tail, md5sum, etc
-		// This path cannot contain spaces, but the below code will attempt to get the
-		//   8.3-equivalent path automatically
-		// IMPORTANT: This path must include the trailing slash
-		if (GETID3_OS_ISWINDOWS && !defined('GETID3_HELPERAPPSDIR')) {
-
-			$helperappsdir = GETID3_INCLUDEPATH.'..'.DIRECTORY_SEPARATOR.'helperapps'; // must not have any space in this path
-
-			if (!is_dir($helperappsdir)) {
-				$this->startup_warning .= '"'.$helperappsdir.'" cannot be defined as GETID3_HELPERAPPSDIR because it does not exist';
-			} elseif (strpos(realpath($helperappsdir), ' ') !== false) {
-				$DirPieces = explode(DIRECTORY_SEPARATOR, realpath($helperappsdir));
-				$path_so_far = array();
-				foreach ($DirPieces as $key => $value) {
-					if (strpos($value, ' ') !== false) {
-						if (!empty($path_so_far)) {
-							$commandline = 'dir /x '.escapeshellarg(implode(DIRECTORY_SEPARATOR, $path_so_far));
-							$dir_listing = `$commandline`;
-							$lines = explode("\n", $dir_listing);
-							foreach ($lines as $line) {
-								$line = trim($line);
-								if (preg_match('#^([0-9/]{10}) +([0-9:]{4,5}( [AP]M)?) +(<DIR>|[0-9,]+) +([^ ]{0,11}) +(.+)$#', $line, $matches)) {
-									list($dummy, $date, $time, $ampm, $filesize, $shortname, $filename) = $matches;
-									if ((strtoupper($filesize) == '<DIR>') && (strtolower($filename) == strtolower($value))) {
-										$value = $shortname;
-									}
-								}
-							}
-						} else {
-							$this->startup_warning .= 'GETID3_HELPERAPPSDIR must not have any spaces in it - use 8dot3 naming convention if neccesary. You can run "dir /x" from the commandline to see the correct 8.3-style names.';
-						}
-					}
-					$path_so_far[] = $value;
-				}
-				$helperappsdir = implode(DIRECTORY_SEPARATOR, $path_so_far);
-			}
-			define('GETID3_HELPERAPPSDIR', $helperappsdir.DIRECTORY_SEPARATOR);
-		}
-
-		return true;
-	}
-
-	public function version() {
-		return self::VERSION;
-	}
-
-	public function fread_buffer_size() {
-		return $this->option_fread_buffer_size;
-	}
-
-
-	// public: setOption
-	function setOption($optArray) {
-		if (!is_array($optArray) || empty($optArray)) {
-			return false;
-		}
-		foreach ($optArray as $opt => $val) {
-			if (isset($this->$opt) === false) {
-				continue;
-			}
-			$this->$opt = $val;
-		}
-		return true;
-	}
-
-
-	public function openfile($filename) {
-		try {
-			if (!empty($this->startup_error)) {
-				throw new getid3_exception($this->startup_error);
-			}
-			if (!empty($this->startup_warning)) {
-				$this->warning($this->startup_warning);
-			}
-
-			// init result array and set parameters
-			$this->filename = $filename;
-			$this->info = array();
-			$this->info['GETID3_VERSION']   = $this->version();
-			$this->info['php_memory_limit'] = $this->memory_limit;
-
-			// remote files not supported
-			if (preg_match('/^(ht|f)tp:\/\//', $filename)) {
-				throw new getid3_exception('Remote files are not supported - please copy the file locally first');
-			}
-
-			$filename = str_replace('/', DIRECTORY_SEPARATOR, $filename);
-			$filename = preg_replace('#(.+)'.preg_quote(DIRECTORY_SEPARATOR).'{2,}#U', '\1'.DIRECTORY_SEPARATOR, $filename);
-
-			// open local file
-			if (is_readable($filename) && is_file($filename) && ($this->fp = fopen($filename, 'rb'))) {
-				// great
-			} else {
-				throw new getid3_exception('Could not open "'.$filename.'" (does not exist, or is not a file)');
-			}
-
-			$this->info['filesize'] = filesize($filename);
-			// set redundant parameters - might be needed in some include file
-			$this->info['filename']     = basename($filename);
-			$this->info['filepath']     = str_replace('\\', '/', realpath(dirname($filename)));
-			$this->info['filenamepath'] = $this->info['filepath'].'/'.$this->info['filename'];
-
-
-			// option_max_2gb_check
-			if ($this->option_max_2gb_check) {
-				// PHP (32-bit all, and 64-bit Windows) doesn't support integers larger than 2^31 (~2GB)
-				// filesize() simply returns (filesize % (pow(2, 32)), no matter the actual filesize
-				// ftell() returns 0 if seeking to the end is beyond the range of unsigned integer
-				$fseek = fseek($this->fp, 0, SEEK_END);
-				if (($fseek < 0) || (($this->info['filesize'] != 0) && (ftell($this->fp) == 0)) ||
-					($this->info['filesize'] < 0) ||
-					(ftell($this->fp) < 0)) {
-						$real_filesize = false;
-						if (GETID3_OS_ISWINDOWS) {
-							$commandline = 'dir /-C "'.str_replace('/', DIRECTORY_SEPARATOR, $filename).'"';
-							$dir_output = `$commandline`;
-							if (preg_match('#1 File\(s\)[ ]+([0-9]+) bytes#i', $dir_output, $matches)) {
-								$real_filesize = (float) $matches[1];
-							}
-						} else {
-							$commandline = 'ls -o -g -G --time-style=long-iso '.escapeshellarg($filename);
-							$dir_output = `$commandline`;
-							if (preg_match('#([0-9]+) ([0-9]{4}-[0-9]{2}\-[0-9]{2} [0-9]{2}:[0-9]{2}) '.str_replace('#', '\\#', preg_quote($filename)).'$#', $dir_output, $matches)) {
-								$real_filesize = (float) $matches[1];
-							}
-						}
-						if ($real_filesize === false) {
-							unset($this->info['filesize']);
-							fclose($this->fp);
-							throw new getid3_exception('Unable to determine actual filesize. File is most likely larger than '.round(PHP_INT_MAX / 1073741824).'GB and is not supported by PHP.');
-						} elseif (getid3_lib::intValueSupported($real_filesize)) {
-							unset($this->info['filesize']);
-							fclose($this->fp);
-							throw new getid3_exception('PHP seems to think the file is larger than '.round(PHP_INT_MAX / 1073741824).'GB, but filesystem reports it as '.number_format($real_filesize, 3).'GB, please report to info@getid3.org');
-						}
-						$this->info['filesize'] = $real_filesize;
-						$this->error('File is larger than '.round(PHP_INT_MAX / 1073741824).'GB (filesystem reports it as '.number_format($real_filesize, 3).'GB) and is not properly supported by PHP.');
-				}
-			}
-
-			// set more parameters
-			$this->info['avdataoffset']        = 0;
-			$this->info['avdataend']           = $this->info['filesize'];
-			$this->info['fileformat']          = '';                // filled in later
-			$this->info['audio']['dataformat'] = '';                // filled in later, unset if not used
-			$this->info['video']['dataformat'] = '';                // filled in later, unset if not used
-			$this->info['tags']                = array();           // filled in later, unset if not used
-			$this->info['error']               = array();           // filled in later, unset if not used
-			$this->info['warning']             = array();           // filled in later, unset if not used
-			$this->info['comments']            = array();           // filled in later, unset if not used
-			$this->info['encoding']            = $this->encoding;   // required by id3v2 and iso modules - can be unset at the end if desired
-
-			return true;
-
-		} catch (Exception $e) {
-			$this->error($e->getMessage());
-		}
-		return false;
-	}
-
-	// public: analyze file
-	function analyze($filename, $forcemp3 = FALSE) {
-		try {
-			if (!$this->openfile($filename)) {
-				return $this->info;
-			}
-
-			// Handle tags
-			foreach (array('id3v2'=>'id3v2', 'id3v1'=>'id3v1', 'apetag'=>'ape', 'lyrics3'=>'lyrics3') as $tag_name => $tag_key) {
-				$option_tag = 'option_tag_'.$tag_name;
-				if ($this->$option_tag) {
-					$this->include_module('tag.'.$tag_name);
-					try {
-						$tag_class = 'getid3_'.$tag_name;
-						$tag = new $tag_class($this);
-						$tag->Analyze();
-					}
-					catch (getid3_exception $e) {
-						throw $e;
-					}
-				}
-			}
-			if (isset($this->info['id3v2']['tag_offset_start'])) {
-				$this->info['avdataoffset'] = max($this->info['avdataoffset'], $this->info['id3v2']['tag_offset_end']);
-			}
-			foreach (array('id3v1'=>'id3v1', 'apetag'=>'ape', 'lyrics3'=>'lyrics3') as $tag_name => $tag_key) {
-				if (isset($this->info[$tag_key]['tag_offset_start'])) {
-					$this->info['avdataend'] = min($this->info['avdataend'], $this->info[$tag_key]['tag_offset_start']);
-				}
-			}
-
-			// ID3v2 detection (NOT parsing), even if ($this->option_tag_id3v2 == false) done to make fileformat easier
-			if (!$this->option_tag_id3v2) {
-				fseek($this->fp, 0, SEEK_SET);
-				$header = fread($this->fp, 10);
-				if ((substr($header, 0, 3) == 'ID3') && (strlen($header) == 10)) {
-					$this->info['id3v2']['header']        = true;
-					$this->info['id3v2']['majorversion']  = ord($header{3});
-					$this->info['id3v2']['minorversion']  = ord($header{4});
-					$this->info['avdataoffset']          += getid3_lib::BigEndian2Int(substr($header, 6, 4), 1) + 10; // length of ID3v2 tag in 10-byte header doesn't include 10-byte header length
-				}
-			}
-
-			// read 32 kb file data
-			fseek($this->fp, $this->info['avdataoffset'], SEEK_SET);
-			$formattest = fread($this->fp, 32774);
-
-			// determine format
-			$determined_format = $this->GetFileFormat($formattest, $filename, $forcemp3);
-
-			// unable to determine file format
-			if (!$determined_format) {
-				fclose($this->fp);
-				return $this->error('unable to determine file format');
-			}
-
-			// check for illegal ID3 tags
-			if (isset($determined_format['fail_id3']) && (in_array('id3v1', $this->info['tags']) || in_array('id3v2', $this->info['tags']))) {
-				if ($determined_format['fail_id3'] === 'ERROR') {
-					fclose($this->fp);
-					return $this->error('ID3 tags not allowed on this file type.');
-				} elseif ($determined_format['fail_id3'] === 'WARNING') {
-					$this->warning('ID3 tags not allowed on this file type.');
-				}
-			}
-
-			// check for illegal APE tags
-			if (isset($determined_format['fail_ape']) && in_array('ape', $this->info['tags'])) {
-				if ($determined_format['fail_ape'] === 'ERROR') {
-					fclose($this->fp);
-					return $this->error('APE tags not allowed on this file type.');
-				} elseif ($determined_format['fail_ape'] === 'WARNING') {
-					$this->warning('APE tags not allowed on this file type.');
-				}
-			}
-
-			// set mime type
-			$this->info['mime_type'] = $determined_format['mime_type'];
-
-			// supported format signature pattern detected, but module deleted
-			if (!file_exists(GETID3_INCLUDEPATH.$determined_format['include'])) {
-				fclose($this->fp);
-				return $this->error('Format not supported, module "'.$determined_format['include'].'" was removed.');
-			}
-
-			// module requires iconv support
-			// Check encoding/iconv support
-			if (!empty($determined_format['iconv_req']) && !function_exists('iconv') && !in_array($this->encoding, array('ISO-8859-1', 'UTF-8', 'UTF-16LE', 'UTF-16BE', 'UTF-16'))) {
-				$errormessage = 'iconv() support is required for this module ('.$determined_format['include'].') for encodings other than ISO-8859-1, UTF-8, UTF-16LE, UTF16-BE, UTF-16. ';
-				if (GETID3_OS_ISWINDOWS) {
-					$errormessage .= 'PHP does not have iconv() support. Please enable php_iconv.dll in php.ini, and copy iconv.dll from c:/php/dlls to c:/windows/system32';
-				} else {
-					$errormessage .= 'PHP is not compiled with iconv() support. Please recompile with the --with-iconv switch';
-				}
-				return $this->error($errormessage);
-			}
-
-			// include module
-			include_once(GETID3_INCLUDEPATH.$determined_format['include']);
-
-			// instantiate module class
-			$class_name = 'getid3_'.$determined_format['module'];
-			if (!class_exists($class_name)) {
-				return $this->error('Format not supported, module "'.$determined_format['include'].'" is corrupt.');
-			}
-			//if (isset($determined_format['option'])) {
-			//	//$class = new $class_name($this->fp, $this->info, $determined_format['option']);
-			//} else {
-				//$class = new $class_name($this->fp, $this->info);
-				$class = new $class_name($this);
-			//}
-
-			if (!empty($determined_format['set_inline_attachments'])) {
-				$class->inline_attachments = $this->option_save_attachments;
-			}
-			$class->Analyze();
-
-			unset($class);
-
-			// close file
-			fclose($this->fp);
-
-			// process all tags - copy to 'tags' and convert charsets
-			if ($this->option_tags_process) {
-				$this->HandleAllTags();
-			}
-
-			// perform more calculations
-			if ($this->option_extra_info) {
-				$this->ChannelsBitratePlaytimeCalculations();
-				$this->CalculateCompressionRatioVideo();
-				$this->CalculateCompressionRatioAudio();
-				$this->CalculateReplayGain();
-				$this->ProcessAudioStreams();
-			}
-
-			// get the MD5 sum of the audio/video portion of the file - without ID3/APE/Lyrics3/etc header/footer tags
-			if ($this->option_md5_data) {
-				// do not cald md5_data if md5_data_source is present - set by flac only - future MPC/SV8 too
-				if (!$this->option_md5_data_source || empty($this->info['md5_data_source'])) {
-					$this->getHashdata('md5');
-				}
-			}
-
-			// get the SHA1 sum of the audio/video portion of the file - without ID3/APE/Lyrics3/etc header/footer tags
-			if ($this->option_sha1_data) {
-				$this->getHashdata('sha1');
-			}
-
-			// remove undesired keys
-			$this->CleanUp();
-
-		} catch (Exception $e) {
-			$this->error('Caught exception: '.$e->getMessage());
-		}
-
-		// return info array
-		return $this->info;
-	}
-
-
-	// private: error handling
-	function error($message) {
-		$this->CleanUp();
-		if (!isset($this->info['error'])) {
-			$this->info['error'] = array();
-		}
-		$this->info['error'][] = $message;
-		return $this->info;
-	}
-
-
-	// private: warning handling
-	function warning($message) {
-		$this->info['warning'][] = $message;
-		return true;
-	}
-
-
-	// private: CleanUp
-	function CleanUp() {
-
-		// remove possible empty keys
-		$AVpossibleEmptyKeys = array('dataformat', 'bits_per_sample', 'encoder_options', 'streams', 'bitrate');
-		foreach ($AVpossibleEmptyKeys as $dummy => $key) {
-			if (empty($this->info['audio'][$key]) && isset($this->info['audio'][$key])) {
-				unset($this->info['audio'][$key]);
-			}
-			if (empty($this->info['video'][$key]) && isset($this->info['video'][$key])) {
-				unset($this->info['video'][$key]);
-			}
-		}
-
-		// remove empty root keys
-		if (!empty($this->info)) {
-			foreach ($this->info as $key => $value) {
-				if (empty($this->info[$key]) && ($this->info[$key] !== 0) && ($this->info[$key] !== '0')) {
-					unset($this->info[$key]);
-				}
-			}
-		}
-
-		// remove meaningless entries from unknown-format files
-		if (empty($this->info['fileformat'])) {
-			if (isset($this->info['avdataoffset'])) {
-				unset($this->info['avdataoffset']);
-			}
-			if (isset($this->info['avdataend'])) {
-				unset($this->info['avdataend']);
-			}
-		}
-
-		// remove possible duplicated identical entries
-		if (!empty($this->info['error'])) {
-			$this->info['error'] = array_values(array_unique($this->info['error']));
-		}
-		if (!empty($this->info['warning'])) {
-			$this->info['warning'] = array_values(array_unique($this->info['warning']));
-		}
-
-		// remove "global variable" type keys
-		unset($this->info['php_memory_limit']);
-
-		return true;
-	}
-
-
-	// return array containing information about all supported formats
-	function GetFileFormatArray() {
-		static $format_info = array();
-		if (empty($format_info)) {
-			$format_info = array(
-
-				// Audio formats
-
-				// AC-3   - audio      - Dolby AC-3 / Dolby Digital
-				'ac3'  => array(
-							'pattern'   => '^\x0B\x77',
-							'group'     => 'audio',
-							'module'    => 'ac3',
-							'mime_type' => 'audio/ac3',
-						),
-
-				// AAC  - audio       - Advanced Audio Coding (AAC) - ADIF format
-				'adif' => array(
-							'pattern'   => '^ADIF',
-							'group'     => 'audio',
-							'module'    => 'aac',
-							'mime_type' => 'application/octet-stream',
-							'fail_ape'  => 'WARNING',
-						),
-
-
-				// AA   - audio       - Audible Audiobook
-				'adts' => array(
-							'pattern'   => '^.{4}\x57\x90\x75\x36',
-							'group'     => 'audio',
-							'module'    => 'aa',
-							'mime_type' => 'audio/audible ',
-						),
-
-				// AAC  - audio       - Advanced Audio Coding (AAC) - ADTS format (very similar to MP3)
-				'adts' => array(
-							'pattern'   => '^\xFF[\xF0-\xF1\xF8-\xF9]',
-							'group'     => 'audio',
-							'module'    => 'aac',
-							'mime_type' => 'application/octet-stream',
-							'fail_ape'  => 'WARNING',
-						),
-
-
-				// AU   - audio       - NeXT/Sun AUdio (AU)
-				'au'   => array(
-							'pattern'   => '^\.snd',
-							'group'     => 'audio',
-							'module'    => 'au',
-							'mime_type' => 'audio/basic',
-						),
-
-				// AVR  - audio       - Audio Visual Research
-				'avr'  => array(
-							'pattern'   => '^2BIT',
-							'group'     => 'audio',
-							'module'    => 'avr',
-							'mime_type' => 'application/octet-stream',
-						),
-
-				// BONK - audio       - Bonk v0.9+
-				'bonk' => array(
-							'pattern'   => '^\x00(BONK|INFO|META| ID3)',
-							'group'     => 'audio',
-							'module'    => 'bonk',
-							'mime_type' => 'audio/xmms-bonk',
-						),
-
-				// DSS  - audio       - Digital Speech Standard
-				'dss'  => array(
-							'pattern'   => '^[\x02-\x03]dss',
-							'group'     => 'audio',
-							'module'    => 'dss',
-							'mime_type' => 'application/octet-stream',
-						),
-
-				// DTS  - audio       - Dolby Theatre System
-				'dts'  => array(
-							'pattern'   => '^\x7F\xFE\x80\x01',
-							'group'     => 'audio',
-							'module'    => 'dts',
-							'mime_type' => 'audio/dts',
-						),
-
-				// FLAC - audio       - Free Lossless Audio Codec
-				'flac' => array(
-							'pattern'   => '^fLaC',
-							'group'     => 'audio',
-							'module'    => 'flac',
-							'mime_type' => 'audio/x-flac',
-							'set_inline_attachments' => true,
-						),
-
-				// LA   - audio       - Lossless Audio (LA)
-				'la'   => array(
-							'pattern'   => '^LA0[2-4]',
-							'group'     => 'audio',
-							'module'    => 'la',
-							'mime_type' => 'application/octet-stream',
-						),
-
-				// LPAC - audio       - Lossless Predictive Audio Compression (LPAC)
-				'lpac' => array(
-							'pattern'   => '^LPAC',
-							'group'     => 'audio',
-							'module'    => 'lpac',
-							'mime_type' => 'application/octet-stream',
-						),
-
-				// MIDI - audio       - MIDI (Musical Instrument Digital Interface)
-				'midi' => array(
-							'pattern'   => '^MThd',
-							'group'     => 'audio',
-							'module'    => 'midi',
-							'mime_type' => 'audio/midi',
-						),
-
-				// MAC  - audio       - Monkey's Audio Compressor
-				'mac'  => array(
-							'pattern'   => '^MAC ',
-							'group'     => 'audio',
-							'module'    => 'monkey',
-							'mime_type' => 'application/octet-stream',
-						),
-
-// has been known to produce false matches in random files (e.g. JPEGs), leave out until more precise matching available
-//				// MOD  - audio       - MODule (assorted sub-formats)
-//				'mod'  => array(
-//							'pattern'   => '^.{1080}(M\\.K\\.|M!K!|FLT4|FLT8|[5-9]CHN|[1-3][0-9]CH)',
-//							'group'     => 'audio',
-//							'module'    => 'mod',
-//							'option'    => 'mod',
-//							'mime_type' => 'audio/mod',
-//						),
-
-				// MOD  - audio       - MODule (Impulse Tracker)
-				'it'   => array(
-							'pattern'   => '^IMPM',
-							'group'     => 'audio',
-							'module'    => 'mod',
-							//'option'    => 'it',
-							'mime_type' => 'audio/it',
-						),
-
-				// MOD  - audio       - MODule (eXtended Module, various sub-formats)
-				'xm'   => array(
-							'pattern'   => '^Extended Module',
-							'group'     => 'audio',
-							'module'    => 'mod',
-							//'option'    => 'xm',
-							'mime_type' => 'audio/xm',
-						),
-
-				// MOD  - audio       - MODule (ScreamTracker)
-				's3m'  => array(
-							'pattern'   => '^.{44}SCRM',
-							'group'     => 'audio',
-							'module'    => 'mod',
-							//'option'    => 's3m',
-							'mime_type' => 'audio/s3m',
-						),
-
-				// MPC  - audio       - Musepack / MPEGplus
-				'mpc'  => array(
-							'pattern'   => '^(MPCK|MP\+|[\x00\x01\x10\x11\x40\x41\x50\x51\x80\x81\x90\x91\xC0\xC1\xD0\xD1][\x20-37][\x00\x20\x40\x60\x80\xA0\xC0\xE0])',
-							'group'     => 'audio',
-							'module'    => 'mpc',
-							'mime_type' => 'audio/x-musepack',
-						),
-
-				// MP3  - audio       - MPEG-audio Layer 3 (very similar to AAC-ADTS)
-				'mp3'  => array(
-							'pattern'   => '^\xFF[\xE2-\xE7\xF2-\xF7\xFA-\xFF][\x00-\x0B\x10-\x1B\x20-\x2B\x30-\x3B\x40-\x4B\x50-\x5B\x60-\x6B\x70-\x7B\x80-\x8B\x90-\x9B\xA0-\xAB\xB0-\xBB\xC0-\xCB\xD0-\xDB\xE0-\xEB\xF0-\xFB]',
-							'group'     => 'audio',
-							'module'    => 'mp3',
-							'mime_type' => 'audio/mpeg',
-						),
-
-				// OFR  - audio       - OptimFROG
-				'ofr'  => array(
-							'pattern'   => '^(\*RIFF|OFR)',
-							'group'     => 'audio',
-							'module'    => 'optimfrog',
-							'mime_type' => 'application/octet-stream',
-						),
-
-				// RKAU - audio       - RKive AUdio compressor
-				'rkau' => array(
-							'pattern'   => '^RKA',
-							'group'     => 'audio',
-							'module'    => 'rkau',
-							'mime_type' => 'application/octet-stream',
-						),
-
-				// SHN  - audio       - Shorten
-				'shn'  => array(
-							'pattern'   => '^ajkg',
-							'group'     => 'audio',
-							'module'    => 'shorten',
-							'mime_type' => 'audio/xmms-shn',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-				// TTA  - audio       - TTA Lossless Audio Compressor (http://tta.corecodec.org)
-				'tta'  => array(
-							'pattern'   => '^TTA',  // could also be '^TTA(\x01|\x02|\x03|2|1)'
-							'group'     => 'audio',
-							'module'    => 'tta',
-							'mime_type' => 'application/octet-stream',
-						),
-
-				// VOC  - audio       - Creative Voice (VOC)
-				'voc'  => array(
-							'pattern'   => '^Creative Voice File',
-							'group'     => 'audio',
-							'module'    => 'voc',
-							'mime_type' => 'audio/voc',
-						),
-
-				// VQF  - audio       - transform-domain weighted interleave Vector Quantization Format (VQF)
-				'vqf'  => array(
-							'pattern'   => '^TWIN',
-							'group'     => 'audio',
-							'module'    => 'vqf',
-							'mime_type' => 'application/octet-stream',
-						),
-
-				// WV  - audio        - WavPack (v4.0+)
-				'wv'   => array(
-							'pattern'   => '^wvpk',
-							'group'     => 'audio',
-							'module'    => 'wavpack',
-							'mime_type' => 'application/octet-stream',
-						),
-
-
-				// Audio-Video formats
-
-				// ASF  - audio/video - Advanced Streaming Format, Windows Media Video, Windows Media Audio
-				'asf'  => array(
-							'pattern'   => '^\x30\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C',
-							'group'     => 'audio-video',
-							'module'    => 'asf',
-							'mime_type' => 'video/x-ms-asf',
-							'iconv_req' => false,
-						),
-
-				// BINK - audio/video - Bink / Smacker
-				'bink' => array(
-							'pattern'   => '^(BIK|SMK)',
-							'group'     => 'audio-video',
-							'module'    => 'bink',
-							'mime_type' => 'application/octet-stream',
-						),
-
-				// FLV  - audio/video - FLash Video
-				'flv' => array(
-							'pattern'   => '^FLV\x01',
-							'group'     => 'audio-video',
-							'module'    => 'flv',
-							'mime_type' => 'video/x-flv',
-						),
-
-				// MKAV - audio/video - Mastroka
-				'matroska' => array(
-							'pattern'   => '^\x1A\x45\xDF\xA3',
-							'group'     => 'audio-video',
-							'module'    => 'matroska',
-							'mime_type' => 'video/x-matroska', // may also be audio/x-matroska
-							'set_inline_attachments' => true,
-						),
-
-				// MPEG - audio/video - MPEG (Moving Pictures Experts Group)
-				'mpeg' => array(
-							'pattern'   => '^\x00\x00\x01(\xBA|\xB3)',
-							'group'     => 'audio-video',
-							'module'    => 'mpeg',
-							'mime_type' => 'video/mpeg',
-						),
-
-				// NSV  - audio/video - Nullsoft Streaming Video (NSV)
-				'nsv'  => array(
-							'pattern'   => '^NSV[sf]',
-							'group'     => 'audio-video',
-							'module'    => 'nsv',
-							'mime_type' => 'application/octet-stream',
-						),
-
-				// Ogg  - audio/video - Ogg (Ogg-Vorbis, Ogg-FLAC, Speex, Ogg-Theora(*), Ogg-Tarkin(*))
-				'ogg'  => array(
-							'pattern'   => '^OggS',
-							'group'     => 'audio',
-							'module'    => 'ogg',
-							'mime_type' => 'application/ogg',
-							'fail_id3'  => 'WARNING',
-							'fail_ape'  => 'WARNING',
-							'set_inline_attachments' => true,
-						),
-
-				// QT   - audio/video - Quicktime
-				'quicktime' => array(
-							'pattern'   => '^.{4}(cmov|free|ftyp|mdat|moov|pnot|skip|wide)',
-							'group'     => 'audio-video',
-							'module'    => 'quicktime',
-							'mime_type' => 'video/quicktime',
-						),
-
-				// RIFF - audio/video - Resource Interchange File Format (RIFF) / WAV / AVI / CD-audio / SDSS = renamed variant used by SmartSound QuickTracks (www.smartsound.com) / FORM = Audio Interchange File Format (AIFF)
-				'riff' => array(
-							'pattern'   => '^(RIFF|SDSS|FORM)',
-							'group'     => 'audio-video',
-							'module'    => 'riff',
-							'mime_type' => 'audio/x-wave',
-							'fail_ape'  => 'WARNING',
-						),
-
-				// Real - audio/video - RealAudio, RealVideo
-				'real' => array(
-							'pattern'   => '^(\\.RMF|\\.ra)',
-							'group'     => 'audio-video',
-							'module'    => 'real',
-							'mime_type' => 'audio/x-realaudio',
-						),
-
-				// SWF - audio/video - ShockWave Flash
-				'swf' => array(
-							'pattern'   => '^(F|C)WS',
-							'group'     => 'audio-video',
-							'module'    => 'swf',
-							'mime_type' => 'application/x-shockwave-flash',
-						),
-
-
-				// Still-Image formats
-
-				// BMP  - still image - Bitmap (Windows, OS/2; uncompressed, RLE8, RLE4)
-				'bmp'  => array(
-							'pattern'   => '^BM',
-							'group'     => 'graphic',
-							'module'    => 'bmp',
-							'mime_type' => 'image/bmp',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-				// GIF  - still image - Graphics Interchange Format
-				'gif'  => array(
-							'pattern'   => '^GIF',
-							'group'     => 'graphic',
-							'module'    => 'gif',
-							'mime_type' => 'image/gif',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-				// JPEG - still image - Joint Photographic Experts Group (JPEG)
-				'jpg'  => array(
-							'pattern'   => '^\xFF\xD8\xFF',
-							'group'     => 'graphic',
-							'module'    => 'jpg',
-							'mime_type' => 'image/jpeg',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-				// PCD  - still image - Kodak Photo CD
-				'pcd'  => array(
-							'pattern'   => '^.{2048}PCD_IPI\x00',
-							'group'     => 'graphic',
-							'module'    => 'pcd',
-							'mime_type' => 'image/x-photo-cd',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-
-				// PNG  - still image - Portable Network Graphics (PNG)
-				'png'  => array(
-							'pattern'   => '^\x89\x50\x4E\x47\x0D\x0A\x1A\x0A',
-							'group'     => 'graphic',
-							'module'    => 'png',
-							'mime_type' => 'image/png',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-
-				// SVG  - still image - Scalable Vector Graphics (SVG)
-				'svg'  => array(
-							'pattern'   => '(<!DOCTYPE svg PUBLIC |xmlns="http:\/\/www\.w3\.org\/2000\/svg")',
-							'group'     => 'graphic',
-							'module'    => 'svg',
-							'mime_type' => 'image/svg+xml',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-
-				// TIFF - still image - Tagged Information File Format (TIFF)
-				'tiff' => array(
-							'pattern'   => '^(II\x2A\x00|MM\x00\x2A)',
-							'group'     => 'graphic',
-							'module'    => 'tiff',
-							'mime_type' => 'image/tiff',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-
-				// EFAX - still image - eFax (TIFF derivative)
-				'bmp'  => array(
-							'pattern'   => '^\xDC\xFE',
-							'group'     => 'graphic',
-							'module'    => 'efax',
-							'mime_type' => 'image/efax',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-
-				// Data formats
-
-				// ISO  - data        - International Standards Organization (ISO) CD-ROM Image
-				'iso'  => array(
-							'pattern'   => '^.{32769}CD001',
-							'group'     => 'misc',
-							'module'    => 'iso',
-							'mime_type' => 'application/octet-stream',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-							'iconv_req' => false,
-						),
-
-				// RAR  - data        - RAR compressed data
-				'rar'  => array(
-							'pattern'   => '^Rar\!',
-							'group'     => 'archive',
-							'module'    => 'rar',
-							'mime_type' => 'application/octet-stream',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-				// SZIP - audio/data  - SZIP compressed data
-				'szip' => array(
-							'pattern'   => '^SZ\x0A\x04',
-							'group'     => 'archive',
-							'module'    => 'szip',
-							'mime_type' => 'application/octet-stream',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-				// TAR  - data        - TAR compressed data
-				'tar'  => array(
-							'pattern'   => '^.{100}[0-9\x20]{7}\x00[0-9\x20]{7}\x00[0-9\x20]{7}\x00[0-9\x20\x00]{12}[0-9\x20\x00]{12}',
-							'group'     => 'archive',
-							'module'    => 'tar',
-							'mime_type' => 'application/x-tar',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-				// GZIP  - data        - GZIP compressed data
-				'gz'  => array(
-							'pattern'   => '^\x1F\x8B\x08',
-							'group'     => 'archive',
-							'module'    => 'gzip',
-							'mime_type' => 'application/x-gzip',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-				// ZIP  - data         - ZIP compressed data
-				'zip'  => array(
-							'pattern'   => '^PK\x03\x04',
-							'group'     => 'archive',
-							'module'    => 'zip',
-							'mime_type' => 'application/zip',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-
-				// Misc other formats
-
-				// PAR2 - data        - Parity Volume Set Specification 2.0
-				'par2' => array (
-							'pattern'   => '^PAR2\x00PKT',
-							'group'     => 'misc',
-							'module'    => 'par2',
-							'mime_type' => 'application/octet-stream',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-				// PDF  - data        - Portable Document Format
-				'pdf'  => array(
-							'pattern'   => '^\x25PDF',
-							'group'     => 'misc',
-							'module'    => 'pdf',
-							'mime_type' => 'application/pdf',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-				// MSOFFICE  - data   - ZIP compressed data
-				'msoffice' => array(
-							'pattern'   => '^\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1', // D0CF11E == DOCFILE == Microsoft Office Document
-							'group'     => 'misc',
-							'module'    => 'msoffice',
-							'mime_type' => 'application/octet-stream',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
-
-				 // CUE  - data       - CUEsheet (index to single-file disc images)
-				 'cue' => array(
-							'pattern'   => '', // empty pattern means cannot be automatically detected, will fall through all other formats and match based on filename and very basic file contents
-							'group'     => 'misc',
-							'module'    => 'cue',
-							'mime_type' => 'application/octet-stream',
-						   ),
-
-			);
-		}
-
-		return $format_info;
-	}
-
-
-
-	function GetFileFormat(&$filedata, $filename='', $forcemp3) {
-		// this function will determine the format of a file based on usually
-		// the first 2-4 bytes of the file (8 bytes for PNG, 16 bytes for JPG,
-		// and in the case of ISO CD image, 6 bytes offset 32kb from the start
-		// of the file).
-
-		// Identify file format - loop through $format_info and detect with reg expr
-		foreach ($this->GetFileFormatArray() as $format_name => $info) {
-			// The /s switch on preg_match() forces preg_match() NOT to treat
-			// newline (0x0A) characters as special chars but do a binary match
-			if (!empty($info['pattern']) && preg_match('#'.$info['pattern'].'#s', $filedata)) {
-				$info['include'] = 'module.'.$info['group'].'.'.$info['module'].'.php';
-				return $info;
-			}
-		}
-
-
-		if (preg_match('#\.mp[123a]$#i', $filename) || $forcemp3 == TRUE) {
-			// Too many mp3 encoders on the market put gabage in front of mpeg files
-			// use assume format on these if format detection failed
-			$GetFileFormatArray = $this->GetFileFormatArray();
-			$info = $GetFileFormatArray['mp3'];
-			$info['include'] = 'module.'.$info['group'].'.'.$info['module'].'.php';
-			return $info;
-		} elseif (preg_match('/\.cue$/i', $filename) && preg_match('#FILE "[^"]+" (BINARY|MOTOROLA|AIFF|WAVE|MP3)#', $filedata)) {
-			// there's not really a useful consistent "magic" at the beginning of .cue files to identify them
-			// so until I think of something better, just go by filename if all other format checks fail
-			// and verify there's at least one instance of "TRACK xx AUDIO" in the file
-			$GetFileFormatArray = $this->GetFileFormatArray();
-			$info = $GetFileFormatArray['cue'];
-			$info['include']   = 'module.'.$info['group'].'.'.$info['module'].'.php';
-			return $info;
-		}
-
-		return false;
-	}
-
-
-	// converts array to $encoding charset from $this->encoding
-	function CharConvert(&$array, $encoding) {
-
-		// identical encoding - end here
-		if ($encoding == $this->encoding) {
-			return;
-		}
-
-		// loop thru array
-		foreach ($array as $key => $value) {
-
-			// go recursive
-			if (is_array($value)) {
-				$this->CharConvert($array[$key], $encoding);
-			}
-
-			// convert string
-			elseif (is_string($value)) {
-				$array[$key] = trim(getid3_lib::iconv_fallback($encoding, $this->encoding, $value));
-			}
-		}
-	}
-
-
-	function HandleAllTags() {
-
-		// key name => array (tag name, character encoding)
-		static $tags;
-		if (empty($tags)) {
-			$tags = array(
-				'asf'       => array('asf'           , 'UTF-16LE'),
-				'midi'      => array('midi'          , 'ISO-8859-1'),
-				'nsv'       => array('nsv'           , 'ISO-8859-1'),
-				'ogg'       => array('vorbiscomment' , 'UTF-8'),
-				'png'       => array('png'           , 'UTF-8'),
-				'tiff'      => array('tiff'          , 'ISO-8859-1'),
-				'quicktime' => array('quicktime'     , 'UTF-8'),
-				'real'      => array('real'          , 'ISO-8859-1'),
-				'vqf'       => array('vqf'           , 'ISO-8859-1'),
-				'zip'       => array('zip'           , 'ISO-8859-1'),
-				'riff'      => array('riff'          , 'ISO-8859-1'),
-				'lyrics3'   => array('lyrics3'       , 'ISO-8859-1'),
-				'id3v1'     => array('id3v1'         , $this->encoding_id3v1),
-				'id3v2'     => array('id3v2'         , 'UTF-8'), // not according to the specs (every frame can have a different encoding), but getID3() force-converts all encodings to UTF-8
-				'ape'       => array('ape'           , 'UTF-8'),
-				'cue'       => array('cue'           , 'ISO-8859-1'),
-				'matroska'  => array('matroska'      , 'UTF-8'),
-			);
-		}
-
-		// loop through comments array
-		foreach ($tags as $comment_name => $tagname_encoding_array) {
-			list($tag_name, $encoding) = $tagname_encoding_array;
-
-			// fill in default encoding type if not already present
-			if (isset($this->info[$comment_name]) && !isset($this->info[$comment_name]['encoding'])) {
-				$this->info[$comment_name]['encoding'] = $encoding;
-			}
-
-			// copy comments if key name set
-			if (!empty($this->info[$comment_name]['comments'])) {
-
-				foreach ($this->info[$comment_name]['comments'] as $tag_key => $valuearray) {
-					foreach ($valuearray as $key => $value) {
-						if (is_string($value)) {
-							$value = trim($value, " \r\n\t"); // do not trim nulls from $value!! Unicode characters will get mangled if trailing nulls are removed!
-						}
-						if ($value) {
-							$this->info['tags'][trim($tag_name)][trim($tag_key)][] = $value;
-						}
-					}
-				}
-
-				if (!isset($this->info['tags'][$tag_name])) {
-					// comments are set but contain nothing but empty strings, so skip
-					continue;
-				}
-
-				if ($this->option_tags_html) {
-					foreach ($this->info['tags'][$tag_name] as $tag_key => $valuearray) {
-						foreach ($valuearray as $key => $value) {
-							if (is_string($value)) {
-								//$this->info['tags_html'][$tag_name][$tag_key][$key] = getid3_lib::MultiByteCharString2HTML($value, $encoding);
-								$this->info['tags_html'][$tag_name][$tag_key][$key] = str_replace('&#0;', '', trim(getid3_lib::MultiByteCharString2HTML($value, $encoding)));
-							} else {
-								$this->info['tags_html'][$tag_name][$tag_key][$key] = $value;
-							}
-						}
-					}
-				}
-
-				$this->CharConvert($this->info['tags'][$tag_name], $encoding);           // only copy gets converted!
-			}
-
-		}
-
-		// pictures can take up a lot of space, and we don't need multiple copies of them
-		// let there be a single copy in [comments][picture], and not elsewhere
-		if (!empty($this->info['tags'])) {
-			$unset_keys = array('tags', 'tags_html');
-			foreach ($this->info['tags'] as $tagtype => $tagarray) {
-				foreach ($tagarray as $tagname => $tagdata) {
-					if ($tagname == 'picture') {
-						foreach ($tagdata as $key => $tagarray) {
-							$this->info['comments']['picture'][] = $tagarray;
-							if (isset($tagarray['data']) && isset($tagarray['image_mime'])) {
-								if (isset($this->info['tags'][$tagtype][$tagname][$key])) {
-									unset($this->info['tags'][$tagtype][$tagname][$key]);
-								}
-								if (isset($this->info['tags_html'][$tagtype][$tagname][$key])) {
-									unset($this->info['tags_html'][$tagtype][$tagname][$key]);
-								}
-							}
-						}
-					}
-				}
-				foreach ($unset_keys as $unset_key) {
-					// remove possible empty keys from (e.g. [tags][id3v2][picture])
-					if (empty($this->info[$unset_key][$tagtype]['picture'])) {
-						unset($this->info[$unset_key][$tagtype]['picture']);
-					}
-					if (empty($this->info[$unset_key][$tagtype])) {
-						unset($this->info[$unset_key][$tagtype]);
-					}
-					if (empty($this->info[$unset_key])) {
-						unset($this->info[$unset_key]);
-					}
-				}
-				// remove duplicate copy of picture data from (e.g. [id3v2][comments][picture])
-				if (isset($this->info[$tagtype]['comments']['picture'])) {
-					unset($this->info[$tagtype]['comments']['picture']);
-				}
-				if (empty($this->info[$tagtype]['comments'])) {
-					unset($this->info[$tagtype]['comments']);
-				}
-				if (empty($this->info[$tagtype])) {
-					unset($this->info[$tagtype]);
-				}
-			}
-		}
-		return true;
-	}
-
-
-	function getHashdata($algorithm) {
-		switch ($algorithm) {
-			case 'md5':
-			case 'sha1':
-				break;
-
-			default:
-				return $this->error('bad algorithm "'.$algorithm.'" in getHashdata()');
-				break;
-		}
-
-		if (!empty($this->info['fileformat']) && !empty($this->info['dataformat']) && ($this->info['fileformat'] == 'ogg') && ($this->info['audio']['dataformat'] == 'vorbis')) {
-
-			// We cannot get an identical md5_data value for Ogg files where the comments
-			// span more than 1 Ogg page (compared to the same audio data with smaller
-			// comments) using the normal getID3() method of MD5'ing the data between the
-			// end of the comments and the end of the file (minus any trailing tags),
-			// because the page sequence numbers of the pages that the audio data is on
-			// do not match. Under normal circumstances, where comments are smaller than
-			// the nominal 4-8kB page size, then this is not a problem, but if there are
-			// very large comments, the only way around it is to strip off the comment
-			// tags with vorbiscomment and MD5 that file.
-			// This procedure must be applied to ALL Ogg files, not just the ones with
-			// comments larger than 1 page, because the below method simply MD5's the
-			// whole file with the comments stripped, not just the portion after the
-			// comments block (which is the standard getID3() method.
-
-			// The above-mentioned problem of comments spanning multiple pages and changing
-			// page sequence numbers likely happens for OggSpeex and OggFLAC as well, but
-			// currently vorbiscomment only works on OggVorbis files.
-
-			if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
-
-				$this->warning('Failed making system call to vorbiscomment.exe - '.$algorithm.'_data is incorrect - error returned: PHP running in Safe Mode (backtick operator not available)');
-				$this->info[$algorithm.'_data'] = false;
-
-			} else {
-
-				// Prevent user from aborting script
-				$old_abort = ignore_user_abort(true);
-
-				// Create empty file
-				$empty = tempnam(GETID3_TEMP_DIR, 'getID3');
-				touch($empty);
-
-				// Use vorbiscomment to make temp file without comments
-				$temp = tempnam(GETID3_TEMP_DIR, 'getID3');
-				$file = $this->info['filenamepath'];
-
-				if (GETID3_OS_ISWINDOWS) {
-
-					if (file_exists(GETID3_HELPERAPPSDIR.'vorbiscomment.exe')) {
-
-						$commandline = '"'.GETID3_HELPERAPPSDIR.'vorbiscomment.exe" -w -c "'.$empty.'" "'.$file.'" "'.$temp.'"';
-						$VorbisCommentError = `$commandline`;
-
-					} else {
-
-						$VorbisCommentError = 'vorbiscomment.exe not found in '.GETID3_HELPERAPPSDIR;
-
-					}
-
-				} else {
-
-					$commandline = 'vorbiscomment -w -c "'.$empty.'" "'.$file.'" "'.$temp.'" 2>&1';
-					$commandline = 'vorbiscomment -w -c '.escapeshellarg($empty).' '.escapeshellarg($file).' '.escapeshellarg($temp).' 2>&1';
-					$VorbisCommentError = `$commandline`;
-
-				}
-
-				if (!empty($VorbisCommentError)) {
-
-					$this->info['warning'][]         = 'Failed making system call to vorbiscomment(.exe) - '.$algorithm.'_data will be incorrect. If vorbiscomment is unavailable, please download from http://www.vorbis.com/download.psp and put in the getID3() directory. Error returned: '.$VorbisCommentError;
-					$this->info[$algorithm.'_data']  = false;
-
-				} else {
-
-					// Get hash of newly created file
-					switch ($algorithm) {
-						case 'md5':
-							$this->info[$algorithm.'_data'] = md5_file($temp);
-							break;
-
-						case 'sha1':
-							$this->info[$algorithm.'_data'] = sha1_file($temp);
-							break;
-					}
-				}
-
-				// Clean up
-				unlink($empty);
-				unlink($temp);
-
-				// Reset abort setting
-				ignore_user_abort($old_abort);
-
-			}
-
-		} else {
-
-			if (!empty($this->info['avdataoffset']) || (isset($this->info['avdataend']) && ($this->info['avdataend'] < $this->info['filesize']))) {
-
-				// get hash from part of file
-				$this->info[$algorithm.'_data'] = getid3_lib::hash_data($this->info['filenamepath'], $this->info['avdataoffset'], $this->info['avdataend'], $algorithm);
-
-			} else {
-
-				// get hash from whole file
-				switch ($algorithm) {
-					case 'md5':
-						$this->info[$algorithm.'_data'] = md5_file($this->info['filenamepath']);
-						break;
-
-					case 'sha1':
-						$this->info[$algorithm.'_data'] = sha1_file($this->info['filenamepath']);
-						break;
-				}
-			}
-
-		}
-		return true;
-	}
-
-
-	function ChannelsBitratePlaytimeCalculations() {
-
-		// set channelmode on audio
-		if (!empty($this->info['audio']['channelmode']) || !isset($this->info['audio']['channels'])) {
-			// ignore
-		} elseif ($this->info['audio']['channels'] == 1) {
-			$this->info['audio']['channelmode'] = 'mono';
-		} elseif ($this->info['audio']['channels'] == 2) {
-			$this->info['audio']['channelmode'] = 'stereo';
-		}
-
-		// Calculate combined bitrate - audio + video
-		$CombinedBitrate  = 0;
-		$CombinedBitrate += (isset($this->info['audio']['bitrate']) ? $this->info['audio']['bitrate'] : 0);
-		$CombinedBitrate += (isset($this->info['video']['bitrate']) ? $this->info['video']['bitrate'] : 0);
-		if (($CombinedBitrate > 0) && empty($this->info['bitrate'])) {
-			$this->info['bitrate'] = $CombinedBitrate;
-		}
-		//if ((isset($this->info['video']) && !isset($this->info['video']['bitrate'])) || (isset($this->info['audio']) && !isset($this->info['audio']['bitrate']))) {
-		//	// for example, VBR MPEG video files cannot determine video bitrate:
-		//	// should not set overall bitrate and playtime from audio bitrate only
-		//	unset($this->info['bitrate']);
-		//}
-
-		// video bitrate undetermined, but calculable
-		if (isset($this->info['video']['dataformat']) && $this->info['video']['dataformat'] && (!isset($this->info['video']['bitrate']) || ($this->info['video']['bitrate'] == 0))) {
-			// if video bitrate not set
-			if (isset($this->info['audio']['bitrate']) && ($this->info['audio']['bitrate'] > 0) && ($this->info['audio']['bitrate'] == $this->info['bitrate'])) {
-				// AND if audio bitrate is set to same as overall bitrate
-				if (isset($this->info['playtime_seconds']) && ($this->info['playtime_seconds'] > 0)) {
-					// AND if playtime is set
-					if (isset($this->info['avdataend']) && isset($this->info['avdataoffset'])) {
-						// AND if AV data offset start/end is known
-						// THEN we can calculate the video bitrate
-						$this->info['bitrate'] = round((($this->info['avdataend'] - $this->info['avdataoffset']) * 8) / $this->info['playtime_seconds']);
-						$this->info['video']['bitrate'] = $this->info['bitrate'] - $this->info['audio']['bitrate'];
-					}
-				}
-			}
-		}
-
-		if ((!isset($this->info['playtime_seconds']) || ($this->info['playtime_seconds'] <= 0)) && !empty($this->info['bitrate'])) {
-			$this->info['playtime_seconds'] = (($this->info['avdataend'] - $this->info['avdataoffset']) * 8) / $this->info['bitrate'];
-		}
-
-		if (!isset($this->info['bitrate']) && !empty($this->info['playtime_seconds'])) {
-			$this->info['bitrate'] = (($this->info['avdataend'] - $this->info['avdataoffset']) * 8) / $this->info['playtime_seconds'];
-		}
-		if (isset($this->info['bitrate']) && empty($this->info['audio']['bitrate']) && empty($this->info['video']['bitrate'])) {
-			if (isset($this->info['audio']['dataformat']) && empty($this->info['video']['resolution_x'])) {
-				// audio only
-				$this->info['audio']['bitrate'] = $this->info['bitrate'];
-			} elseif (isset($this->info['video']['resolution_x']) && empty($this->info['audio']['dataformat'])) {
-				// video only
-				$this->info['video']['bitrate'] = $this->info['bitrate'];
-			}
-		}
-
-		// Set playtime string
-		if (!empty($this->info['playtime_seconds']) && empty($this->info['playtime_string'])) {
-			$this->info['playtime_string'] = getid3_lib::PlaytimeString($this->info['playtime_seconds']);
-		}
-	}
-
-
-	function CalculateCompressionRatioVideo() {
-		if (empty($this->info['video'])) {
-			return false;
-		}
-		if (empty($this->info['video']['resolution_x']) || empty($this->info['video']['resolution_y'])) {
-			return false;
-		}
-		if (empty($this->info['video']['bits_per_sample'])) {
-			return false;
-		}
-
-		switch ($this->info['video']['dataformat']) {
-			case 'bmp':
-			case 'gif':
-			case 'jpeg':
-			case 'jpg':
-			case 'png':
-			case 'tiff':
-				$FrameRate = 1;
-				$PlaytimeSeconds = 1;
-				$BitrateCompressed = $this->info['filesize'] * 8;
-				break;
-
-			default:
-				if (!empty($this->info['video']['frame_rate'])) {
-					$FrameRate = $this->info['video']['frame_rate'];
-				} else {
-					return false;
-				}
-				if (!empty($this->info['playtime_seconds'])) {
-					$PlaytimeSeconds = $this->info['playtime_seconds'];
-				} else {
-					return false;
-				}
-				if (!empty($this->info['video']['bitrate'])) {
-					$BitrateCompressed = $this->info['video']['bitrate'];
-				} else {
-					return false;
-				}
-				break;
-		}
-		$BitrateUncompressed = $this->info['video']['resolution_x'] * $this->info['video']['resolution_y'] * $this->info['video']['bits_per_sample'] * $FrameRate;
-
-		$this->info['video']['compression_ratio'] = $BitrateCompressed / $BitrateUncompressed;
-		return true;
-	}
-
-
-	function CalculateCompressionRatioAudio() {
-		if (empty($this->info['audio']['bitrate']) || empty($this->info['audio']['channels']) || empty($this->info['audio']['sample_rate'])) {
-			return false;
-		}
-		$this->info['audio']['compression_ratio'] = $this->info['audio']['bitrate'] / ($this->info['audio']['channels'] * $this->info['audio']['sample_rate'] * (!empty($this->info['audio']['bits_per_sample']) ? $this->info['audio']['bits_per_sample'] : 16));
-
-		if (!empty($this->info['audio']['streams'])) {
-			foreach ($this->info['audio']['streams'] as $streamnumber => $streamdata) {
-				if (!empty($streamdata['bitrate']) && !empty($streamdata['channels']) && !empty($streamdata['sample_rate'])) {
-					$this->info['audio']['streams'][$streamnumber]['compression_ratio'] = $streamdata['bitrate'] / ($streamdata['channels'] * $streamdata['sample_rate'] * (!empty($streamdata['bits_per_sample']) ? $streamdata['bits_per_sample'] : 16));
-				}
-			}
-		}
-		return true;
-	}
-
-
-	function CalculateReplayGain() {
-		if (isset($this->info['replay_gain'])) {
-			if (!isset($this->info['replay_gain']['reference_volume'])) {
-				$this->info['replay_gain']['reference_volume'] = (double) 89.0;
-			}
-			if (isset($this->info['replay_gain']['track']['adjustment'])) {
-				$this->info['replay_gain']['track']['volume'] = $this->info['replay_gain']['reference_volume'] - $this->info['replay_gain']['track']['adjustment'];
-			}
-			if (isset($this->info['replay_gain']['album']['adjustment'])) {
-				$this->info['replay_gain']['album']['volume'] = $this->info['replay_gain']['reference_volume'] - $this->info['replay_gain']['album']['adjustment'];
-			}
-
-			if (isset($this->info['replay_gain']['track']['peak'])) {
-				$this->info['replay_gain']['track']['max_noclip_gain'] = 0 - getid3_lib::RGADamplitude2dB($this->info['replay_gain']['track']['peak']);
-			}
-			if (isset($this->info['replay_gain']['album']['peak'])) {
-				$this->info['replay_gain']['album']['max_noclip_gain'] = 0 - getid3_lib::RGADamplitude2dB($this->info['replay_gain']['album']['peak']);
-			}
-		}
-		return true;
-	}
-
-	function ProcessAudioStreams() {
-		if (!empty($this->info['audio']['bitrate']) || !empty($this->info['audio']['channels']) || !empty($this->info['audio']['sample_rate'])) {
-			if (!isset($this->info['audio']['streams'])) {
-				foreach ($this->info['audio'] as $key => $value) {
-					if ($key != 'streams') {
-						$this->info['audio']['streams'][0][$key] = $value;
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-	function getid3_tempnam() {
-		return tempnam($this->tempdir, 'gI3');
-	}
-
-
-	public function saveAttachment(&$ThisFileInfoIndex, $filename, $offset, $length) {
-		try {
-			if (!getid3_lib::intValueSupported($offset + $length)) {
-				throw new Exception('cannot extract attachment, it extends beyond the '.round(PHP_INT_MAX / 1073741824).'GB limit');
-			}
-
-			// do not extract at all
-			if ($this->option_save_attachments === getID3::ATTACHMENTS_NONE) {
-
-				unset($ThisFileInfoIndex); // do not set any
-
-			// extract to return array
-			} elseif ($this->option_save_attachments === getID3::ATTACHMENTS_INLINE) {
-
-				// get whole data in one pass, till it is anyway stored in memory
-				$ThisFileInfoIndex = file_get_contents($this->info['filenamepath'], false, null, $offset, $length);
-				if (($ThisFileInfoIndex === false) || (strlen($ThisFileInfoIndex) != $length)) { // verify
-					throw new Exception('failed to read attachment data');
-				}
-
-			// assume directory path is given
-			} else {
-
-				$dir = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->option_save_attachments), DIRECTORY_SEPARATOR);
-				// check supplied directory
-				if (!is_dir($dir) || !is_writable($dir)) {
-					throw new Exception('getID3::saveAttachment() -- supplied path ('.$dir.') does not exist, or is not writable');
-				}
-
-				// set up destination path
-				$dest = $dir.DIRECTORY_SEPARATOR.$filename;
-
-				// optimize speed if read buffer size is configured to be large enough
-				// here stream_copy_to_stream() may also be used. need to do speed-compare tests
-				if ($length <= $this->fread_buffer_size()) {
-					$data = file_get_contents($this->info['filenamepath'], false, null, $offset, $length);
-					if (($data === false) || (strlen($data) != $length)) { // verify
-						throw new Exception('failed to read attachment data');
-					}
-					if (!file_put_contents($dest, $data)) {
-						throw new Exception('failed to create file '.$dest);
-					}
-				} else {
-					// optimization not available - copy data in loop
-					// here stream_copy_to_stream() shouldn't be used because it's internal read buffer may be larger than ours!
-					getid3_lib::CopyFileParts($this->info['filenamepath'], $dest, $offset, $length);
-				}
-				$ThisFileInfoIndex = $dest;
-			}
-
-		} catch (Exception $e) {
-
-			unset($ThisFileInfoIndex); // do not set any is case of error
-			$this->warning('Failed to extract attachment '.$filename.': '.$e->getMessage());
-			return false;
-
-		}
-		return true;
-	}
-
-
-	public function include_module($name) {
-		//if (!file_exists($this->include_path.'module.'.$name.'.php')) {
-		if (!file_exists(GETID3_INCLUDEPATH.'module.'.$name.'.php')) {
-			throw new getid3_exception('Required module.'.$name.'.php is missing.');
-		}
-		include_once(GETID3_INCLUDEPATH.'module.'.$name.'.php');
-		return true;
-	}
-
-}
-
-
-abstract class getid3_handler
-{
-    protected $getid3;                          // pointer
-
-    protected $data_string_flag = false;        // analyzing filepointer or string
-    protected $data_string;                     // string to analyze
-    protected $data_string_position = 0;        // seek position in string
-
-
-    public function __construct(getID3 $getid3) {
-        $this->getid3 = $getid3;
-    }
-
-
-    // Analyze from file pointer
-    abstract public function Analyze();
-
-
-    // Analyze from string instead
-    public function AnalyzeString(&$string) {
-        // Enter string mode
-        $this->data_string_flag = true;
-        $this->data_string      = $string;
-
-        // Save info
-        $saved_avdataoffset = $this->getid3->info['avdataoffset'];
-        $saved_avdataend    = $this->getid3->info['avdataend'];
-        $saved_filesize     = $this->getid3->info['filesize'];
-
-        // Reset some info
-        $this->getid3->info['avdataoffset'] = 0;
-        $this->getid3->info['avdataend']    = $this->getid3->info['filesize'] = strlen($string);
-
-        // Analyze
-        $this->Analyze();
-
-        // Restore some info
-        $this->getid3->info['avdataoffset'] = $saved_avdataoffset;
-        $this->getid3->info['avdataend']    = $saved_avdataend;
-        $this->getid3->info['filesize']     = $saved_filesize;
-
-        // Exit string mode
-        $this->data_string_flag = false;
-    }
-
-
-    protected function ftell() {
-        if ($this->data_string_flag) {
-            return $this->data_string_position;
-        }
-        return ftell($this->getid3->fp);
-    }
-
-
-    protected function fread($bytes) {
-        if ($this->data_string_flag) {
-            $this->data_string_position += $bytes;
-            return substr($this->data_string, $this->data_string_position - $bytes, $bytes);
-        }
-        return fread($this->getid3->fp, $bytes);
-    }
-
-
-    protected function fseek($bytes, $whence = SEEK_SET) {
-        if ($this->data_string_flag) {
-            switch ($whence) {
-                case SEEK_SET:
-                    $this->data_string_position = $bytes;
-                    return;
-
-                case SEEK_CUR:
-                    $this->data_string_position += $bytes;
-                    return;
-
-                case SEEK_END:
-                    $this->data_string_position = strlen($this->data_string) + $bytes;
-                    return;
-            }
-        }
-        return fseek($this->getid3->fp, $bytes, $whence);
-    }
-
-}
-
-
-class getid3_exception extends Exception
-{
-    public $message;
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.archive.gzip.php b/lib/getid3/getid3/module.archive.gzip.php
deleted file mode 100644
index c30052eda..000000000
--- a/lib/getid3/getid3/module.archive.gzip.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.archive.gzip.php                                     //
-// module for analyzing GZIP files                             //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// Module originally written by                                //
-//      Mike Mozolin <teddybear�mail*ru>                       //
-//                                                             //
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_gzip extends getid3_handler {
-
-	// public: Optional file list - disable for speed.
-	var $option_gzip_parse_contents = false; // decode gzipped files, if possible, and parse recursively (.tar.gz for example)
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat'] = 'gzip';
-
-		$start_length = 10;
-		$unpack_header = 'a1id1/a1id2/a1cmethod/a1flags/a4mtime/a1xflags/a1os';
-		//+---+---+---+---+---+---+---+---+---+---+
-		//|ID1|ID2|CM |FLG|     MTIME     |XFL|OS |
-		//+---+---+---+---+---+---+---+---+---+---+
-
-		if ($info['filesize'] > $info['php_memory_limit']) {
-			$info['error'][] = 'File is too large ('.number_format($info['filesize']).' bytes) to read into memory (limit: '.number_format($info['php_memory_limit'] / 1048576).'MB)';
-			return false;
-		}
-		fseek($this->getid3->fp, 0);
-		$buffer = fread($this->getid3->fp, $info['filesize']);
-
-		$arr_members = explode("\x1F\x8B\x08", $buffer);
-		while (true) {
-			$is_wrong_members = false;
-			$num_members = intval(count($arr_members));
-			for ($i = 0; $i < $num_members; $i++) {
-				if (strlen($arr_members[$i]) == 0) {
-					continue;
-				}
-				$buf = "\x1F\x8B\x08".$arr_members[$i];
-
-				$attr = unpack($unpack_header, substr($buf, 0, $start_length));
-				if (!$this->get_os_type(ord($attr['os']))) {
-					// Merge member with previous if wrong OS type
-					$arr_members[$i - 1] .= $buf;
-					$arr_members[$i] = '';
-					$is_wrong_members = true;
-					continue;
-				}
-			}
-			if (!$is_wrong_members) {
-				break;
-			}
-		}
-
-		$info['gzip']['files'] = array();
-
-		$fpointer = 0;
-		$idx = 0;
-		for ($i = 0; $i < $num_members; $i++) {
-			if (strlen($arr_members[$i]) == 0) {
-				continue;
-			}
-			$thisInfo = &$info['gzip']['member_header'][++$idx];
-
-			$buff = "\x1F\x8B\x08".$arr_members[$i];
-
-			$attr = unpack($unpack_header, substr($buff, 0, $start_length));
-			$thisInfo['filemtime']      = getid3_lib::LittleEndian2Int($attr['mtime']);
-			$thisInfo['raw']['id1']     = ord($attr['cmethod']);
-			$thisInfo['raw']['id2']     = ord($attr['cmethod']);
-			$thisInfo['raw']['cmethod'] = ord($attr['cmethod']);
-			$thisInfo['raw']['os']      = ord($attr['os']);
-			$thisInfo['raw']['xflags']  = ord($attr['xflags']);
-			$thisInfo['raw']['flags']   = ord($attr['flags']);
-
-			$thisInfo['flags']['crc16']    = (bool) ($thisInfo['raw']['flags'] & 0x02);
-			$thisInfo['flags']['extra']    = (bool) ($thisInfo['raw']['flags'] & 0x04);
-			$thisInfo['flags']['filename'] = (bool) ($thisInfo['raw']['flags'] & 0x08);
-			$thisInfo['flags']['comment']  = (bool) ($thisInfo['raw']['flags'] & 0x10);
-
-			$thisInfo['compression'] = $this->get_xflag_type($thisInfo['raw']['xflags']);
-
-			$thisInfo['os'] = $this->get_os_type($thisInfo['raw']['os']);
-			if (!$thisInfo['os']) {
-				$info['error'][] = 'Read error on gzip file';
-				return false;
-			}
-
-			$fpointer = 10;
-			$arr_xsubfield = array();
-			// bit 2 - FLG.FEXTRA
-			//+---+---+=================================+
-			//| XLEN  |...XLEN bytes of "extra field"...|
-			//+---+---+=================================+
-			if ($thisInfo['flags']['extra']) {
-				$w_xlen = substr($buff, $fpointer, 2);
-				$xlen = getid3_lib::LittleEndian2Int($w_xlen);
-				$fpointer += 2;
-
-				$thisInfo['raw']['xfield'] = substr($buff, $fpointer, $xlen);
-				// Extra SubFields
-				//+---+---+---+---+==================================+
-				//|SI1|SI2|  LEN  |... LEN bytes of subfield data ...|
-				//+---+---+---+---+==================================+
-				$idx = 0;
-				while (true) {
-					if ($idx >= $xlen) {
-						break;
-					}
-					$si1 = ord(substr($buff, $fpointer + $idx++, 1));
-					$si2 = ord(substr($buff, $fpointer + $idx++, 1));
-					if (($si1 == 0x41) && ($si2 == 0x70)) {
-						$w_xsublen = substr($buff, $fpointer + $idx, 2);
-						$xsublen = getid3_lib::LittleEndian2Int($w_xsublen);
-						$idx += 2;
-						$arr_xsubfield[] = substr($buff, $fpointer + $idx, $xsublen);
-						$idx += $xsublen;
-					} else {
-						break;
-					}
-				}
-				$fpointer += $xlen;
-			}
-			// bit 3 - FLG.FNAME
-			//+=========================================+
-			//|...original file name, zero-terminated...|
-			//+=========================================+
-			// GZIP files may have only one file, with no filename, so assume original filename is current filename without .gz
-			$thisInfo['filename'] = preg_replace('#\.gz$#i', '', $info['filename']);
-			if ($thisInfo['flags']['filename']) {
-				while (true) {
-					if (ord($buff[$fpointer]) == 0) {
-						$fpointer++;
-						break;
-					}
-					$thisInfo['filename'] .= $buff[$fpointer];
-					$fpointer++;
-				}
-			}
-			// bit 4 - FLG.FCOMMENT
-			//+===================================+
-			//|...file comment, zero-terminated...|
-			//+===================================+
-			if ($thisInfo['flags']['comment']) {
-				while (true) {
-					if (ord($buff[$fpointer]) == 0) {
-						$fpointer++;
-						break;
-					}
-					$thisInfo['comment'] .= $buff[$fpointer];
-					$fpointer++;
-				}
-			}
-			// bit 1 - FLG.FHCRC
-			//+---+---+
-			//| CRC16 |
-			//+---+---+
-			if ($thisInfo['flags']['crc16']) {
-				$w_crc = substr($buff, $fpointer, 2);
-				$thisInfo['crc16'] = getid3_lib::LittleEndian2Int($w_crc);
-				$fpointer += 2;
-			}
-			// bit 0 - FLG.FTEXT
-			//if ($thisInfo['raw']['flags'] & 0x01) {
-			//	Ignored...
-			//}
-			// bits 5, 6, 7 - reserved
-
-			$thisInfo['crc32']    = getid3_lib::LittleEndian2Int(substr($buff, strlen($buff) - 8, 4));
-			$thisInfo['filesize'] = getid3_lib::LittleEndian2Int(substr($buff, strlen($buff) - 4));
-
-			$info['gzip']['files'] = getid3_lib::array_merge_clobber($info['gzip']['files'], getid3_lib::CreateDeepArray($thisInfo['filename'], '/', $thisInfo['filesize']));
-
-			if ($this->option_gzip_parse_contents) {
-				// Try to inflate GZip
-				$csize = 0;
-				$inflated = '';
-				$chkcrc32 = '';
-				if (function_exists('gzinflate')) {
-					$cdata = substr($buff, $fpointer);
-					$cdata = substr($cdata, 0, strlen($cdata) - 8);
-					$csize = strlen($cdata);
-					$inflated = gzinflate($cdata);
-
-					// Calculate CRC32 for inflated content
-					$thisInfo['crc32_valid'] = (bool) (sprintf('%u', crc32($inflated)) == $thisInfo['crc32']);
-
-					// determine format
-					$formattest = substr($inflated, 0, 32774);
-					$getid3_temp = new getID3();
-					$determined_format = $getid3_temp->GetFileFormat($formattest);
-					unset($getid3_temp);
-
-					// file format is determined
-					$determined_format['module'] = (isset($determined_format['module']) ? $determined_format['module'] : '');
-					switch ($determined_format['module']) {
-						case 'tar':
-							// view TAR-file info
-							if (file_exists(GETID3_INCLUDEPATH.$determined_format['include']) && include_once(GETID3_INCLUDEPATH.$determined_format['include'])) {
-								if (($temp_tar_filename = tempnam(GETID3_TEMP_DIR, 'getID3')) === false) {
-									// can't find anywhere to create a temp file, abort
-									$info['error'][] = 'Unable to create temp file to parse TAR inside GZIP file';
-									break;
-								}
-								if ($fp_temp_tar = fopen($temp_tar_filename, 'w+b')) {
-									fwrite($fp_temp_tar, $inflated);
-									fclose($fp_temp_tar);
-									$getid3_temp = new getID3();
-									$getid3_temp->openfile($temp_tar_filename);
-									$getid3_tar = new getid3_tar($getid3_temp);
-									$getid3_tar->Analyze();
-									$info['gzip']['member_header'][$idx]['tar'] = $getid3_temp->info['tar'];
-									unset($getid3_temp, $getid3_tar);
-									unlink($temp_tar_filename);
-								} else {
-									$info['error'][] = 'Unable to fopen() temp file to parse TAR inside GZIP file';
-									break;
-								}
-							}
-							break;
-
-						case '':
-						default:
-							// unknown or unhandled format
-							break;
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-	// Converts the OS type
-	function get_os_type($key) {
-		static $os_type = array(
-			'0'   => 'FAT filesystem (MS-DOS, OS/2, NT/Win32)',
-			'1'   => 'Amiga',
-			'2'   => 'VMS (or OpenVMS)',
-			'3'   => 'Unix',
-			'4'   => 'VM/CMS',
-			'5'   => 'Atari TOS',
-			'6'   => 'HPFS filesystem (OS/2, NT)',
-			'7'   => 'Macintosh',
-			'8'   => 'Z-System',
-			'9'   => 'CP/M',
-			'10'  => 'TOPS-20',
-			'11'  => 'NTFS filesystem (NT)',
-			'12'  => 'QDOS',
-			'13'  => 'Acorn RISCOS',
-			'255' => 'unknown'
-		);
-		return (isset($os_type[$key]) ? $os_type[$key] : '');
-	}
-
-	// Converts the eXtra FLags
-	function get_xflag_type($key) {
-		static $xflag_type = array(
-			'0' => 'unknown',
-			'2' => 'maximum compression',
-			'4' => 'fastest algorithm'
-		);
-		return (isset($xflag_type[$key]) ? $xflag_type[$key] : '');
-	}
-}
-
-?>
diff --git a/lib/getid3/getid3/module.archive.rar.php b/lib/getid3/getid3/module.archive.rar.php
deleted file mode 100644
index 4f5d46f83..000000000
--- a/lib/getid3/getid3/module.archive.rar.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.archive.rar.php                                      //
-// module for analyzing RAR files                              //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_rar extends getid3_handler
-{
-
-	var $option_use_rar_extension = false;
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat'] = 'rar';
-
-		if ($this->option_use_rar_extension === true) {
-			if (function_exists('rar_open')) {
-				if ($rp = rar_open($info['filenamepath'])) {
-					$info['rar']['files'] = array();
-					$entries = rar_list($rp);
-					foreach ($entries as $entry) {
-						$info['rar']['files'] = getid3_lib::array_merge_clobber($info['rar']['files'], getid3_lib::CreateDeepArray($entry->getName(), '/', $entry->getUnpackedSize()));
-					}
-					rar_close($rp);
-					return true;
-				} else {
-					$info['error'][] = 'failed to rar_open('.$info['filename'].')';
-				}
-			} else {
-				$info['error'][] = 'RAR support does not appear to be available in this PHP installation';
-			}
-		} else {
-			$info['error'][] = 'PHP-RAR processing has been disabled (set $getid3_rar->option_use_rar_extension=true to enable)';
-		}
-		return false;
-
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.archive.szip.php b/lib/getid3/getid3/module.archive.szip.php
deleted file mode 100644
index 3be625326..000000000
--- a/lib/getid3/getid3/module.archive.szip.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.archive.szip.php                                     //
-// module for analyzing SZIP compressed files                  //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_szip extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$SZIPHeader = fread($this->getid3->fp, 6);
-		if (substr($SZIPHeader, 0, 4) != "SZ\x0A\x04") {
-			$info['error'][] = 'Expecting "53 5A 0A 04" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($SZIPHeader, 0, 4)).'"';
-			return false;
-		}
-		$info['fileformat']            = 'szip';
-		$info['szip']['major_version'] = getid3_lib::BigEndian2Int(substr($SZIPHeader, 4, 1));
-		$info['szip']['minor_version'] = getid3_lib::BigEndian2Int(substr($SZIPHeader, 5, 1));
-
-		while (!feof($this->getid3->fp)) {
-			$NextBlockID = fread($this->getid3->fp, 2);
-			switch ($NextBlockID) {
-				case 'SZ':
-					// Note that szip files can be concatenated, this has the same effect as
-					// concatenating the files. this also means that global header blocks
-					// might be present between directory/data blocks.
-					fseek($this->getid3->fp, 4, SEEK_CUR);
-					break;
-
-				case 'BH':
-					$BHheaderbytes  = getid3_lib::BigEndian2Int(fread($this->getid3->fp, 3));
-					$BHheaderdata   = fread($this->getid3->fp, $BHheaderbytes);
-					$BHheaderoffset = 0;
-					while (strpos($BHheaderdata, "\x00", $BHheaderoffset) > 0) {
-						//filename as \0 terminated string  (empty string indicates end)
-						//owner as \0 terminated string (empty is same as last file)
-						//group as \0 terminated string (empty is same as last file)
-						//3 byte filelength in this block
-						//2 byte access flags
-						//4 byte creation time (like in unix)
-						//4 byte modification time (like in unix)
-						//4 byte access time (like in unix)
-
-						$BHdataArray['filename'] = substr($BHheaderdata, $BHheaderoffset, strcspn($BHheaderdata, "\x00"));
-						$BHheaderoffset += (strlen($BHdataArray['filename']) + 1);
-
-						$BHdataArray['owner'] = substr($BHheaderdata, $BHheaderoffset, strcspn($BHheaderdata, "\x00"));
-						$BHheaderoffset += (strlen($BHdataArray['owner']) + 1);
-
-						$BHdataArray['group'] = substr($BHheaderdata, $BHheaderoffset, strcspn($BHheaderdata, "\x00"));
-						$BHheaderoffset += (strlen($BHdataArray['group']) + 1);
-
-						$BHdataArray['filelength'] = getid3_lib::BigEndian2Int(substr($BHheaderdata, $BHheaderoffset, 3));
-						$BHheaderoffset += 3;
-
-						$BHdataArray['access_flags'] = getid3_lib::BigEndian2Int(substr($BHheaderdata, $BHheaderoffset, 2));
-						$BHheaderoffset += 2;
-
-						$BHdataArray['creation_time'] = getid3_lib::BigEndian2Int(substr($BHheaderdata, $BHheaderoffset, 4));
-						$BHheaderoffset += 4;
-
-						$BHdataArray['modification_time'] = getid3_lib::BigEndian2Int(substr($BHheaderdata, $BHheaderoffset, 4));
-						$BHheaderoffset += 4;
-
-						$BHdataArray['access_time'] = getid3_lib::BigEndian2Int(substr($BHheaderdata, $BHheaderoffset, 4));
-						$BHheaderoffset += 4;
-
-						$info['szip']['BH'][] = $BHdataArray;
-					}
-					break;
-
-				default:
-					break 2;
-			}
-		}
-
-		return true;
-
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.archive.tar.php b/lib/getid3/getid3/module.archive.tar.php
deleted file mode 100644
index 94d320398..000000000
--- a/lib/getid3/getid3/module.archive.tar.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.archive.tar.php                                      //
-// module for analyzing TAR files                              //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// Module originally written by                                //
-//      Mike Mozolin <teddybear�mail*ru>                       //
-//                                                             //
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_tar extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat'] = 'tar';
-		$info['tar']['files'] = array();
-
-		$unpack_header = 'a100fname/a8mode/a8uid/a8gid/a12size/a12mtime/a8chksum/a1typflag/a100lnkname/a6magic/a2ver/a32uname/a32gname/a8devmaj/a8devmin/a155prefix';
-		$null_512k = str_repeat("\x00", 512); // end-of-file marker
-
-		fseek($this->getid3->fp, 0);
-		while (!feof($this->getid3->fp)) {
-			$buffer = fread($this->getid3->fp, 512);
-			if (strlen($buffer) < 512) {
-				break;
-			}
-
-			// check the block
-			$checksum = 0;
-			for ($i = 0; $i < 148; $i++) {
-				$checksum += ord($buffer{$i});
-			}
-			for ($i = 148; $i < 156; $i++) {
-				$checksum += ord(' ');
-			}
-			for ($i = 156; $i < 512; $i++) {
-				$checksum += ord($buffer{$i});
-			}
-			$attr    = unpack($unpack_header, $buffer);
-			$name    =       (isset($attr['fname']  ) ? trim($attr['fname']  ) : '');
-			$mode    = octdec(isset($attr['mode']   ) ? trim($attr['mode']   ) : '');
-			$uid     = octdec(isset($attr['uid']    ) ? trim($attr['uid']    ) : '');
-			$gid     = octdec(isset($attr['gid']    ) ? trim($attr['gid']    ) : '');
-			$size    = octdec(isset($attr['size']   ) ? trim($attr['size']   ) : '');
-			$mtime   = octdec(isset($attr['mtime']  ) ? trim($attr['mtime']  ) : '');
-			$chksum  = octdec(isset($attr['chksum'] ) ? trim($attr['chksum'] ) : '');
-			$typflag =       (isset($attr['typflag']) ? trim($attr['typflag']) : '');
-			$lnkname =       (isset($attr['lnkname']) ? trim($attr['lnkname']) : '');
-			$magic   =       (isset($attr['magic']  ) ? trim($attr['magic']  ) : '');
-			$ver     =       (isset($attr['ver']    ) ? trim($attr['ver']    ) : '');
-			$uname   =       (isset($attr['uname']  ) ? trim($attr['uname']  ) : '');
-			$gname   =       (isset($attr['gname']  ) ? trim($attr['gname']  ) : '');
-			$devmaj  = octdec(isset($attr['devmaj'] ) ? trim($attr['devmaj'] ) : '');
-			$devmin  = octdec(isset($attr['devmin'] ) ? trim($attr['devmin'] ) : '');
-			$prefix  =       (isset($attr['prefix'] ) ? trim($attr['prefix'] ) : '');
-			if (($checksum == 256) && ($chksum == 0)) {
-				// EOF Found
-				break;
-			}
-			if ($prefix) {
-				$name = $prefix.'/'.$name;
-			}
-			if ((preg_match('#/$#', $name)) && !$name) {
-				$typeflag = 5;
-			}
-			if ($buffer == $null_512k) {
-				// it's the end of the tar-file...
-				break;
-			}
-
-			// Read to the next chunk
-			fseek($this->getid3->fp, $size, SEEK_CUR);
-
-			$diff = $size % 512;
-			if ($diff != 0) {
-				// Padding, throw away
-				fseek($this->getid3->fp, (512 - $diff), SEEK_CUR);
-			}
-			// Protect against tar-files with garbage at the end
-			if ($name == '') {
-				break;
-			}
-			$info['tar']['file_details'][$name] = array (
-				'name'     => $name,
-				'mode_raw' => $mode,
-				'mode'     => getid3_tar::display_perms($mode),
-				'uid'      => $uid,
-				'gid'      => $gid,
-				'size'     => $size,
-				'mtime'    => $mtime,
-				'chksum'   => $chksum,
-				'typeflag' => getid3_tar::get_flag_type($typflag),
-				'linkname' => $lnkname,
-				'magic'    => $magic,
-				'version'  => $ver,
-				'uname'    => $uname,
-				'gname'    => $gname,
-				'devmajor' => $devmaj,
-				'devminor' => $devmin
-			);
-			$info['tar']['files'] = getid3_lib::array_merge_clobber($info['tar']['files'], getid3_lib::CreateDeepArray($info['tar']['file_details'][$name]['name'], '/', $size));
-		}
-		return true;
-	}
-
-	// Parses the file mode to file permissions
-	function display_perms($mode) {
-		// Determine Type
-		if     ($mode & 0x1000) $type='p'; // FIFO pipe
-		elseif ($mode & 0x2000) $type='c'; // Character special
-		elseif ($mode & 0x4000) $type='d'; // Directory
-		elseif ($mode & 0x6000) $type='b'; // Block special
-		elseif ($mode & 0x8000) $type='-'; // Regular
-		elseif ($mode & 0xA000) $type='l'; // Symbolic Link
-		elseif ($mode & 0xC000) $type='s'; // Socket
-		else                    $type='u'; // UNKNOWN
-
-		// Determine permissions
-		$owner['read']    = (($mode & 00400) ? 'r' : '-');
-		$owner['write']   = (($mode & 00200) ? 'w' : '-');
-		$owner['execute'] = (($mode & 00100) ? 'x' : '-');
-		$group['read']    = (($mode & 00040) ? 'r' : '-');
-		$group['write']   = (($mode & 00020) ? 'w' : '-');
-		$group['execute'] = (($mode & 00010) ? 'x' : '-');
-		$world['read']    = (($mode & 00004) ? 'r' : '-');
-		$world['write']   = (($mode & 00002) ? 'w' : '-');
-		$world['execute'] = (($mode & 00001) ? 'x' : '-');
-
-		// Adjust for SUID, SGID and sticky bit
-		if ($mode & 0x800) $owner['execute'] = ($owner['execute'] == 'x') ? 's' : 'S';
-		if ($mode & 0x400) $group['execute'] = ($group['execute'] == 'x') ? 's' : 'S';
-		if ($mode & 0x200) $world['execute'] = ($world['execute'] == 'x') ? 't' : 'T';
-
-		$s  = sprintf('%1s', $type);
-		$s .= sprintf('%1s%1s%1s',      $owner['read'], $owner['write'], $owner['execute']);
-		$s .= sprintf('%1s%1s%1s',      $group['read'], $group['write'], $group['execute']);
-		$s .= sprintf('%1s%1s%1s'."\n", $world['read'], $world['write'], $world['execute']);
-		return $s;
-	}
-
-	// Converts the file type
-	function get_flag_type($typflag) {
-		static $flag_types = array(
-			'0' => 'LF_NORMAL',
-			'1' => 'LF_LINK',
-			'2' => 'LF_SYNLINK',
-			'3' => 'LF_CHR',
-			'4' => 'LF_BLK',
-			'5' => 'LF_DIR',
-			'6' => 'LF_FIFO',
-			'7' => 'LF_CONFIG',
-			'D' => 'LF_DUMPDIR',
-			'K' => 'LF_LONGLINK',
-			'L' => 'LF_LONGNAME',
-			'M' => 'LF_MULTIVOL',
-			'N' => 'LF_NAMES',
-			'S' => 'LF_SPARSE',
-			'V' => 'LF_VOLHDR'
-		);
-		return (isset($flag_types[$typflag]) ? $flag_types[$typflag] : '');
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.archive.zip.php b/lib/getid3/getid3/module.archive.zip.php
deleted file mode 100644
index 7db8fd23f..000000000
--- a/lib/getid3/getid3/module.archive.zip.php
+++ /dev/null
@@ -1,424 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.archive.zip.php                                      //
-// module for analyzing pkZip files                            //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_zip extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat']      = 'zip';
-		$info['zip']['encoding'] = 'ISO-8859-1';
-		$info['zip']['files']    = array();
-
-		$info['zip']['compressed_size']   = 0;
-		$info['zip']['uncompressed_size'] = 0;
-		$info['zip']['entries_count']     = 0;
-
-		if (!getid3_lib::intValueSupported($info['filesize'])) {
-			$info['error'][] = 'File is larger than '.round(PHP_INT_MAX / 1073741824).'GB, not supported by PHP';
-			return false;
-		} else {
-			$EOCDsearchData    = '';
-			$EOCDsearchCounter = 0;
-			while ($EOCDsearchCounter++ < 512) {
-
-				fseek($this->getid3->fp, -128 * $EOCDsearchCounter, SEEK_END);
-				$EOCDsearchData = fread($this->getid3->fp, 128).$EOCDsearchData;
-
-				if (strstr($EOCDsearchData, 'PK'."\x05\x06")) {
-
-					$EOCDposition = strpos($EOCDsearchData, 'PK'."\x05\x06");
-					fseek($this->getid3->fp, (-128 * $EOCDsearchCounter) + $EOCDposition, SEEK_END);
-					$info['zip']['end_central_directory'] = $this->ZIPparseEndOfCentralDirectory();
-
-					fseek($this->getid3->fp, $info['zip']['end_central_directory']['directory_offset'], SEEK_SET);
-					$info['zip']['entries_count'] = 0;
-					while ($centraldirectoryentry = $this->ZIPparseCentralDirectory($this->getid3->fp)) {
-						$info['zip']['central_directory'][] = $centraldirectoryentry;
-						$info['zip']['entries_count']++;
-						$info['zip']['compressed_size']   += $centraldirectoryentry['compressed_size'];
-						$info['zip']['uncompressed_size'] += $centraldirectoryentry['uncompressed_size'];
-
-						if ($centraldirectoryentry['uncompressed_size'] > 0) {
-							$info['zip']['files'] = getid3_lib::array_merge_clobber($info['zip']['files'], getid3_lib::CreateDeepArray($centraldirectoryentry['filename'], '/', $centraldirectoryentry['uncompressed_size']));
-						}
-					}
-
-					if ($info['zip']['entries_count'] == 0) {
-						$info['error'][] = 'No Central Directory entries found (truncated file?)';
-						return false;
-					}
-
-					if (!empty($info['zip']['end_central_directory']['comment'])) {
-						$info['zip']['comments']['comment'][] = $info['zip']['end_central_directory']['comment'];
-					}
-
-					if (isset($info['zip']['central_directory'][0]['compression_method'])) {
-						$info['zip']['compression_method'] = $info['zip']['central_directory'][0]['compression_method'];
-					}
-					if (isset($info['zip']['central_directory'][0]['flags']['compression_speed'])) {
-						$info['zip']['compression_speed']  = $info['zip']['central_directory'][0]['flags']['compression_speed'];
-					}
-					if (isset($info['zip']['compression_method']) && ($info['zip']['compression_method'] == 'store') && !isset($info['zip']['compression_speed'])) {
-						$info['zip']['compression_speed']  = 'store';
-					}
-
-					return true;
-
-				}
-			}
-		}
-
-		if ($this->getZIPentriesFilepointer()) {
-
-			// central directory couldn't be found and/or parsed
-			// scan through actual file data entries, recover as much as possible from probable trucated file
-			if ($info['zip']['compressed_size'] > ($info['filesize'] - 46 - 22)) {
-				$info['error'][] = 'Warning: Truncated file! - Total compressed file sizes ('.$info['zip']['compressed_size'].' bytes) is greater than filesize minus Central Directory and End Of Central Directory structures ('.($info['filesize'] - 46 - 22).' bytes)';
-			}
-			$info['error'][] = 'Cannot find End Of Central Directory - returned list of files in [zip][entries] array may not be complete';
-			foreach ($info['zip']['entries'] as $key => $valuearray) {
-				$info['zip']['files'][$valuearray['filename']] = $valuearray['uncompressed_size'];
-			}
-			return true;
-
-		} else {
-
-			unset($info['zip']);
-			$info['fileformat'] = '';
-			$info['error'][] = 'Cannot find End Of Central Directory (truncated file?)';
-			return false;
-
-		}
-	}
-
-
-	function getZIPHeaderFilepointerTopDown() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat'] = 'zip';
-
-		$info['zip']['compressed_size']   = 0;
-		$info['zip']['uncompressed_size'] = 0;
-		$info['zip']['entries_count']     = 0;
-
-		rewind($this->getid3->fp);
-		while ($fileentry = $this->ZIPparseLocalFileHeader()) {
-			$info['zip']['entries'][] = $fileentry;
-			$info['zip']['entries_count']++;
-		}
-		if ($info['zip']['entries_count'] == 0) {
-			$info['error'][] = 'No Local File Header entries found';
-			return false;
-		}
-
-		$info['zip']['entries_count']     = 0;
-		while ($centraldirectoryentry = $this->ZIPparseCentralDirectory($this->getid3->fp)) {
-			$info['zip']['central_directory'][] = $centraldirectoryentry;
-			$info['zip']['entries_count']++;
-			$info['zip']['compressed_size']   += $centraldirectoryentry['compressed_size'];
-			$info['zip']['uncompressed_size'] += $centraldirectoryentry['uncompressed_size'];
-		}
-		if ($info['zip']['entries_count'] == 0) {
-			$info['error'][] = 'No Central Directory entries found (truncated file?)';
-			return false;
-		}
-
-		if ($EOCD = $this->ZIPparseEndOfCentralDirectory()) {
-			$info['zip']['end_central_directory'] = $EOCD;
-		} else {
-			$info['error'][] = 'No End Of Central Directory entry found (truncated file?)';
-			return false;
-		}
-
-		if (!empty($info['zip']['end_central_directory']['comment'])) {
-			$info['zip']['comments']['comment'][] = $info['zip']['end_central_directory']['comment'];
-		}
-
-		return true;
-	}
-
-
-	function getZIPentriesFilepointer() {
-		$info = &$this->getid3->info;
-
-		$info['zip']['compressed_size']   = 0;
-		$info['zip']['uncompressed_size'] = 0;
-		$info['zip']['entries_count']     = 0;
-
-		rewind($this->getid3->fp);
-		while ($fileentry = $this->ZIPparseLocalFileHeader()) {
-			$info['zip']['entries'][] = $fileentry;
-			$info['zip']['entries_count']++;
-			$info['zip']['compressed_size']   += $fileentry['compressed_size'];
-			$info['zip']['uncompressed_size'] += $fileentry['uncompressed_size'];
-		}
-		if ($info['zip']['entries_count'] == 0) {
-			$info['error'][] = 'No Local File Header entries found';
-			return false;
-		}
-
-		return true;
-	}
-
-
-	function ZIPparseLocalFileHeader() {
-		$LocalFileHeader['offset'] = ftell($this->getid3->fp);
-
-		$ZIPlocalFileHeader = fread($this->getid3->fp, 30);
-
-		$LocalFileHeader['raw']['signature']          = getid3_lib::LittleEndian2Int(substr($ZIPlocalFileHeader,  0, 4));
-		if ($LocalFileHeader['raw']['signature'] != 0x04034B50) {
-			// invalid Local File Header Signature
-			fseek($this->getid3->fp, $LocalFileHeader['offset'], SEEK_SET); // seek back to where filepointer originally was so it can be handled properly
-			return false;
-		}
-		$LocalFileHeader['raw']['extract_version']    = getid3_lib::LittleEndian2Int(substr($ZIPlocalFileHeader,  4, 2));
-		$LocalFileHeader['raw']['general_flags']      = getid3_lib::LittleEndian2Int(substr($ZIPlocalFileHeader,  6, 2));
-		$LocalFileHeader['raw']['compression_method'] = getid3_lib::LittleEndian2Int(substr($ZIPlocalFileHeader,  8, 2));
-		$LocalFileHeader['raw']['last_mod_file_time'] = getid3_lib::LittleEndian2Int(substr($ZIPlocalFileHeader, 10, 2));
-		$LocalFileHeader['raw']['last_mod_file_date'] = getid3_lib::LittleEndian2Int(substr($ZIPlocalFileHeader, 12, 2));
-		$LocalFileHeader['raw']['crc_32']             = getid3_lib::LittleEndian2Int(substr($ZIPlocalFileHeader, 14, 4));
-		$LocalFileHeader['raw']['compressed_size']    = getid3_lib::LittleEndian2Int(substr($ZIPlocalFileHeader, 18, 4));
-		$LocalFileHeader['raw']['uncompressed_size']  = getid3_lib::LittleEndian2Int(substr($ZIPlocalFileHeader, 22, 4));
-		$LocalFileHeader['raw']['filename_length']    = getid3_lib::LittleEndian2Int(substr($ZIPlocalFileHeader, 26, 2));
-		$LocalFileHeader['raw']['extra_field_length'] = getid3_lib::LittleEndian2Int(substr($ZIPlocalFileHeader, 28, 2));
-
-		$LocalFileHeader['extract_version']           = sprintf('%1.1f', $LocalFileHeader['raw']['extract_version'] / 10);
-		$LocalFileHeader['host_os']                   = $this->ZIPversionOSLookup(($LocalFileHeader['raw']['extract_version'] & 0xFF00) >> 8);
-		$LocalFileHeader['compression_method']        = $this->ZIPcompressionMethodLookup($LocalFileHeader['raw']['compression_method']);
-		$LocalFileHeader['compressed_size']           = $LocalFileHeader['raw']['compressed_size'];
-		$LocalFileHeader['uncompressed_size']         = $LocalFileHeader['raw']['uncompressed_size'];
-		$LocalFileHeader['flags']                     = $this->ZIPparseGeneralPurposeFlags($LocalFileHeader['raw']['general_flags'], $LocalFileHeader['raw']['compression_method']);
-		$LocalFileHeader['last_modified_timestamp']   = $this->DOStime2UNIXtime($LocalFileHeader['raw']['last_mod_file_date'], $LocalFileHeader['raw']['last_mod_file_time']);
-
-		$FilenameExtrafieldLength = $LocalFileHeader['raw']['filename_length'] + $LocalFileHeader['raw']['extra_field_length'];
-		if ($FilenameExtrafieldLength > 0) {
-			$ZIPlocalFileHeader .= fread($this->getid3->fp, $FilenameExtrafieldLength);
-
-			if ($LocalFileHeader['raw']['filename_length'] > 0) {
-				$LocalFileHeader['filename']                = substr($ZIPlocalFileHeader, 30, $LocalFileHeader['raw']['filename_length']);
-			}
-			if ($LocalFileHeader['raw']['extra_field_length'] > 0) {
-				$LocalFileHeader['raw']['extra_field_data'] = substr($ZIPlocalFileHeader, 30 + $LocalFileHeader['raw']['filename_length'], $LocalFileHeader['raw']['extra_field_length']);
-			}
-		}
-
-		$LocalFileHeader['data_offset'] = ftell($this->getid3->fp);
-		//$LocalFileHeader['compressed_data'] = fread($this->getid3->fp, $LocalFileHeader['raw']['compressed_size']);
-		fseek($this->getid3->fp, $LocalFileHeader['raw']['compressed_size'], SEEK_CUR);
-
-		if ($LocalFileHeader['flags']['data_descriptor_used']) {
-			$DataDescriptor = fread($this->getid3->fp, 12);
-			$LocalFileHeader['data_descriptor']['crc_32']            = getid3_lib::LittleEndian2Int(substr($DataDescriptor,  0, 4));
-			$LocalFileHeader['data_descriptor']['compressed_size']   = getid3_lib::LittleEndian2Int(substr($DataDescriptor,  4, 4));
-			$LocalFileHeader['data_descriptor']['uncompressed_size'] = getid3_lib::LittleEndian2Int(substr($DataDescriptor,  8, 4));
-		}
-
-		return $LocalFileHeader;
-	}
-
-
-	function ZIPparseCentralDirectory() {
-		$CentralDirectory['offset'] = ftell($this->getid3->fp);
-
-		$ZIPcentralDirectory = fread($this->getid3->fp, 46);
-
-		$CentralDirectory['raw']['signature']            = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory,  0, 4));
-		if ($CentralDirectory['raw']['signature'] != 0x02014B50) {
-			// invalid Central Directory Signature
-			fseek($this->getid3->fp, $CentralDirectory['offset'], SEEK_SET); // seek back to where filepointer originally was so it can be handled properly
-			return false;
-		}
-		$CentralDirectory['raw']['create_version']       = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory,  4, 2));
-		$CentralDirectory['raw']['extract_version']      = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory,  6, 2));
-		$CentralDirectory['raw']['general_flags']        = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory,  8, 2));
-		$CentralDirectory['raw']['compression_method']   = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory, 10, 2));
-		$CentralDirectory['raw']['last_mod_file_time']   = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory, 12, 2));
-		$CentralDirectory['raw']['last_mod_file_date']   = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory, 14, 2));
-		$CentralDirectory['raw']['crc_32']               = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory, 16, 4));
-		$CentralDirectory['raw']['compressed_size']      = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory, 20, 4));
-		$CentralDirectory['raw']['uncompressed_size']    = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory, 24, 4));
-		$CentralDirectory['raw']['filename_length']      = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory, 28, 2));
-		$CentralDirectory['raw']['extra_field_length']   = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory, 30, 2));
-		$CentralDirectory['raw']['file_comment_length']  = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory, 32, 2));
-		$CentralDirectory['raw']['disk_number_start']    = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory, 34, 2));
-		$CentralDirectory['raw']['internal_file_attrib'] = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory, 36, 2));
-		$CentralDirectory['raw']['external_file_attrib'] = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory, 38, 4));
-		$CentralDirectory['raw']['local_header_offset']  = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory, 42, 4));
-
-		$CentralDirectory['entry_offset']              = $CentralDirectory['raw']['local_header_offset'];
-		$CentralDirectory['create_version']            = sprintf('%1.1f', $CentralDirectory['raw']['create_version'] / 10);
-		$CentralDirectory['extract_version']           = sprintf('%1.1f', $CentralDirectory['raw']['extract_version'] / 10);
-		$CentralDirectory['host_os']                   = $this->ZIPversionOSLookup(($CentralDirectory['raw']['extract_version'] & 0xFF00) >> 8);
-		$CentralDirectory['compression_method']        = $this->ZIPcompressionMethodLookup($CentralDirectory['raw']['compression_method']);
-		$CentralDirectory['compressed_size']           = $CentralDirectory['raw']['compressed_size'];
-		$CentralDirectory['uncompressed_size']         = $CentralDirectory['raw']['uncompressed_size'];
-		$CentralDirectory['flags']                     = $this->ZIPparseGeneralPurposeFlags($CentralDirectory['raw']['general_flags'], $CentralDirectory['raw']['compression_method']);
-		$CentralDirectory['last_modified_timestamp']   = $this->DOStime2UNIXtime($CentralDirectory['raw']['last_mod_file_date'], $CentralDirectory['raw']['last_mod_file_time']);
-
-		$FilenameExtrafieldCommentLength = $CentralDirectory['raw']['filename_length'] + $CentralDirectory['raw']['extra_field_length'] + $CentralDirectory['raw']['file_comment_length'];
-		if ($FilenameExtrafieldCommentLength > 0) {
-			$FilenameExtrafieldComment = fread($this->getid3->fp, $FilenameExtrafieldCommentLength);
-
-			if ($CentralDirectory['raw']['filename_length'] > 0) {
-				$CentralDirectory['filename']                  = substr($FilenameExtrafieldComment, 0, $CentralDirectory['raw']['filename_length']);
-			}
-			if ($CentralDirectory['raw']['extra_field_length'] > 0) {
-				$CentralDirectory['raw']['extra_field_data']   = substr($FilenameExtrafieldComment, $CentralDirectory['raw']['filename_length'], $CentralDirectory['raw']['extra_field_length']);
-			}
-			if ($CentralDirectory['raw']['file_comment_length'] > 0) {
-				$CentralDirectory['file_comment']              = substr($FilenameExtrafieldComment, $CentralDirectory['raw']['filename_length'] + $CentralDirectory['raw']['extra_field_length'], $CentralDirectory['raw']['file_comment_length']);
-			}
-		}
-
-		return $CentralDirectory;
-	}
-
-	function ZIPparseEndOfCentralDirectory() {
-		$EndOfCentralDirectory['offset'] = ftell($this->getid3->fp);
-
-		$ZIPendOfCentralDirectory = fread($this->getid3->fp, 22);
-
-		$EndOfCentralDirectory['signature']                   = getid3_lib::LittleEndian2Int(substr($ZIPendOfCentralDirectory,  0, 4));
-		if ($EndOfCentralDirectory['signature'] != 0x06054B50) {
-			// invalid End Of Central Directory Signature
-			fseek($this->getid3->fp, $EndOfCentralDirectory['offset'], SEEK_SET); // seek back to where filepointer originally was so it can be handled properly
-			return false;
-		}
-		$EndOfCentralDirectory['disk_number_current']         = getid3_lib::LittleEndian2Int(substr($ZIPendOfCentralDirectory,  4, 2));
-		$EndOfCentralDirectory['disk_number_start_directory'] = getid3_lib::LittleEndian2Int(substr($ZIPendOfCentralDirectory,  6, 2));
-		$EndOfCentralDirectory['directory_entries_this_disk'] = getid3_lib::LittleEndian2Int(substr($ZIPendOfCentralDirectory,  8, 2));
-		$EndOfCentralDirectory['directory_entries_total']     = getid3_lib::LittleEndian2Int(substr($ZIPendOfCentralDirectory, 10, 2));
-		$EndOfCentralDirectory['directory_size']              = getid3_lib::LittleEndian2Int(substr($ZIPendOfCentralDirectory, 12, 4));
-		$EndOfCentralDirectory['directory_offset']            = getid3_lib::LittleEndian2Int(substr($ZIPendOfCentralDirectory, 16, 4));
-		$EndOfCentralDirectory['comment_length']              = getid3_lib::LittleEndian2Int(substr($ZIPendOfCentralDirectory, 20, 2));
-
-		if ($EndOfCentralDirectory['comment_length'] > 0) {
-			$EndOfCentralDirectory['comment']                 = fread($this->getid3->fp, $EndOfCentralDirectory['comment_length']);
-		}
-
-		return $EndOfCentralDirectory;
-	}
-
-
-	static function ZIPparseGeneralPurposeFlags($flagbytes, $compressionmethod) {
-		$ParsedFlags['encrypted'] = (bool) ($flagbytes & 0x0001);
-
-		switch ($compressionmethod) {
-			case 6:
-				$ParsedFlags['dictionary_size']    = (($flagbytes & 0x0002) ? 8192 : 4096);
-				$ParsedFlags['shannon_fano_trees'] = (($flagbytes & 0x0004) ? 3    : 2);
-				break;
-
-			case 8:
-			case 9:
-				switch (($flagbytes & 0x0006) >> 1) {
-					case 0:
-						$ParsedFlags['compression_speed'] = 'normal';
-						break;
-					case 1:
-						$ParsedFlags['compression_speed'] = 'maximum';
-						break;
-					case 2:
-						$ParsedFlags['compression_speed'] = 'fast';
-						break;
-					case 3:
-						$ParsedFlags['compression_speed'] = 'superfast';
-						break;
-				}
-				break;
-		}
-		$ParsedFlags['data_descriptor_used']       = (bool) ($flagbytes & 0x0008);
-
-		return $ParsedFlags;
-	}
-
-
-	static function ZIPversionOSLookup($index) {
-		static $ZIPversionOSLookup = array(
-			0  => 'MS-DOS and OS/2 (FAT / VFAT / FAT32 file systems)',
-			1  => 'Amiga',
-			2  => 'OpenVMS',
-			3  => 'Unix',
-			4  => 'VM/CMS',
-			5  => 'Atari ST',
-			6  => 'OS/2 H.P.F.S.',
-			7  => 'Macintosh',
-			8  => 'Z-System',
-			9  => 'CP/M',
-			10 => 'Windows NTFS',
-			11 => 'MVS',
-			12 => 'VSE',
-			13 => 'Acorn Risc',
-			14 => 'VFAT',
-			15 => 'Alternate MVS',
-			16 => 'BeOS',
-			17 => 'Tandem'
-		);
-
-		return (isset($ZIPversionOSLookup[$index]) ? $ZIPversionOSLookup[$index] : '[unknown]');
-	}
-
-	static function ZIPcompressionMethodLookup($index) {
-		static $ZIPcompressionMethodLookup = array(
-			0  => 'store',
-			1  => 'shrink',
-			2  => 'reduce-1',
-			3  => 'reduce-2',
-			4  => 'reduce-3',
-			5  => 'reduce-4',
-			6  => 'implode',
-			7  => 'tokenize',
-			8  => 'deflate',
-			9  => 'deflate64',
-			10 => 'PKWARE Date Compression Library Imploding'
-		);
-
-		return (isset($ZIPcompressionMethodLookup[$index]) ? $ZIPcompressionMethodLookup[$index] : '[unknown]');
-	}
-
-	static function DOStime2UNIXtime($DOSdate, $DOStime) {
-		// wFatDate
-		// Specifies the MS-DOS date. The date is a packed 16-bit value with the following format:
-		// Bits      Contents
-		// 0-4    Day of the month (1-31)
-		// 5-8    Month (1 = January, 2 = February, and so on)
-		// 9-15   Year offset from 1980 (add 1980 to get actual year)
-
-		$UNIXday    =  ($DOSdate & 0x001F);
-		$UNIXmonth  = (($DOSdate & 0x01E0) >> 5);
-		$UNIXyear   = (($DOSdate & 0xFE00) >> 9) + 1980;
-
-		// wFatTime
-		// Specifies the MS-DOS time. The time is a packed 16-bit value with the following format:
-		// Bits   Contents
-		// 0-4    Second divided by 2
-		// 5-10   Minute (0-59)
-		// 11-15  Hour (0-23 on a 24-hour clock)
-
-		$UNIXsecond =  ($DOStime & 0x001F) * 2;
-		$UNIXminute = (($DOStime & 0x07E0) >> 5);
-		$UNIXhour   = (($DOStime & 0xF800) >> 11);
-
-		return gmmktime($UNIXhour, $UNIXminute, $UNIXsecond, $UNIXmonth, $UNIXday, $UNIXyear);
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio-video.asf.php b/lib/getid3/getid3/module.audio-video.asf.php
deleted file mode 100644
index 0bb095f52..000000000
--- a/lib/getid3/getid3/module.audio-video.asf.php
+++ /dev/null
@@ -1,2021 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio-video.asf.php                                  //
-// module for analyzing ASF, WMA and WMV files                 //
-// dependencies: module.audio-video.riff.php                   //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
-
-class getid3_asf extends getid3_handler
-{
-
-	function __construct(getID3 $getid3) {
-		parent::__construct($getid3);  // extends getid3_handler::__construct()
-
-		// initialize all GUID constants
-		$GUIDarray = $this->KnownGUIDs();
-		foreach ($GUIDarray as $GUIDname => $hexstringvalue) {
-			if (!defined($GUIDname)) {
-				define($GUIDname, $this->GUIDtoBytestring($hexstringvalue));
-			}
-		}
-	}
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		// Shortcuts
-		$thisfile_audio = &$info['audio'];
-		$thisfile_video = &$info['video'];
-		$info['asf']  = array();
-		$thisfile_asf = &$info['asf'];
-		$thisfile_asf['comments'] = array();
-		$thisfile_asf_comments    = &$thisfile_asf['comments'];
-		$thisfile_asf['header_object'] = array();
-		$thisfile_asf_headerobject     = &$thisfile_asf['header_object'];
-
-
-		// ASF structure:
-		// * Header Object [required]
-		//   * File Properties Object [required]   (global file attributes)
-		//   * Stream Properties Object [required] (defines media stream & characteristics)
-		//   * Header Extension Object [required]  (additional functionality)
-		//   * Content Description Object          (bibliographic information)
-		//   * Script Command Object               (commands for during playback)
-		//   * Marker Object                       (named jumped points within the file)
-		// * Data Object [required]
-		//   * Data Packets
-		// * Index Object
-
-		// Header Object: (mandatory, one only)
-		// Field Name                   Field Type   Size (bits)
-		// Object ID                    GUID         128             // GUID for header object - GETID3_ASF_Header_Object
-		// Object Size                  QWORD        64              // size of header object, including 30 bytes of Header Object header
-		// Number of Header Objects     DWORD        32              // number of objects in header object
-		// Reserved1                    BYTE         8               // hardcoded: 0x01
-		// Reserved2                    BYTE         8               // hardcoded: 0x02
-
-		$info['fileformat'] = 'asf';
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$HeaderObjectData = fread($this->getid3->fp, 30);
-
-		$thisfile_asf_headerobject['objectid']      = substr($HeaderObjectData, 0, 16);
-		$thisfile_asf_headerobject['objectid_guid'] = $this->BytestringToGUID($thisfile_asf_headerobject['objectid']);
-		if ($thisfile_asf_headerobject['objectid'] != GETID3_ASF_Header_Object) {
-			$info['warning'][] = 'ASF header GUID {'.$this->BytestringToGUID($thisfile_asf_headerobject['objectid']).'} does not match expected "GETID3_ASF_Header_Object" GUID {'.$this->BytestringToGUID(GETID3_ASF_Header_Object).'}';
-			unset($info['fileformat']);
-			unset($info['asf']);
-			return false;
-			break;
-		}
-		$thisfile_asf_headerobject['objectsize']    = getid3_lib::LittleEndian2Int(substr($HeaderObjectData, 16, 8));
-		$thisfile_asf_headerobject['headerobjects'] = getid3_lib::LittleEndian2Int(substr($HeaderObjectData, 24, 4));
-		$thisfile_asf_headerobject['reserved1']     = getid3_lib::LittleEndian2Int(substr($HeaderObjectData, 28, 1));
-		$thisfile_asf_headerobject['reserved2']     = getid3_lib::LittleEndian2Int(substr($HeaderObjectData, 29, 1));
-
-		$NextObjectOffset = ftell($this->getid3->fp);
-		$ASFHeaderData = fread($this->getid3->fp, $thisfile_asf_headerobject['objectsize'] - 30);
-		$offset = 0;
-
-		for ($HeaderObjectsCounter = 0; $HeaderObjectsCounter < $thisfile_asf_headerobject['headerobjects']; $HeaderObjectsCounter++) {
-			$NextObjectGUID = substr($ASFHeaderData, $offset, 16);
-			$offset += 16;
-			$NextObjectGUIDtext = $this->BytestringToGUID($NextObjectGUID);
-			$NextObjectSize = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
-			$offset += 8;
-			switch ($NextObjectGUID) {
-
-				case GETID3_ASF_File_Properties_Object:
-					// File Properties Object: (mandatory, one only)
-					// Field Name                   Field Type   Size (bits)
-					// Object ID                    GUID         128             // GUID for file properties object - GETID3_ASF_File_Properties_Object
-					// Object Size                  QWORD        64              // size of file properties object, including 104 bytes of File Properties Object header
-					// File ID                      GUID         128             // unique ID - identical to File ID in Data Object
-					// File Size                    QWORD        64              // entire file in bytes. Invalid if Broadcast Flag == 1
-					// Creation Date                QWORD        64              // date & time of file creation. Maybe invalid if Broadcast Flag == 1
-					// Data Packets Count           QWORD        64              // number of data packets in Data Object. Invalid if Broadcast Flag == 1
-					// Play Duration                QWORD        64              // playtime, in 100-nanosecond units. Invalid if Broadcast Flag == 1
-					// Send Duration                QWORD        64              // time needed to send file, in 100-nanosecond units. Players can ignore this value. Invalid if Broadcast Flag == 1
-					// Preroll                      QWORD        64              // time to buffer data before starting to play file, in 1-millisecond units. If <> 0, PlayDuration and PresentationTime have been offset by this amount
-					// Flags                        DWORD        32              //
-					// * Broadcast Flag             bits         1  (0x01)       // file is currently being written, some header values are invalid
-					// * Seekable Flag              bits         1  (0x02)       // is file seekable
-					// * Reserved                   bits         30 (0xFFFFFFFC) // reserved - set to zero
-					// Minimum Data Packet Size     DWORD        32              // in bytes. should be same as Maximum Data Packet Size. Invalid if Broadcast Flag == 1
-					// Maximum Data Packet Size     DWORD        32              // in bytes. should be same as Minimum Data Packet Size. Invalid if Broadcast Flag == 1
-					// Maximum Bitrate              DWORD        32              // maximum instantaneous bitrate in bits per second for entire file, including all data streams and ASF overhead
-
-					// shortcut
-					$thisfile_asf['file_properties_object'] = array();
-					$thisfile_asf_filepropertiesobject      = &$thisfile_asf['file_properties_object'];
-
-					$thisfile_asf_filepropertiesobject['offset']             = $NextObjectOffset + $offset;
-					$thisfile_asf_filepropertiesobject['objectid']           = $NextObjectGUID;
-					$thisfile_asf_filepropertiesobject['objectid_guid']      = $NextObjectGUIDtext;
-					$thisfile_asf_filepropertiesobject['objectsize']         = $NextObjectSize;
-					$thisfile_asf_filepropertiesobject['fileid']             = substr($ASFHeaderData, $offset, 16);
-					$offset += 16;
-					$thisfile_asf_filepropertiesobject['fileid_guid']        = $this->BytestringToGUID($thisfile_asf_filepropertiesobject['fileid']);
-					$thisfile_asf_filepropertiesobject['filesize']           = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
-					$offset += 8;
-					$thisfile_asf_filepropertiesobject['creation_date']      = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
-					$thisfile_asf_filepropertiesobject['creation_date_unix'] = $this->FILETIMEtoUNIXtime($thisfile_asf_filepropertiesobject['creation_date']);
-					$offset += 8;
-					$thisfile_asf_filepropertiesobject['data_packets']       = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
-					$offset += 8;
-					$thisfile_asf_filepropertiesobject['play_duration']      = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
-					$offset += 8;
-					$thisfile_asf_filepropertiesobject['send_duration']      = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
-					$offset += 8;
-					$thisfile_asf_filepropertiesobject['preroll']            = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
-					$offset += 8;
-					$thisfile_asf_filepropertiesobject['flags_raw']          = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
-					$offset += 4;
-					$thisfile_asf_filepropertiesobject['flags']['broadcast'] = (bool) ($thisfile_asf_filepropertiesobject['flags_raw'] & 0x0001);
-					$thisfile_asf_filepropertiesobject['flags']['seekable']  = (bool) ($thisfile_asf_filepropertiesobject['flags_raw'] & 0x0002);
-
-					$thisfile_asf_filepropertiesobject['min_packet_size']    = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
-					$offset += 4;
-					$thisfile_asf_filepropertiesobject['max_packet_size']    = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
-					$offset += 4;
-					$thisfile_asf_filepropertiesobject['max_bitrate']        = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
-					$offset += 4;
-
-					if ($thisfile_asf_filepropertiesobject['flags']['broadcast']) {
-
-						// broadcast flag is set, some values invalid
-						unset($thisfile_asf_filepropertiesobject['filesize']);
-						unset($thisfile_asf_filepropertiesobject['data_packets']);
-						unset($thisfile_asf_filepropertiesobject['play_duration']);
-						unset($thisfile_asf_filepropertiesobject['send_duration']);
-						unset($thisfile_asf_filepropertiesobject['min_packet_size']);
-						unset($thisfile_asf_filepropertiesobject['max_packet_size']);
-
-					} else {
-
-						// broadcast flag NOT set, perform calculations
-						$info['playtime_seconds'] = ($thisfile_asf_filepropertiesobject['play_duration'] / 10000000) - ($thisfile_asf_filepropertiesobject['preroll'] / 1000);
-
-						//$info['bitrate'] = $thisfile_asf_filepropertiesobject['max_bitrate'];
-						$info['bitrate'] = ((isset($thisfile_asf_filepropertiesobject['filesize']) ? $thisfile_asf_filepropertiesobject['filesize'] : $info['filesize']) * 8) / $info['playtime_seconds'];
-					}
-					break;
-
-				case GETID3_ASF_Stream_Properties_Object:
-					// Stream Properties Object: (mandatory, one per media stream)
-					// Field Name                   Field Type   Size (bits)
-					// Object ID                    GUID         128             // GUID for stream properties object - GETID3_ASF_Stream_Properties_Object
-					// Object Size                  QWORD        64              // size of stream properties object, including 78 bytes of Stream Properties Object header
-					// Stream Type                  GUID         128             // GETID3_ASF_Audio_Media, GETID3_ASF_Video_Media or GETID3_ASF_Command_Media
-					// Error Correction Type        GUID         128             // GETID3_ASF_Audio_Spread for audio-only streams, GETID3_ASF_No_Error_Correction for other stream types
-					// Time Offset                  QWORD        64              // 100-nanosecond units. typically zero. added to all timestamps of samples in the stream
-					// Type-Specific Data Length    DWORD        32              // number of bytes for Type-Specific Data field
-					// Error Correction Data Length DWORD        32              // number of bytes for Error Correction Data field
-					// Flags                        WORD         16              //
-					// * Stream Number              bits         7 (0x007F)      // number of this stream.  1 <= valid <= 127
-					// * Reserved                   bits         8 (0x7F80)      // reserved - set to zero
-					// * Encrypted Content Flag     bits         1 (0x8000)      // stream contents encrypted if set
-					// Reserved                     DWORD        32              // reserved - set to zero
-					// Type-Specific Data           BYTESTREAM   variable        // type-specific format data, depending on value of Stream Type
-					// Error Correction Data        BYTESTREAM   variable        // error-correction-specific format data, depending on value of Error Correct Type
-
-					// There is one GETID3_ASF_Stream_Properties_Object for each stream (audio, video) but the
-					// stream number isn't known until halfway through decoding the structure, hence it
-					// it is decoded to a temporary variable and then stuck in the appropriate index later
-
-					$StreamPropertiesObjectData['offset']             = $NextObjectOffset + $offset;
-					$StreamPropertiesObjectData['objectid']           = $NextObjectGUID;
-					$StreamPropertiesObjectData['objectid_guid']      = $NextObjectGUIDtext;
-					$StreamPropertiesObjectData['objectsize']         = $NextObjectSize;
-					$StreamPropertiesObjectData['stream_type']        = substr($ASFHeaderData, $offset, 16);
-					$offset += 16;
-					$StreamPropertiesObjectData['stream_type_guid']   = $this->BytestringToGUID($StreamPropertiesObjectData['stream_type']);
-					$StreamPropertiesObjectData['error_correct_type'] = substr($ASFHeaderData, $offset, 16);
-					$offset += 16;
-					$StreamPropertiesObjectData['error_correct_guid'] = $this->BytestringToGUID($StreamPropertiesObjectData['error_correct_type']);
-					$StreamPropertiesObjectData['time_offset']        = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
-					$offset += 8;
-					$StreamPropertiesObjectData['type_data_length']   = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
-					$offset += 4;
-					$StreamPropertiesObjectData['error_data_length']  = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
-					$offset += 4;
-					$StreamPropertiesObjectData['flags_raw']          = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-					$offset += 2;
-					$StreamPropertiesObjectStreamNumber               = $StreamPropertiesObjectData['flags_raw'] & 0x007F;
-					$StreamPropertiesObjectData['flags']['encrypted'] = (bool) ($StreamPropertiesObjectData['flags_raw'] & 0x8000);
-
-					$offset += 4; // reserved - DWORD
-					$StreamPropertiesObjectData['type_specific_data'] = substr($ASFHeaderData, $offset, $StreamPropertiesObjectData['type_data_length']);
-					$offset += $StreamPropertiesObjectData['type_data_length'];
-					$StreamPropertiesObjectData['error_correct_data'] = substr($ASFHeaderData, $offset, $StreamPropertiesObjectData['error_data_length']);
-					$offset += $StreamPropertiesObjectData['error_data_length'];
-
-					switch ($StreamPropertiesObjectData['stream_type']) {
-
-						case GETID3_ASF_Audio_Media:
-							$thisfile_audio['dataformat']   = (!empty($thisfile_audio['dataformat'])   ? $thisfile_audio['dataformat']   : 'asf');
-							$thisfile_audio['bitrate_mode'] = (!empty($thisfile_audio['bitrate_mode']) ? $thisfile_audio['bitrate_mode'] : 'cbr');
-
-							$audiodata = getid3_riff::RIFFparseWAVEFORMATex(substr($StreamPropertiesObjectData['type_specific_data'], 0, 16));
-							unset($audiodata['raw']);
-							$thisfile_audio = getid3_lib::array_merge_noclobber($audiodata, $thisfile_audio);
-							break;
-
-						case GETID3_ASF_Video_Media:
-							$thisfile_video['dataformat']   = (!empty($thisfile_video['dataformat'])   ? $thisfile_video['dataformat']   : 'asf');
-							$thisfile_video['bitrate_mode'] = (!empty($thisfile_video['bitrate_mode']) ? $thisfile_video['bitrate_mode'] : 'cbr');
-							break;
-
-						case GETID3_ASF_Command_Media:
-						default:
-							// do nothing
-							break;
-
-					}
-
-					$thisfile_asf['stream_properties_object'][$StreamPropertiesObjectStreamNumber] = $StreamPropertiesObjectData;
-					unset($StreamPropertiesObjectData); // clear for next stream, if any
-					break;
-
-				case GETID3_ASF_Header_Extension_Object:
-					// Header Extension Object: (mandatory, one only)
-					// Field Name                   Field Type   Size (bits)
-					// Object ID                    GUID         128             // GUID for Header Extension object - GETID3_ASF_Header_Extension_Object
-					// Object Size                  QWORD        64              // size of Header Extension object, including 46 bytes of Header Extension Object header
-					// Reserved Field 1             GUID         128             // hardcoded: GETID3_ASF_Reserved_1
-					// Reserved Field 2             WORD         16              // hardcoded: 0x00000006
-					// Header Extension Data Size   DWORD        32              // in bytes. valid: 0, or > 24. equals object size minus 46
-					// Header Extension Data        BYTESTREAM   variable        // array of zero or more extended header objects
-
-					// shortcut
-					$thisfile_asf['header_extension_object'] = array();
-					$thisfile_asf_headerextensionobject      = &$thisfile_asf['header_extension_object'];
-
-					$thisfile_asf_headerextensionobject['offset']              = $NextObjectOffset + $offset;
-					$thisfile_asf_headerextensionobject['objectid']            = $NextObjectGUID;
-					$thisfile_asf_headerextensionobject['objectid_guid']       = $NextObjectGUIDtext;
-					$thisfile_asf_headerextensionobject['objectsize']          = $NextObjectSize;
-					$thisfile_asf_headerextensionobject['reserved_1']          = substr($ASFHeaderData, $offset, 16);
-					$offset += 16;
-					$thisfile_asf_headerextensionobject['reserved_1_guid']     = $this->BytestringToGUID($thisfile_asf_headerextensionobject['reserved_1']);
-					if ($thisfile_asf_headerextensionobject['reserved_1'] != GETID3_ASF_Reserved_1) {
-						$info['warning'][] = 'header_extension_object.reserved_1 GUID ('.$this->BytestringToGUID($thisfile_asf_headerextensionobject['reserved_1']).') does not match expected "GETID3_ASF_Reserved_1" GUID ('.$this->BytestringToGUID(GETID3_ASF_Reserved_1).')';
-						//return false;
-						break;
-					}
-					$thisfile_asf_headerextensionobject['reserved_2']          = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-					$offset += 2;
-					if ($thisfile_asf_headerextensionobject['reserved_2'] != 6) {
-						$info['warning'][] = 'header_extension_object.reserved_2 ('.getid3_lib::PrintHexBytes($thisfile_asf_headerextensionobject['reserved_2']).') does not match expected value of "6"';
-						//return false;
-						break;
-					}
-					$thisfile_asf_headerextensionobject['extension_data_size'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
-					$offset += 4;
-					$thisfile_asf_headerextensionobject['extension_data']      =                              substr($ASFHeaderData, $offset, $thisfile_asf_headerextensionobject['extension_data_size']);
-					$unhandled_sections = 0;
-					$thisfile_asf_headerextensionobject['extension_data_parsed'] = $this->ASF_HeaderExtensionObjectDataParse($thisfile_asf_headerextensionobject['extension_data'], $unhandled_sections);
-					if ($unhandled_sections === 0) {
-						unset($thisfile_asf_headerextensionobject['extension_data']);
-					}
-					$offset += $thisfile_asf_headerextensionobject['extension_data_size'];
-					break;
-
-				case GETID3_ASF_Codec_List_Object:
-					// Codec List Object: (optional, one only)
-					// Field Name                   Field Type   Size (bits)
-					// Object ID                    GUID         128             // GUID for Codec List object - GETID3_ASF_Codec_List_Object
-					// Object Size                  QWORD        64              // size of Codec List object, including 44 bytes of Codec List Object header
-					// Reserved                     GUID         128             // hardcoded: 86D15241-311D-11D0-A3A4-00A0C90348F6
-					// Codec Entries Count          DWORD        32              // number of entries in Codec Entries array
-					// Codec Entries                array of:    variable        //
-					// * Type                       WORD         16              // 0x0001 = Video Codec, 0x0002 = Audio Codec, 0xFFFF = Unknown Codec
-					// * Codec Name Length          WORD         16              // number of Unicode characters stored in the Codec Name field
-					// * Codec Name                 WCHAR        variable        // array of Unicode characters - name of codec used to create the content
-					// * Codec Description Length   WORD         16              // number of Unicode characters stored in the Codec Description field
-					// * Codec Description          WCHAR        variable        // array of Unicode characters - description of format used to create the content
-					// * Codec Information Length   WORD         16              // number of Unicode characters stored in the Codec Information field
-					// * Codec Information          BYTESTREAM   variable        // opaque array of information bytes about the codec used to create the content
-
-					// shortcut
-					$thisfile_asf['codec_list_object'] = array();
-					$thisfile_asf_codeclistobject      = &$thisfile_asf['codec_list_object'];
-
-					$thisfile_asf_codeclistobject['offset']                    = $NextObjectOffset + $offset;
-					$thisfile_asf_codeclistobject['objectid']                  = $NextObjectGUID;
-					$thisfile_asf_codeclistobject['objectid_guid']             = $NextObjectGUIDtext;
-					$thisfile_asf_codeclistobject['objectsize']                = $NextObjectSize;
-					$thisfile_asf_codeclistobject['reserved']                  = substr($ASFHeaderData, $offset, 16);
-					$offset += 16;
-					$thisfile_asf_codeclistobject['reserved_guid']             = $this->BytestringToGUID($thisfile_asf_codeclistobject['reserved']);
-					if ($thisfile_asf_codeclistobject['reserved'] != $this->GUIDtoBytestring('86D15241-311D-11D0-A3A4-00A0C90348F6')) {
-						$info['warning'][] = 'codec_list_object.reserved GUID {'.$this->BytestringToGUID($thisfile_asf_codeclistobject['reserved']).'} does not match expected "GETID3_ASF_Reserved_1" GUID {86D15241-311D-11D0-A3A4-00A0C90348F6}';
-						//return false;
-						break;
-					}
-					$thisfile_asf_codeclistobject['codec_entries_count'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
-					$offset += 4;
-					for ($CodecEntryCounter = 0; $CodecEntryCounter < $thisfile_asf_codeclistobject['codec_entries_count']; $CodecEntryCounter++) {
-						// shortcut
-						$thisfile_asf_codeclistobject['codec_entries'][$CodecEntryCounter] = array();
-						$thisfile_asf_codeclistobject_codecentries_current = &$thisfile_asf_codeclistobject['codec_entries'][$CodecEntryCounter];
-
-						$thisfile_asf_codeclistobject_codecentries_current['type_raw'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-						$offset += 2;
-						$thisfile_asf_codeclistobject_codecentries_current['type'] = $this->ASFCodecListObjectTypeLookup($thisfile_asf_codeclistobject_codecentries_current['type_raw']);
-
-						$CodecNameLength = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2)) * 2; // 2 bytes per character
-						$offset += 2;
-						$thisfile_asf_codeclistobject_codecentries_current['name'] = substr($ASFHeaderData, $offset, $CodecNameLength);
-						$offset += $CodecNameLength;
-
-						$CodecDescriptionLength = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2)) * 2; // 2 bytes per character
-						$offset += 2;
-						$thisfile_asf_codeclistobject_codecentries_current['description'] = substr($ASFHeaderData, $offset, $CodecDescriptionLength);
-						$offset += $CodecDescriptionLength;
-
-						$CodecInformationLength = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-						$offset += 2;
-						$thisfile_asf_codeclistobject_codecentries_current['information'] = substr($ASFHeaderData, $offset, $CodecInformationLength);
-						$offset += $CodecInformationLength;
-
-						if ($thisfile_asf_codeclistobject_codecentries_current['type_raw'] == 2) { // audio codec
-
-							if (strpos($thisfile_asf_codeclistobject_codecentries_current['description'], ',') === false) {
-								$info['warning'][] = '[asf][codec_list_object][codec_entries]['.$CodecEntryCounter.'][description] expected to contain comma-seperated list of parameters: "'.$thisfile_asf_codeclistobject_codecentries_current['description'].'"';
-							} else {
-
-								list($AudioCodecBitrate, $AudioCodecFrequency, $AudioCodecChannels) = explode(',', $this->TrimConvert($thisfile_asf_codeclistobject_codecentries_current['description']));
-								$thisfile_audio['codec'] = $this->TrimConvert($thisfile_asf_codeclistobject_codecentries_current['name']);
-
-								if (!isset($thisfile_audio['bitrate']) && strstr($AudioCodecBitrate, 'kbps')) {
-									$thisfile_audio['bitrate'] = (int) (trim(str_replace('kbps', '', $AudioCodecBitrate)) * 1000);
-								}
-								//if (!isset($thisfile_video['bitrate']) && isset($thisfile_audio['bitrate']) && isset($thisfile_asf['file_properties_object']['max_bitrate']) && ($thisfile_asf_codeclistobject['codec_entries_count'] > 1)) {
-								if (empty($thisfile_video['bitrate']) && !empty($thisfile_audio['bitrate']) && !empty($info['bitrate'])) {
-									//$thisfile_video['bitrate'] = $thisfile_asf['file_properties_object']['max_bitrate'] - $thisfile_audio['bitrate'];
-									$thisfile_video['bitrate'] = $info['bitrate'] - $thisfile_audio['bitrate'];
-								}
-
-								$AudioCodecFrequency = (int) trim(str_replace('kHz', '', $AudioCodecFrequency));
-								switch ($AudioCodecFrequency) {
-									case 8:
-									case 8000:
-										$thisfile_audio['sample_rate'] = 8000;
-										break;
-
-									case 11:
-									case 11025:
-										$thisfile_audio['sample_rate'] = 11025;
-										break;
-
-									case 12:
-									case 12000:
-										$thisfile_audio['sample_rate'] = 12000;
-										break;
-
-									case 16:
-									case 16000:
-										$thisfile_audio['sample_rate'] = 16000;
-										break;
-
-									case 22:
-									case 22050:
-										$thisfile_audio['sample_rate'] = 22050;
-										break;
-
-									case 24:
-									case 24000:
-										$thisfile_audio['sample_rate'] = 24000;
-										break;
-
-									case 32:
-									case 32000:
-										$thisfile_audio['sample_rate'] = 32000;
-										break;
-
-									case 44:
-									case 441000:
-										$thisfile_audio['sample_rate'] = 44100;
-										break;
-
-									case 48:
-									case 48000:
-										$thisfile_audio['sample_rate'] = 48000;
-										break;
-
-									default:
-										$info['warning'][] = 'unknown frequency: "'.$AudioCodecFrequency.'" ('.$this->TrimConvert($thisfile_asf_codeclistobject_codecentries_current['description']).')';
-										break;
-								}
-
-								if (!isset($thisfile_audio['channels'])) {
-									if (strstr($AudioCodecChannels, 'stereo')) {
-										$thisfile_audio['channels'] = 2;
-									} elseif (strstr($AudioCodecChannels, 'mono')) {
-										$thisfile_audio['channels'] = 1;
-									}
-								}
-
-							}
-						}
-					}
-					break;
-
-				case GETID3_ASF_Script_Command_Object:
-					// Script Command Object: (optional, one only)
-					// Field Name                   Field Type   Size (bits)
-					// Object ID                    GUID         128             // GUID for Script Command object - GETID3_ASF_Script_Command_Object
-					// Object Size                  QWORD        64              // size of Script Command object, including 44 bytes of Script Command Object header
-					// Reserved                     GUID         128             // hardcoded: 4B1ACBE3-100B-11D0-A39B-00A0C90348F6
-					// Commands Count               WORD         16              // number of Commands structures in the Script Commands Objects
-					// Command Types Count          WORD         16              // number of Command Types structures in the Script Commands Objects
-					// Command Types                array of:    variable        //
-					// * Command Type Name Length   WORD         16              // number of Unicode characters for Command Type Name
-					// * Command Type Name          WCHAR        variable        // array of Unicode characters - name of a type of command
-					// Commands                     array of:    variable        //
-					// * Presentation Time          DWORD        32              // presentation time of that command, in milliseconds
-					// * Type Index                 WORD         16              // type of this command, as a zero-based index into the array of Command Types of this object
-					// * Command Name Length        WORD         16              // number of Unicode characters for Command Name
-					// * Command Name               WCHAR        variable        // array of Unicode characters - name of this command
-
-					// shortcut
-					$thisfile_asf['script_command_object'] = array();
-					$thisfile_asf_scriptcommandobject      = &$thisfile_asf['script_command_object'];
-
-					$thisfile_asf_scriptcommandobject['offset']               = $NextObjectOffset + $offset;
-					$thisfile_asf_scriptcommandobject['objectid']             = $NextObjectGUID;
-					$thisfile_asf_scriptcommandobject['objectid_guid']        = $NextObjectGUIDtext;
-					$thisfile_asf_scriptcommandobject['objectsize']           = $NextObjectSize;
-					$thisfile_asf_scriptcommandobject['reserved']             = substr($ASFHeaderData, $offset, 16);
-					$offset += 16;
-					$thisfile_asf_scriptcommandobject['reserved_guid']        = $this->BytestringToGUID($thisfile_asf_scriptcommandobject['reserved']);
-					if ($thisfile_asf_scriptcommandobject['reserved'] != $this->GUIDtoBytestring('4B1ACBE3-100B-11D0-A39B-00A0C90348F6')) {
-						$info['warning'][] = 'script_command_object.reserved GUID {'.$this->BytestringToGUID($thisfile_asf_scriptcommandobject['reserved']).'} does not match expected "GETID3_ASF_Reserved_1" GUID {4B1ACBE3-100B-11D0-A39B-00A0C90348F6}';
-						//return false;
-						break;
-					}
-					$thisfile_asf_scriptcommandobject['commands_count']       = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-					$offset += 2;
-					$thisfile_asf_scriptcommandobject['command_types_count']  = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-					$offset += 2;
-					for ($CommandTypesCounter = 0; $CommandTypesCounter < $thisfile_asf_scriptcommandobject['command_types_count']; $CommandTypesCounter++) {
-						$CommandTypeNameLength = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2)) * 2; // 2 bytes per character
-						$offset += 2;
-						$thisfile_asf_scriptcommandobject['command_types'][$CommandTypesCounter]['name'] = substr($ASFHeaderData, $offset, $CommandTypeNameLength);
-						$offset += $CommandTypeNameLength;
-					}
-					for ($CommandsCounter = 0; $CommandsCounter < $thisfile_asf_scriptcommandobject['commands_count']; $CommandsCounter++) {
-						$thisfile_asf_scriptcommandobject['commands'][$CommandsCounter]['presentation_time']  = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
-						$offset += 4;
-						$thisfile_asf_scriptcommandobject['commands'][$CommandsCounter]['type_index']         = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-						$offset += 2;
-
-						$CommandTypeNameLength = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2)) * 2; // 2 bytes per character
-						$offset += 2;
-						$thisfile_asf_scriptcommandobject['commands'][$CommandsCounter]['name'] = substr($ASFHeaderData, $offset, $CommandTypeNameLength);
-						$offset += $CommandTypeNameLength;
-					}
-					break;
-
-				case GETID3_ASF_Marker_Object:
-					// Marker Object: (optional, one only)
-					// Field Name                   Field Type   Size (bits)
-					// Object ID                    GUID         128             // GUID for Marker object - GETID3_ASF_Marker_Object
-					// Object Size                  QWORD        64              // size of Marker object, including 48 bytes of Marker Object header
-					// Reserved                     GUID         128             // hardcoded: 4CFEDB20-75F6-11CF-9C0F-00A0C90349CB
-					// Markers Count                DWORD        32              // number of Marker structures in Marker Object
-					// Reserved                     WORD         16              // hardcoded: 0x0000
-					// Name Length                  WORD         16              // number of bytes in the Name field
-					// Name                         WCHAR        variable        // name of the Marker Object
-					// Markers                      array of:    variable        //
-					// * Offset                     QWORD        64              // byte offset into Data Object
-					// * Presentation Time          QWORD        64              // in 100-nanosecond units
-					// * Entry Length               WORD         16              // length in bytes of (Send Time + Flags + Marker Description Length + Marker Description + Padding)
-					// * Send Time                  DWORD        32              // in milliseconds
-					// * Flags                      DWORD        32              // hardcoded: 0x00000000
-					// * Marker Description Length  DWORD        32              // number of bytes in Marker Description field
-					// * Marker Description         WCHAR        variable        // array of Unicode characters - description of marker entry
-					// * Padding                    BYTESTREAM   variable        // optional padding bytes
-
-					// shortcut
-					$thisfile_asf['marker_object'] = array();
-					$thisfile_asf_markerobject     = &$thisfile_asf['marker_object'];
-
-					$thisfile_asf_markerobject['offset']               = $NextObjectOffset + $offset;
-					$thisfile_asf_markerobject['objectid']             = $NextObjectGUID;
-					$thisfile_asf_markerobject['objectid_guid']        = $NextObjectGUIDtext;
-					$thisfile_asf_markerobject['objectsize']           = $NextObjectSize;
-					$thisfile_asf_markerobject['reserved']             = substr($ASFHeaderData, $offset, 16);
-					$offset += 16;
-					$thisfile_asf_markerobject['reserved_guid']        = $this->BytestringToGUID($thisfile_asf_markerobject['reserved']);
-					if ($thisfile_asf_markerobject['reserved'] != $this->GUIDtoBytestring('4CFEDB20-75F6-11CF-9C0F-00A0C90349CB')) {
-						$info['warning'][] = 'marker_object.reserved GUID {'.$this->BytestringToGUID($thisfile_asf_markerobject['reserved_1']).'} does not match expected "GETID3_ASF_Reserved_1" GUID {4CFEDB20-75F6-11CF-9C0F-00A0C90349CB}';
-						break;
-					}
-					$thisfile_asf_markerobject['markers_count'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
-					$offset += 4;
-					$thisfile_asf_markerobject['reserved_2'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-					$offset += 2;
-					if ($thisfile_asf_markerobject['reserved_2'] != 0) {
-						$info['warning'][] = 'marker_object.reserved_2 ('.getid3_lib::PrintHexBytes($thisfile_asf_markerobject['reserved_2']).') does not match expected value of "0"';
-						break;
-					}
-					$thisfile_asf_markerobject['name_length'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-					$offset += 2;
-					$thisfile_asf_markerobject['name'] = substr($ASFHeaderData, $offset, $thisfile_asf_markerobject['name_length']);
-					$offset += $thisfile_asf_markerobject['name_length'];
-					for ($MarkersCounter = 0; $MarkersCounter < $thisfile_asf_markerobject['markers_count']; $MarkersCounter++) {
-						$thisfile_asf_markerobject['markers'][$MarkersCounter]['offset']  = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
-						$offset += 8;
-						$thisfile_asf_markerobject['markers'][$MarkersCounter]['presentation_time']         = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
-						$offset += 8;
-						$thisfile_asf_markerobject['markers'][$MarkersCounter]['entry_length']              = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-						$offset += 2;
-						$thisfile_asf_markerobject['markers'][$MarkersCounter]['send_time']                 = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
-						$offset += 4;
-						$thisfile_asf_markerobject['markers'][$MarkersCounter]['flags']                     = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
-						$offset += 4;
-						$thisfile_asf_markerobject['markers'][$MarkersCounter]['marker_description_length'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
-						$offset += 4;
-						$thisfile_asf_markerobject['markers'][$MarkersCounter]['marker_description']        = substr($ASFHeaderData, $offset, $thisfile_asf_markerobject['markers'][$MarkersCounter]['marker_description_length']);
-						$offset += $thisfile_asf_markerobject['markers'][$MarkersCounter]['marker_description_length'];
-						$PaddingLength = $thisfile_asf_markerobject['markers'][$MarkersCounter]['entry_length'] - 4 -  4 - 4 - $thisfile_asf_markerobject['markers'][$MarkersCounter]['marker_description_length'];
-						if ($PaddingLength > 0) {
-							$thisfile_asf_markerobject['markers'][$MarkersCounter]['padding']               = substr($ASFHeaderData, $offset, $PaddingLength);
-							$offset += $PaddingLength;
-						}
-					}
-					break;
-
-				case GETID3_ASF_Bitrate_Mutual_Exclusion_Object:
-					// Bitrate Mutual Exclusion Object: (optional)
-					// Field Name                   Field Type   Size (bits)
-					// Object ID                    GUID         128             // GUID for Bitrate Mutual Exclusion object - GETID3_ASF_Bitrate_Mutual_Exclusion_Object
-					// Object Size                  QWORD        64              // size of Bitrate Mutual Exclusion object, including 42 bytes of Bitrate Mutual Exclusion Object header
-					// Exlusion Type                GUID         128             // nature of mutual exclusion relationship. one of: (GETID3_ASF_Mutex_Bitrate, GETID3_ASF_Mutex_Unknown)
-					// Stream Numbers Count         WORD         16              // number of video streams
-					// Stream Numbers               WORD         variable        // array of mutually exclusive video stream numbers. 1 <= valid <= 127
-
-					// shortcut
-					$thisfile_asf['bitrate_mutual_exclusion_object'] = array();
-					$thisfile_asf_bitratemutualexclusionobject       = &$thisfile_asf['bitrate_mutual_exclusion_object'];
-
-					$thisfile_asf_bitratemutualexclusionobject['offset']               = $NextObjectOffset + $offset;
-					$thisfile_asf_bitratemutualexclusionobject['objectid']             = $NextObjectGUID;
-					$thisfile_asf_bitratemutualexclusionobject['objectid_guid']        = $NextObjectGUIDtext;
-					$thisfile_asf_bitratemutualexclusionobject['objectsize']           = $NextObjectSize;
-					$thisfile_asf_bitratemutualexclusionobject['reserved']             = substr($ASFHeaderData, $offset, 16);
-					$thisfile_asf_bitratemutualexclusionobject['reserved_guid']        = $this->BytestringToGUID($thisfile_asf_bitratemutualexclusionobject['reserved']);
-					$offset += 16;
-					if (($thisfile_asf_bitratemutualexclusionobject['reserved'] != GETID3_ASF_Mutex_Bitrate) && ($thisfile_asf_bitratemutualexclusionobject['reserved'] != GETID3_ASF_Mutex_Unknown)) {
-						$info['warning'][] = 'bitrate_mutual_exclusion_object.reserved GUID {'.$this->BytestringToGUID($thisfile_asf_bitratemutualexclusionobject['reserved']).'} does not match expected "GETID3_ASF_Mutex_Bitrate" GUID {'.$this->BytestringToGUID(GETID3_ASF_Mutex_Bitrate).'} or  "GETID3_ASF_Mutex_Unknown" GUID {'.$this->BytestringToGUID(GETID3_ASF_Mutex_Unknown).'}';
-						//return false;
-						break;
-					}
-					$thisfile_asf_bitratemutualexclusionobject['stream_numbers_count'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-					$offset += 2;
-					for ($StreamNumberCounter = 0; $StreamNumberCounter < $thisfile_asf_bitratemutualexclusionobject['stream_numbers_count']; $StreamNumberCounter++) {
-						$thisfile_asf_bitratemutualexclusionobject['stream_numbers'][$StreamNumberCounter] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-						$offset += 2;
-					}
-					break;
-
-				case GETID3_ASF_Error_Correction_Object:
-					// Error Correction Object: (optional, one only)
-					// Field Name                   Field Type   Size (bits)
-					// Object ID                    GUID         128             // GUID for Error Correction object - GETID3_ASF_Error_Correction_Object
-					// Object Size                  QWORD        64              // size of Error Correction object, including 44 bytes of Error Correction Object header
-					// Error Correction Type        GUID         128             // type of error correction. one of: (GETID3_ASF_No_Error_Correction, GETID3_ASF_Audio_Spread)
-					// Error Correction Data Length DWORD        32              // number of bytes in Error Correction Data field
-					// Error Correction Data        BYTESTREAM   variable        // structure depends on value of Error Correction Type field
-
-					// shortcut
-					$thisfile_asf['error_correction_object'] = array();
-					$thisfile_asf_errorcorrectionobject      = &$thisfile_asf['error_correction_object'];
-
-					$thisfile_asf_errorcorrectionobject['offset']                = $NextObjectOffset + $offset;
-					$thisfile_asf_errorcorrectionobject['objectid']              = $NextObjectGUID;
-					$thisfile_asf_errorcorrectionobject['objectid_guid']         = $NextObjectGUIDtext;
-					$thisfile_asf_errorcorrectionobject['objectsize']            = $NextObjectSize;
-					$thisfile_asf_errorcorrectionobject['error_correction_type'] = substr($ASFHeaderData, $offset, 16);
-					$offset += 16;
-					$thisfile_asf_errorcorrectionobject['error_correction_guid'] = $this->BytestringToGUID($thisfile_asf_errorcorrectionobject['error_correction_type']);
-					$thisfile_asf_errorcorrectionobject['error_correction_data_length'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
-					$offset += 4;
-					switch ($thisfile_asf_errorcorrectionobject['error_correction_type']) {
-						case GETID3_ASF_No_Error_Correction:
-							// should be no data, but just in case there is, skip to the end of the field
-							$offset += $thisfile_asf_errorcorrectionobject['error_correction_data_length'];
-							break;
-
-						case GETID3_ASF_Audio_Spread:
-							// Field Name                   Field Type   Size (bits)
-							// Span                         BYTE         8               // number of packets over which audio will be spread.
-							// Virtual Packet Length        WORD         16              // size of largest audio payload found in audio stream
-							// Virtual Chunk Length         WORD         16              // size of largest audio payload found in audio stream
-							// Silence Data Length          WORD         16              // number of bytes in Silence Data field
-							// Silence Data                 BYTESTREAM   variable        // hardcoded: 0x00 * (Silence Data Length) bytes
-
-							$thisfile_asf_errorcorrectionobject['span']                  = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 1));
-							$offset += 1;
-							$thisfile_asf_errorcorrectionobject['virtual_packet_length'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-							$offset += 2;
-							$thisfile_asf_errorcorrectionobject['virtual_chunk_length']  = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-							$offset += 2;
-							$thisfile_asf_errorcorrectionobject['silence_data_length']   = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-							$offset += 2;
-							$thisfile_asf_errorcorrectionobject['silence_data']          = substr($ASFHeaderData, $offset, $thisfile_asf_errorcorrectionobject['silence_data_length']);
-							$offset += $thisfile_asf_errorcorrectionobject['silence_data_length'];
-							break;
-
-						default:
-							$info['warning'][] = 'error_correction_object.error_correction_type GUID {'.$this->BytestringToGUID($thisfile_asf_errorcorrectionobject['reserved']).'} does not match expected "GETID3_ASF_No_Error_Correction" GUID {'.$this->BytestringToGUID(GETID3_ASF_No_Error_Correction).'} or  "GETID3_ASF_Audio_Spread" GUID {'.$this->BytestringToGUID(GETID3_ASF_Audio_Spread).'}';
-							//return false;
-							break;
-					}
-
-					break;
-
-				case GETID3_ASF_Content_Description_Object:
-					// Content Description Object: (optional, one only)
-					// Field Name                   Field Type   Size (bits)
-					// Object ID                    GUID         128             // GUID for Content Description object - GETID3_ASF_Content_Description_Object
-					// Object Size                  QWORD        64              // size of Content Description object, including 34 bytes of Content Description Object header
-					// Title Length                 WORD         16              // number of bytes in Title field
-					// Author Length                WORD         16              // number of bytes in Author field
-					// Copyright Length             WORD         16              // number of bytes in Copyright field
-					// Description Length           WORD         16              // number of bytes in Description field
-					// Rating Length                WORD         16              // number of bytes in Rating field
-					// Title                        WCHAR        16              // array of Unicode characters - Title
-					// Author                       WCHAR        16              // array of Unicode characters - Author
-					// Copyright                    WCHAR        16              // array of Unicode characters - Copyright
-					// Description                  WCHAR        16              // array of Unicode characters - Description
-					// Rating                       WCHAR        16              // array of Unicode characters - Rating
-
-					// shortcut
-					$thisfile_asf['content_description_object'] = array();
-					$thisfile_asf_contentdescriptionobject      = &$thisfile_asf['content_description_object'];
-
-					$thisfile_asf_contentdescriptionobject['offset']                = $NextObjectOffset + $offset;
-					$thisfile_asf_contentdescriptionobject['objectid']              = $NextObjectGUID;
-					$thisfile_asf_contentdescriptionobject['objectid_guid']         = $NextObjectGUIDtext;
-					$thisfile_asf_contentdescriptionobject['objectsize']            = $NextObjectSize;
-					$thisfile_asf_contentdescriptionobject['title_length']          = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-					$offset += 2;
-					$thisfile_asf_contentdescriptionobject['author_length']         = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-					$offset += 2;
-					$thisfile_asf_contentdescriptionobject['copyright_length']      = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-					$offset += 2;
-					$thisfile_asf_contentdescriptionobject['description_length']    = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-					$offset += 2;
-					$thisfile_asf_contentdescriptionobject['rating_length']         = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-					$offset += 2;
-					$thisfile_asf_contentdescriptionobject['title']                 = substr($ASFHeaderData, $offset, $thisfile_asf_contentdescriptionobject['title_length']);
-					$offset += $thisfile_asf_contentdescriptionobject['title_length'];
-					$thisfile_asf_contentdescriptionobject['author']                = substr($ASFHeaderData, $offset, $thisfile_asf_contentdescriptionobject['author_length']);
-					$offset += $thisfile_asf_contentdescriptionobject['author_length'];
-					$thisfile_asf_contentdescriptionobject['copyright']             = substr($ASFHeaderData, $offset, $thisfile_asf_contentdescriptionobject['copyright_length']);
-					$offset += $thisfile_asf_contentdescriptionobject['copyright_length'];
-					$thisfile_asf_contentdescriptionobject['description']           = substr($ASFHeaderData, $offset, $thisfile_asf_contentdescriptionobject['description_length']);
-					$offset += $thisfile_asf_contentdescriptionobject['description_length'];
-					$thisfile_asf_contentdescriptionobject['rating']                = substr($ASFHeaderData, $offset, $thisfile_asf_contentdescriptionobject['rating_length']);
-					$offset += $thisfile_asf_contentdescriptionobject['rating_length'];
-
-					$ASFcommentKeysToCopy = array('title'=>'title', 'author'=>'artist', 'copyright'=>'copyright', 'description'=>'comment', 'rating'=>'rating');
-					foreach ($ASFcommentKeysToCopy as $keytocopyfrom => $keytocopyto) {
-						if (!empty($thisfile_asf_contentdescriptionobject[$keytocopyfrom])) {
-							$thisfile_asf_comments[$keytocopyto][] = $this->TrimTerm($thisfile_asf_contentdescriptionobject[$keytocopyfrom]);
-						}
-					}
-					break;
-
-				case GETID3_ASF_Extended_Content_Description_Object:
-					// Extended Content Description Object: (optional, one only)
-					// Field Name                   Field Type   Size (bits)
-					// Object ID                    GUID         128             // GUID for Extended Content Description object - GETID3_ASF_Extended_Content_Description_Object
-					// Object Size                  QWORD        64              // size of ExtendedContent Description object, including 26 bytes of Extended Content Description Object header
-					// Content Descriptors Count    WORD         16              // number of entries in Content Descriptors list
-					// Content Descriptors          array of:    variable        //
-					// * Descriptor Name Length     WORD         16              // size in bytes of Descriptor Name field
-					// * Descriptor Name            WCHAR        variable        // array of Unicode characters - Descriptor Name
-					// * Descriptor Value Data Type WORD         16              // Lookup array:
-																					// 0x0000 = Unicode String (variable length)
-																					// 0x0001 = BYTE array     (variable length)
-																					// 0x0002 = BOOL           (DWORD, 32 bits)
-																					// 0x0003 = DWORD          (DWORD, 32 bits)
-																					// 0x0004 = QWORD          (QWORD, 64 bits)
-																					// 0x0005 = WORD           (WORD,  16 bits)
-					// * Descriptor Value Length    WORD         16              // number of bytes stored in Descriptor Value field
-					// * Descriptor Value           variable     variable        // value for Content Descriptor
-
-					// shortcut
-					$thisfile_asf['extended_content_description_object'] = array();
-					$thisfile_asf_extendedcontentdescriptionobject       = &$thisfile_asf['extended_content_description_object'];
-
-					$thisfile_asf_extendedcontentdescriptionobject['offset']                    = $NextObjectOffset + $offset;
-					$thisfile_asf_extendedcontentdescriptionobject['objectid']                  = $NextObjectGUID;
-					$thisfile_asf_extendedcontentdescriptionobject['objectid_guid']             = $NextObjectGUIDtext;
-					$thisfile_asf_extendedcontentdescriptionobject['objectsize']                = $NextObjectSize;
-					$thisfile_asf_extendedcontentdescriptionobject['content_descriptors_count'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-					$offset += 2;
-					for ($ExtendedContentDescriptorsCounter = 0; $ExtendedContentDescriptorsCounter < $thisfile_asf_extendedcontentdescriptionobject['content_descriptors_count']; $ExtendedContentDescriptorsCounter++) {
-						// shortcut
-						$thisfile_asf_extendedcontentdescriptionobject['content_descriptors'][$ExtendedContentDescriptorsCounter] = array();
-						$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current                 = &$thisfile_asf_extendedcontentdescriptionobject['content_descriptors'][$ExtendedContentDescriptorsCounter];
-
-						$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['base_offset']  = $offset + 30;
-						$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['name_length']  = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-						$offset += 2;
-						$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['name']         = substr($ASFHeaderData, $offset, $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['name_length']);
-						$offset += $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['name_length'];
-						$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value_type']   = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-						$offset += 2;
-						$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value_length'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-						$offset += 2;
-						$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']        = substr($ASFHeaderData, $offset, $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value_length']);
-						$offset += $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value_length'];
-						switch ($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value_type']) {
-							case 0x0000: // Unicode string
-								break;
-
-							case 0x0001: // BYTE array
-								// do nothing
-								break;
-
-							case 0x0002: // BOOL
-								$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value'] = (bool) getid3_lib::LittleEndian2Int($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']);
-								break;
-
-							case 0x0003: // DWORD
-							case 0x0004: // QWORD
-							case 0x0005: // WORD
-								$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value'] = getid3_lib::LittleEndian2Int($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']);
-								break;
-
-							default:
-								$info['warning'][] = 'extended_content_description.content_descriptors.'.$ExtendedContentDescriptorsCounter.'.value_type is invalid ('.$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value_type'].')';
-								//return false;
-								break;
-						}
-						switch ($this->TrimConvert(strtolower($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['name']))) {
-
-							case 'wm/albumartist':
-							case 'artist':
-								// Note: not 'artist', that comes from 'author' tag
-								$thisfile_asf_comments['albumartist'] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
-								break;
-
-							case 'wm/albumtitle':
-							case 'album':
-								$thisfile_asf_comments['album']  = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
-								break;
-
-							case 'wm/genre':
-							case 'genre':
-								$thisfile_asf_comments['genre'] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
-								break;
-
-							case 'wm/partofset':
-								$thisfile_asf_comments['partofset'] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
-								break;
-
-							case 'wm/tracknumber':
-							case 'tracknumber':
-								// be careful casting to int: casting unicode strings to int gives unexpected results (stops parsing at first non-numeric character)
-								$thisfile_asf_comments['track'] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
-								foreach ($thisfile_asf_comments['track'] as $key => $value) {
-									if (preg_match('/^[0-9\x00]+$/', $value)) {
-										$thisfile_asf_comments['track'][$key] = intval(str_replace("\x00", '', $value));
-									}
-								}
-								break;
-
-							case 'wm/track':
-								if (empty($thisfile_asf_comments['track'])) {
-									$thisfile_asf_comments['track'] = array(1 + $this->TrimConvert($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
-								}
-								break;
-
-							case 'wm/year':
-							case 'year':
-							case 'date':
-								$thisfile_asf_comments['year'] = array( $this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
-								break;
-
-							case 'wm/lyrics':
-							case 'lyrics':
-								$thisfile_asf_comments['lyrics'] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
-								break;
-
-							case 'isvbr':
-								if ($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']) {
-									$thisfile_audio['bitrate_mode'] = 'vbr';
-									$thisfile_video['bitrate_mode'] = 'vbr';
-								}
-								break;
-
-							case 'id3':
-								// id3v2 module might not be loaded
-								if (class_exists('getid3_id3v2')) {
-									$tempfile         = tempnam(GETID3_TEMP_DIR, 'getID3');
-									$tempfilehandle   = fopen($tempfile, 'wb');
-									$tempThisfileInfo = array('encoding'=>$info['encoding']);
-									fwrite($tempfilehandle, $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']);
-									fclose($tempfilehandle);
-
-									$getid3_temp = new getID3();
-									$getid3_temp->openfile($tempfile);
-									$getid3_id3v2 = new getid3_id3v2($getid3_temp);
-									$getid3_id3v2->Analyze();
-									$info['id3v2'] = $getid3_temp->info['id3v2'];
-									unset($getid3_temp, $getid3_id3v2);
-
-									unlink($tempfile);
-								}
-								break;
-
-							case 'wm/encodingtime':
-								$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['encoding_time_unix'] = $this->FILETIMEtoUNIXtime($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']);
-								$thisfile_asf_comments['encoding_time_unix'] = array($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['encoding_time_unix']);
-								break;
-
-							case 'wm/picture':
-								$WMpicture = $this->ASF_WMpicture($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']);
-								foreach ($WMpicture as $key => $value) {
-									$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current[$key] = $value;
-								}
-								unset($WMpicture);
-/*
-								$wm_picture_offset = 0;
-								$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_type_id'] = getid3_lib::LittleEndian2Int(substr($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value'], $wm_picture_offset, 1));
-								$wm_picture_offset += 1;
-								$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_type']    = $this->WMpictureTypeLookup($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_type_id']);
-								$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_size']    = getid3_lib::LittleEndian2Int(substr($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value'], $wm_picture_offset, 4));
-								$wm_picture_offset += 4;
-
-								$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_mime'] = '';
-								do {
-									$next_byte_pair = substr($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value'], $wm_picture_offset, 2);
-									$wm_picture_offset += 2;
-									$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_mime'] .= $next_byte_pair;
-								} while ($next_byte_pair !== "\x00\x00");
-
-								$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_description'] = '';
-								do {
-									$next_byte_pair = substr($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value'], $wm_picture_offset, 2);
-									$wm_picture_offset += 2;
-									$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_description'] .= $next_byte_pair;
-								} while ($next_byte_pair !== "\x00\x00");
-
-								$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['dataoffset'] = $wm_picture_offset;
-								$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['data'] = substr($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value'], $wm_picture_offset);
-								unset($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']);
-
-								$imageinfo = array();
-								$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_mime'] = '';
-								$imagechunkcheck = getid3_lib::GetDataImageSize($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['data'], $imageinfo);
-								unset($imageinfo);
-								if (!empty($imagechunkcheck)) {
-									$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_mime'] = image_type_to_mime_type($imagechunkcheck[2]);
-								}
-								if (!isset($thisfile_asf_comments['picture'])) {
-									$thisfile_asf_comments['picture'] = array();
-								}
-								$thisfile_asf_comments['picture'][] = array('data'=>$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['data'], 'image_mime'=>$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_mime']);
-*/
-								break;
-
-							default:
-								switch ($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value_type']) {
-									case 0: // Unicode string
-										if (substr($this->TrimConvert($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['name']), 0, 3) == 'WM/') {
-											$thisfile_asf_comments[str_replace('wm/', '', strtolower($this->TrimConvert($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['name'])))] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
-										}
-										break;
-
-									case 1:
-										break;
-								}
-								break;
-						}
-
-					}
-					break;
-
-				case GETID3_ASF_Stream_Bitrate_Properties_Object:
-					// Stream Bitrate Properties Object: (optional, one only)
-					// Field Name                   Field Type   Size (bits)
-					// Object ID                    GUID         128             // GUID for Stream Bitrate Properties object - GETID3_ASF_Stream_Bitrate_Properties_Object
-					// Object Size                  QWORD        64              // size of Extended Content Description object, including 26 bytes of Stream Bitrate Properties Object header
-					// Bitrate Records Count        WORD         16              // number of records in Bitrate Records
-					// Bitrate Records              array of:    variable        //
-					// * Flags                      WORD         16              //
-					// * * Stream Number            bits         7  (0x007F)     // number of this stream
-					// * * Reserved                 bits         9  (0xFF80)     // hardcoded: 0
-					// * Average Bitrate            DWORD        32              // in bits per second
-
-					// shortcut
-					$thisfile_asf['stream_bitrate_properties_object'] = array();
-					$thisfile_asf_streambitratepropertiesobject       = &$thisfile_asf['stream_bitrate_properties_object'];
-
-					$thisfile_asf_streambitratepropertiesobject['offset']                    = $NextObjectOffset + $offset;
-					$thisfile_asf_streambitratepropertiesobject['objectid']                  = $NextObjectGUID;
-					$thisfile_asf_streambitratepropertiesobject['objectid_guid']             = $NextObjectGUIDtext;
-					$thisfile_asf_streambitratepropertiesobject['objectsize']                = $NextObjectSize;
-					$thisfile_asf_streambitratepropertiesobject['bitrate_records_count']     = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-					$offset += 2;
-					for ($BitrateRecordsCounter = 0; $BitrateRecordsCounter < $thisfile_asf_streambitratepropertiesobject['bitrate_records_count']; $BitrateRecordsCounter++) {
-						$thisfile_asf_streambitratepropertiesobject['bitrate_records'][$BitrateRecordsCounter]['flags_raw'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
-						$offset += 2;
-						$thisfile_asf_streambitratepropertiesobject['bitrate_records'][$BitrateRecordsCounter]['flags']['stream_number'] = $thisfile_asf_streambitratepropertiesobject['bitrate_records'][$BitrateRecordsCounter]['flags_raw'] & 0x007F;
-						$thisfile_asf_streambitratepropertiesobject['bitrate_records'][$BitrateRecordsCounter]['bitrate'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
-						$offset += 4;
-					}
-					break;
-
-				case GETID3_ASF_Padding_Object:
-					// Padding Object: (optional)
-					// Field Name                   Field Type   Size (bits)
-					// Object ID                    GUID         128             // GUID for Padding object - GETID3_ASF_Padding_Object
-					// Object Size                  QWORD        64              // size of Padding object, including 24 bytes of ASF Padding Object header
-					// Padding Data                 BYTESTREAM   variable        // ignore
-
-					// shortcut
-					$thisfile_asf['padding_object'] = array();
-					$thisfile_asf_paddingobject     = &$thisfile_asf['padding_object'];
-
-					$thisfile_asf_paddingobject['offset']                    = $NextObjectOffset + $offset;
-					$thisfile_asf_paddingobject['objectid']                  = $NextObjectGUID;
-					$thisfile_asf_paddingobject['objectid_guid']             = $NextObjectGUIDtext;
-					$thisfile_asf_paddingobject['objectsize']                = $NextObjectSize;
-					$thisfile_asf_paddingobject['padding_length']            = $thisfile_asf_paddingobject['objectsize'] - 16 - 8;
-					$thisfile_asf_paddingobject['padding']                   = substr($ASFHeaderData, $offset, $thisfile_asf_paddingobject['padding_length']);
-					$offset += ($NextObjectSize - 16 - 8);
-					break;
-
-				case GETID3_ASF_Extended_Content_Encryption_Object:
-				case GETID3_ASF_Content_Encryption_Object:
-					// WMA DRM - just ignore
-					$offset += ($NextObjectSize - 16 - 8);
-					break;
-
-				default:
-					// Implementations shall ignore any standard or non-standard object that they do not know how to handle.
-					if ($this->GUIDname($NextObjectGUIDtext)) {
-						$info['warning'][] = 'unhandled GUID "'.$this->GUIDname($NextObjectGUIDtext).'" {'.$NextObjectGUIDtext.'} in ASF header at offset '.($offset - 16 - 8);
-					} else {
-						$info['warning'][] = 'unknown GUID {'.$NextObjectGUIDtext.'} in ASF header at offset '.($offset - 16 - 8);
-					}
-					$offset += ($NextObjectSize - 16 - 8);
-					break;
-			}
-		}
-		if (isset($thisfile_asf_streambitrateproperties['bitrate_records_count'])) {
-			$ASFbitrateAudio = 0;
-			$ASFbitrateVideo = 0;
-			for ($BitrateRecordsCounter = 0; $BitrateRecordsCounter < $thisfile_asf_streambitrateproperties['bitrate_records_count']; $BitrateRecordsCounter++) {
-				if (isset($thisfile_asf_codeclistobject['codec_entries'][$BitrateRecordsCounter])) {
-					switch ($thisfile_asf_codeclistobject['codec_entries'][$BitrateRecordsCounter]['type_raw']) {
-						case 1:
-							$ASFbitrateVideo += $thisfile_asf_streambitrateproperties['bitrate_records'][$BitrateRecordsCounter]['bitrate'];
-							break;
-
-						case 2:
-							$ASFbitrateAudio += $thisfile_asf_streambitrateproperties['bitrate_records'][$BitrateRecordsCounter]['bitrate'];
-							break;
-
-						default:
-							// do nothing
-							break;
-					}
-				}
-			}
-			if ($ASFbitrateAudio > 0) {
-				$thisfile_audio['bitrate'] = $ASFbitrateAudio;
-			}
-			if ($ASFbitrateVideo > 0) {
-				$thisfile_video['bitrate'] = $ASFbitrateVideo;
-			}
-		}
-		if (isset($thisfile_asf['stream_properties_object']) && is_array($thisfile_asf['stream_properties_object'])) {
-
-			$thisfile_audio['bitrate'] = 0;
-			$thisfile_video['bitrate'] = 0;
-
-			foreach ($thisfile_asf['stream_properties_object'] as $streamnumber => $streamdata) {
-
-				switch ($streamdata['stream_type']) {
-					case GETID3_ASF_Audio_Media:
-						// Field Name                   Field Type   Size (bits)
-						// Codec ID / Format Tag        WORD         16              // unique ID of audio codec - defined as wFormatTag field of WAVEFORMATEX structure
-						// Number of Channels           WORD         16              // number of channels of audio - defined as nChannels field of WAVEFORMATEX structure
-						// Samples Per Second           DWORD        32              // in Hertz - defined as nSamplesPerSec field of WAVEFORMATEX structure
-						// Average number of Bytes/sec  DWORD        32              // bytes/sec of audio stream  - defined as nAvgBytesPerSec field of WAVEFORMATEX structure
-						// Block Alignment              WORD         16              // block size in bytes of audio codec - defined as nBlockAlign field of WAVEFORMATEX structure
-						// Bits per sample              WORD         16              // bits per sample of mono data. set to zero for variable bitrate codecs. defined as wBitsPerSample field of WAVEFORMATEX structure
-						// Codec Specific Data Size     WORD         16              // size in bytes of Codec Specific Data buffer - defined as cbSize field of WAVEFORMATEX structure
-						// Codec Specific Data          BYTESTREAM   variable        // array of codec-specific data bytes
-
-						// shortcut
-						$thisfile_asf['audio_media'][$streamnumber] = array();
-						$thisfile_asf_audiomedia_currentstream      = &$thisfile_asf['audio_media'][$streamnumber];
-
-						$audiomediaoffset = 0;
-
-						$thisfile_asf_audiomedia_currentstream = getid3_riff::RIFFparseWAVEFORMATex(substr($streamdata['type_specific_data'], $audiomediaoffset, 16));
-						$audiomediaoffset += 16;
-
-						$thisfile_audio['lossless'] = false;
-						switch ($thisfile_asf_audiomedia_currentstream['raw']['wFormatTag']) {
-							case 0x0001: // PCM
-							case 0x0163: // WMA9 Lossless
-								$thisfile_audio['lossless'] = true;
-								break;
-						}
-
-						if (!empty($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'])) {
-							foreach ($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'] as $dummy => $dataarray) {
-								if (isset($dataarray['flags']['stream_number']) && ($dataarray['flags']['stream_number'] == $streamnumber)) {
-									$thisfile_asf_audiomedia_currentstream['bitrate'] = $dataarray['bitrate'];
-									$thisfile_audio['bitrate'] += $dataarray['bitrate'];
-									break;
-								}
-							}
-						} else {
-							if (!empty($thisfile_asf_audiomedia_currentstream['bytes_sec'])) {
-								$thisfile_audio['bitrate'] += $thisfile_asf_audiomedia_currentstream['bytes_sec'] * 8;
-							} elseif (!empty($thisfile_asf_audiomedia_currentstream['bitrate'])) {
-								$thisfile_audio['bitrate'] += $thisfile_asf_audiomedia_currentstream['bitrate'];
-							}
-						}
-						$thisfile_audio['streams'][$streamnumber]                = $thisfile_asf_audiomedia_currentstream;
-						$thisfile_audio['streams'][$streamnumber]['wformattag']  = $thisfile_asf_audiomedia_currentstream['raw']['wFormatTag'];
-						$thisfile_audio['streams'][$streamnumber]['lossless']    = $thisfile_audio['lossless'];
-						$thisfile_audio['streams'][$streamnumber]['bitrate']     = $thisfile_audio['bitrate'];
-						$thisfile_audio['streams'][$streamnumber]['dataformat']  = 'wma';
-						unset($thisfile_audio['streams'][$streamnumber]['raw']);
-
-						$thisfile_asf_audiomedia_currentstream['codec_data_size'] = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $audiomediaoffset, 2));
-						$audiomediaoffset += 2;
-						$thisfile_asf_audiomedia_currentstream['codec_data']      = substr($streamdata['type_specific_data'], $audiomediaoffset, $thisfile_asf_audiomedia_currentstream['codec_data_size']);
-						$audiomediaoffset += $thisfile_asf_audiomedia_currentstream['codec_data_size'];
-
-						break;
-
-					case GETID3_ASF_Video_Media:
-						// Field Name                   Field Type   Size (bits)
-						// Encoded Image Width          DWORD        32              // width of image in pixels
-						// Encoded Image Height         DWORD        32              // height of image in pixels
-						// Reserved Flags               BYTE         8               // hardcoded: 0x02
-						// Format Data Size             WORD         16              // size of Format Data field in bytes
-						// Format Data                  array of:    variable        //
-						// * Format Data Size           DWORD        32              // number of bytes in Format Data field, in bytes - defined as biSize field of BITMAPINFOHEADER structure
-						// * Image Width                LONG         32              // width of encoded image in pixels - defined as biWidth field of BITMAPINFOHEADER structure
-						// * Image Height               LONG         32              // height of encoded image in pixels - defined as biHeight field of BITMAPINFOHEADER structure
-						// * Reserved                   WORD         16              // hardcoded: 0x0001 - defined as biPlanes field of BITMAPINFOHEADER structure
-						// * Bits Per Pixel Count       WORD         16              // bits per pixel - defined as biBitCount field of BITMAPINFOHEADER structure
-						// * Compression ID             FOURCC       32              // fourcc of video codec - defined as biCompression field of BITMAPINFOHEADER structure
-						// * Image Size                 DWORD        32              // image size in bytes - defined as biSizeImage field of BITMAPINFOHEADER structure
-						// * Horizontal Pixels / Meter  DWORD        32              // horizontal resolution of target device in pixels per meter - defined as biXPelsPerMeter field of BITMAPINFOHEADER structure
-						// * Vertical Pixels / Meter    DWORD        32              // vertical resolution of target device in pixels per meter - defined as biYPelsPerMeter field of BITMAPINFOHEADER structure
-						// * Colors Used Count          DWORD        32              // number of color indexes in the color table that are actually used - defined as biClrUsed field of BITMAPINFOHEADER structure
-						// * Important Colors Count     DWORD        32              // number of color index required for displaying bitmap. if zero, all colors are required. defined as biClrImportant field of BITMAPINFOHEADER structure
-						// * Codec Specific Data        BYTESTREAM   variable        // array of codec-specific data bytes
-
-						// shortcut
-						$thisfile_asf['video_media'][$streamnumber] = array();
-						$thisfile_asf_videomedia_currentstream      = &$thisfile_asf['video_media'][$streamnumber];
-
-						$videomediaoffset = 0;
-						$thisfile_asf_videomedia_currentstream['image_width']                     = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $videomediaoffset, 4));
-						$videomediaoffset += 4;
-						$thisfile_asf_videomedia_currentstream['image_height']                    = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $videomediaoffset, 4));
-						$videomediaoffset += 4;
-						$thisfile_asf_videomedia_currentstream['flags']                           = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $videomediaoffset, 1));
-						$videomediaoffset += 1;
-						$thisfile_asf_videomedia_currentstream['format_data_size']                = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $videomediaoffset, 2));
-						$videomediaoffset += 2;
-						$thisfile_asf_videomedia_currentstream['format_data']['format_data_size'] = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $videomediaoffset, 4));
-						$videomediaoffset += 4;
-						$thisfile_asf_videomedia_currentstream['format_data']['image_width']      = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $videomediaoffset, 4));
-						$videomediaoffset += 4;
-						$thisfile_asf_videomedia_currentstream['format_data']['image_height']     = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $videomediaoffset, 4));
-						$videomediaoffset += 4;
-						$thisfile_asf_videomedia_currentstream['format_data']['reserved']         = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $videomediaoffset, 2));
-						$videomediaoffset += 2;
-						$thisfile_asf_videomedia_currentstream['format_data']['bits_per_pixel']   = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $videomediaoffset, 2));
-						$videomediaoffset += 2;
-						$thisfile_asf_videomedia_currentstream['format_data']['codec_fourcc']     = substr($streamdata['type_specific_data'], $videomediaoffset, 4);
-						$videomediaoffset += 4;
-						$thisfile_asf_videomedia_currentstream['format_data']['image_size']       = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $videomediaoffset, 4));
-						$videomediaoffset += 4;
-						$thisfile_asf_videomedia_currentstream['format_data']['horizontal_pels']  = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $videomediaoffset, 4));
-						$videomediaoffset += 4;
-						$thisfile_asf_videomedia_currentstream['format_data']['vertical_pels']    = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $videomediaoffset, 4));
-						$videomediaoffset += 4;
-						$thisfile_asf_videomedia_currentstream['format_data']['colors_used']      = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $videomediaoffset, 4));
-						$videomediaoffset += 4;
-						$thisfile_asf_videomedia_currentstream['format_data']['colors_important'] = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $videomediaoffset, 4));
-						$videomediaoffset += 4;
-						$thisfile_asf_videomedia_currentstream['format_data']['codec_data']       = substr($streamdata['type_specific_data'], $videomediaoffset);
-
-						if (!empty($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'])) {
-							foreach ($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'] as $dummy => $dataarray) {
-								if (isset($dataarray['flags']['stream_number']) && ($dataarray['flags']['stream_number'] == $streamnumber)) {
-									$thisfile_asf_videomedia_currentstream['bitrate'] = $dataarray['bitrate'];
-									$thisfile_video['streams'][$streamnumber]['bitrate'] = $dataarray['bitrate'];
-									$thisfile_video['bitrate'] += $dataarray['bitrate'];
-									break;
-								}
-							}
-						}
-
-						$thisfile_asf_videomedia_currentstream['format_data']['codec'] = getid3_riff::RIFFfourccLookup($thisfile_asf_videomedia_currentstream['format_data']['codec_fourcc']);
-
-						$thisfile_video['streams'][$streamnumber]['fourcc']          = $thisfile_asf_videomedia_currentstream['format_data']['codec_fourcc'];
-						$thisfile_video['streams'][$streamnumber]['codec']           = $thisfile_asf_videomedia_currentstream['format_data']['codec'];
-						$thisfile_video['streams'][$streamnumber]['resolution_x']    = $thisfile_asf_videomedia_currentstream['image_width'];
-						$thisfile_video['streams'][$streamnumber]['resolution_y']    = $thisfile_asf_videomedia_currentstream['image_height'];
-						$thisfile_video['streams'][$streamnumber]['bits_per_sample'] = $thisfile_asf_videomedia_currentstream['format_data']['bits_per_pixel'];
-						break;
-
-					default:
-						break;
-				}
-			}
-		}
-
-		while (ftell($this->getid3->fp) < $info['avdataend']) {
-			$NextObjectDataHeader = fread($this->getid3->fp, 24);
-			$offset = 0;
-			$NextObjectGUID = substr($NextObjectDataHeader, 0, 16);
-			$offset += 16;
-			$NextObjectGUIDtext = $this->BytestringToGUID($NextObjectGUID);
-			$NextObjectSize = getid3_lib::LittleEndian2Int(substr($NextObjectDataHeader, $offset, 8));
-			$offset += 8;
-
-			switch ($NextObjectGUID) {
-				case GETID3_ASF_Data_Object:
-					// Data Object: (mandatory, one only)
-					// Field Name                       Field Type   Size (bits)
-					// Object ID                        GUID         128             // GUID for Data object - GETID3_ASF_Data_Object
-					// Object Size                      QWORD        64              // size of Data object, including 50 bytes of Data Object header. may be 0 if FilePropertiesObject.BroadcastFlag == 1
-					// File ID                          GUID         128             // unique identifier. identical to File ID field in Header Object
-					// Total Data Packets               QWORD        64              // number of Data Packet entries in Data Object. invalid if FilePropertiesObject.BroadcastFlag == 1
-					// Reserved                         WORD         16              // hardcoded: 0x0101
-
-					// shortcut
-					$thisfile_asf['data_object'] = array();
-					$thisfile_asf_dataobject     = &$thisfile_asf['data_object'];
-
-					$DataObjectData = $NextObjectDataHeader.fread($this->getid3->fp, 50 - 24);
-					$offset = 24;
-
-					$thisfile_asf_dataobject['objectid']           = $NextObjectGUID;
-					$thisfile_asf_dataobject['objectid_guid']      = $NextObjectGUIDtext;
-					$thisfile_asf_dataobject['objectsize']         = $NextObjectSize;
-
-					$thisfile_asf_dataobject['fileid']             = substr($DataObjectData, $offset, 16);
-					$offset += 16;
-					$thisfile_asf_dataobject['fileid_guid']        = $this->BytestringToGUID($thisfile_asf_dataobject['fileid']);
-					$thisfile_asf_dataobject['total_data_packets'] = getid3_lib::LittleEndian2Int(substr($DataObjectData, $offset, 8));
-					$offset += 8;
-					$thisfile_asf_dataobject['reserved']           = getid3_lib::LittleEndian2Int(substr($DataObjectData, $offset, 2));
-					$offset += 2;
-					if ($thisfile_asf_dataobject['reserved'] != 0x0101) {
-						$info['warning'][] = 'data_object.reserved ('.getid3_lib::PrintHexBytes($thisfile_asf_dataobject['reserved']).') does not match expected value of "0x0101"';
-						//return false;
-						break;
-					}
-
-					// Data Packets                     array of:    variable        //
-					// * Error Correction Flags         BYTE         8               //
-					// * * Error Correction Data Length bits         4               // if Error Correction Length Type == 00, size of Error Correction Data in bytes, else hardcoded: 0000
-					// * * Opaque Data Present          bits         1               //
-					// * * Error Correction Length Type bits         2               // number of bits for size of the error correction data. hardcoded: 00
-					// * * Error Correction Present     bits         1               // If set, use Opaque Data Packet structure, else use Payload structure
-					// * Error Correction Data
-
-					$info['avdataoffset'] = ftell($this->getid3->fp);
-					fseek($this->getid3->fp, ($thisfile_asf_dataobject['objectsize'] - 50), SEEK_CUR); // skip actual audio/video data
-					$info['avdataend'] = ftell($this->getid3->fp);
-					break;
-
-				case GETID3_ASF_Simple_Index_Object:
-					// Simple Index Object: (optional, recommended, one per video stream)
-					// Field Name                       Field Type   Size (bits)
-					// Object ID                        GUID         128             // GUID for Simple Index object - GETID3_ASF_Data_Object
-					// Object Size                      QWORD        64              // size of Simple Index object, including 56 bytes of Simple Index Object header
-					// File ID                          GUID         128             // unique identifier. may be zero or identical to File ID field in Data Object and Header Object
-					// Index Entry Time Interval        QWORD        64              // interval between index entries in 100-nanosecond units
-					// Maximum Packet Count             DWORD        32              // maximum packet count for all index entries
-					// Index Entries Count              DWORD        32              // number of Index Entries structures
-					// Index Entries                    array of:    variable        //
-					// * Packet Number                  DWORD        32              // number of the Data Packet associated with this index entry
-					// * Packet Count                   WORD         16              // number of Data Packets to sent at this index entry
-
-					// shortcut
-					$thisfile_asf['simple_index_object'] = array();
-					$thisfile_asf_simpleindexobject      = &$thisfile_asf['simple_index_object'];
-
-					$SimpleIndexObjectData = $NextObjectDataHeader.fread($this->getid3->fp, 56 - 24);
-					$offset = 24;
-
-					$thisfile_asf_simpleindexobject['objectid']                  = $NextObjectGUID;
-					$thisfile_asf_simpleindexobject['objectid_guid']             = $NextObjectGUIDtext;
-					$thisfile_asf_simpleindexobject['objectsize']                = $NextObjectSize;
-
-					$thisfile_asf_simpleindexobject['fileid']                    =                  substr($SimpleIndexObjectData, $offset, 16);
-					$offset += 16;
-					$thisfile_asf_simpleindexobject['fileid_guid']               = $this->BytestringToGUID($thisfile_asf_simpleindexobject['fileid']);
-					$thisfile_asf_simpleindexobject['index_entry_time_interval'] = getid3_lib::LittleEndian2Int(substr($SimpleIndexObjectData, $offset, 8));
-					$offset += 8;
-					$thisfile_asf_simpleindexobject['maximum_packet_count']      = getid3_lib::LittleEndian2Int(substr($SimpleIndexObjectData, $offset, 4));
-					$offset += 4;
-					$thisfile_asf_simpleindexobject['index_entries_count']       = getid3_lib::LittleEndian2Int(substr($SimpleIndexObjectData, $offset, 4));
-					$offset += 4;
-
-					$IndexEntriesData = $SimpleIndexObjectData.fread($this->getid3->fp, 6 * $thisfile_asf_simpleindexobject['index_entries_count']);
-					for ($IndexEntriesCounter = 0; $IndexEntriesCounter < $thisfile_asf_simpleindexobject['index_entries_count']; $IndexEntriesCounter++) {
-						$thisfile_asf_simpleindexobject['index_entries'][$IndexEntriesCounter]['packet_number'] = getid3_lib::LittleEndian2Int(substr($IndexEntriesData, $offset, 4));
-						$offset += 4;
-						$thisfile_asf_simpleindexobject['index_entries'][$IndexEntriesCounter]['packet_count']  = getid3_lib::LittleEndian2Int(substr($IndexEntriesData, $offset, 4));
-						$offset += 2;
-					}
-
-					break;
-
-				case GETID3_ASF_Index_Object:
-					// 6.2 ASF top-level Index Object (optional but recommended when appropriate, 0 or 1)
-					// Field Name                       Field Type   Size (bits)
-					// Object ID                        GUID         128             // GUID for the Index Object - GETID3_ASF_Index_Object
-					// Object Size                      QWORD        64              // Specifies the size, in bytes, of the Index Object, including at least 34 bytes of Index Object header
-					// Index Entry Time Interval        DWORD        32              // Specifies the time interval between each index entry in ms.
-					// Index Specifiers Count           WORD         16              // Specifies the number of Index Specifiers structures in this Index Object.
-					// Index Blocks Count               DWORD        32              // Specifies the number of Index Blocks structures in this Index Object.
-
-					// Index Entry Time Interval        DWORD        32              // Specifies the time interval between index entries in milliseconds.  This value cannot be 0.
-					// Index Specifiers Count           WORD         16              // Specifies the number of entries in the Index Specifiers list.  Valid values are 1 and greater.
-					// Index Specifiers                 array of:    varies          //
-					// * Stream Number                  WORD         16              // Specifies the stream number that the Index Specifiers refer to. Valid values are between 1 and 127.
-					// * Index Type                     WORD         16              // Specifies Index Type values as follows:
-																					//   1 = Nearest Past Data Packet - indexes point to the data packet whose presentation time is closest to the index entry time.
-																					//   2 = Nearest Past Media Object - indexes point to the closest data packet containing an entire object or first fragment of an object.
-																					//   3 = Nearest Past Cleanpoint. - indexes point to the closest data packet containing an entire object (or first fragment of an object) that has the Cleanpoint Flag set.
-																					//   Nearest Past Cleanpoint is the most common type of index.
-					// Index Entry Count                DWORD        32              // Specifies the number of Index Entries in the block.
-					// * Block Positions                QWORD        varies          // Specifies a list of byte offsets of the beginnings of the blocks relative to the beginning of the first Data Packet (i.e., the beginning of the Data Object + 50 bytes). The number of entries in this list is specified by the value of the Index Specifiers Count field. The order of those byte offsets is tied to the order in which Index Specifiers are listed.
-					// * Index Entries                  array of:    varies          //
-					// * * Offsets                      DWORD        varies          // An offset value of 0xffffffff indicates an invalid offset value
-
-					// shortcut
-					$thisfile_asf['asf_index_object'] = array();
-					$thisfile_asf_asfindexobject      = &$thisfile_asf['asf_index_object'];
-
-					$ASFIndexObjectData = $NextObjectDataHeader.fread($this->getid3->fp, 34 - 24);
-					$offset = 24;
-
-					$thisfile_asf_asfindexobject['objectid']                  = $NextObjectGUID;
-					$thisfile_asf_asfindexobject['objectid_guid']             = $NextObjectGUIDtext;
-					$thisfile_asf_asfindexobject['objectsize']                = $NextObjectSize;
-
-					$thisfile_asf_asfindexobject['entry_time_interval']       = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 4));
-					$offset += 4;
-					$thisfile_asf_asfindexobject['index_specifiers_count']    = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 2));
-					$offset += 2;
-					$thisfile_asf_asfindexobject['index_blocks_count']        = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 4));
-					$offset += 4;
-
-					$ASFIndexObjectData .= fread($this->getid3->fp, 4 * $thisfile_asf_asfindexobject['index_specifiers_count']);
-					for ($IndexSpecifiersCounter = 0; $IndexSpecifiersCounter < $thisfile_asf_asfindexobject['index_specifiers_count']; $IndexSpecifiersCounter++) {
-						$IndexSpecifierStreamNumber = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 2));
-						$offset += 2;
-						$thisfile_asf_asfindexobject['index_specifiers'][$IndexSpecifiersCounter]['stream_number']   = $IndexSpecifierStreamNumber;
-						$thisfile_asf_asfindexobject['index_specifiers'][$IndexSpecifiersCounter]['index_type']      = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 2));
-						$offset += 2;
-						$thisfile_asf_asfindexobject['index_specifiers'][$IndexSpecifiersCounter]['index_type_text'] = $this->ASFIndexObjectIndexTypeLookup($thisfile_asf_asfindexobject['index_specifiers'][$IndexSpecifiersCounter]['index_type']);
-					}
-
-					$ASFIndexObjectData .= fread($this->getid3->fp, 4);
-					$thisfile_asf_asfindexobject['index_entry_count'] = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 4));
-					$offset += 4;
-
-					$ASFIndexObjectData .= fread($this->getid3->fp, 8 * $thisfile_asf_asfindexobject['index_specifiers_count']);
-					for ($IndexSpecifiersCounter = 0; $IndexSpecifiersCounter < $thisfile_asf_asfindexobject['index_specifiers_count']; $IndexSpecifiersCounter++) {
-						$thisfile_asf_asfindexobject['block_positions'][$IndexSpecifiersCounter] = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 8));
-						$offset += 8;
-					}
-
-					$ASFIndexObjectData .= fread($this->getid3->fp, 4 * $thisfile_asf_asfindexobject['index_specifiers_count'] * $thisfile_asf_asfindexobject['index_entry_count']);
-					for ($IndexEntryCounter = 0; $IndexEntryCounter < $thisfile_asf_asfindexobject['index_entry_count']; $IndexEntryCounter++) {
-						for ($IndexSpecifiersCounter = 0; $IndexSpecifiersCounter < $thisfile_asf_asfindexobject['index_specifiers_count']; $IndexSpecifiersCounter++) {
-							$thisfile_asf_asfindexobject['offsets'][$IndexSpecifiersCounter][$IndexEntryCounter] = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 4));
-							$offset += 4;
-						}
-					}
-					break;
-
-
-				default:
-					// Implementations shall ignore any standard or non-standard object that they do not know how to handle.
-					if ($this->GUIDname($NextObjectGUIDtext)) {
-						$info['warning'][] = 'unhandled GUID "'.$this->GUIDname($NextObjectGUIDtext).'" {'.$NextObjectGUIDtext.'} in ASF body at offset '.($offset - 16 - 8);
-					} else {
-						$info['warning'][] = 'unknown GUID {'.$NextObjectGUIDtext.'} in ASF body at offset '.(ftell($this->getid3->fp) - 16 - 8);
-					}
-					fseek($this->getid3->fp, ($NextObjectSize - 16 - 8), SEEK_CUR);
-					break;
-			}
-		}
-
-		if (isset($thisfile_asf_codeclistobject['codec_entries']) && is_array($thisfile_asf_codeclistobject['codec_entries'])) {
-			foreach ($thisfile_asf_codeclistobject['codec_entries'] as $streamnumber => $streamdata) {
-				switch ($streamdata['information']) {
-					case 'WMV1':
-					case 'WMV2':
-					case 'WMV3':
-					case 'MSS1':
-					case 'MSS2':
-					case 'WMVA':
-					case 'WVC1':
-					case 'WMVP':
-					case 'WVP2':
-						$thisfile_video['dataformat'] = 'wmv';
-						$info['mime_type'] = 'video/x-ms-wmv';
-						break;
-
-					case 'MP42':
-					case 'MP43':
-					case 'MP4S':
-					case 'mp4s':
-						$thisfile_video['dataformat'] = 'asf';
-						$info['mime_type'] = 'video/x-ms-asf';
-						break;
-
-					default:
-						switch ($streamdata['type_raw']) {
-							case 1:
-								if (strstr($this->TrimConvert($streamdata['name']), 'Windows Media')) {
-									$thisfile_video['dataformat'] = 'wmv';
-									if ($info['mime_type'] == 'video/x-ms-asf') {
-										$info['mime_type'] = 'video/x-ms-wmv';
-									}
-								}
-								break;
-
-							case 2:
-								if (strstr($this->TrimConvert($streamdata['name']), 'Windows Media')) {
-									$thisfile_audio['dataformat'] = 'wma';
-									if ($info['mime_type'] == 'video/x-ms-asf') {
-										$info['mime_type'] = 'audio/x-ms-wma';
-									}
-								}
-								break;
-
-						}
-						break;
-				}
-			}
-		}
-
-		switch (isset($thisfile_audio['codec']) ? $thisfile_audio['codec'] : '') {
-			case 'MPEG Layer-3':
-				$thisfile_audio['dataformat'] = 'mp3';
-				break;
-
-			default:
-				break;
-		}
-
-		if (isset($thisfile_asf_codeclistobject['codec_entries'])) {
-			foreach ($thisfile_asf_codeclistobject['codec_entries'] as $streamnumber => $streamdata) {
-				switch ($streamdata['type_raw']) {
-
-					case 1: // video
-						$thisfile_video['encoder'] = $this->TrimConvert($thisfile_asf_codeclistobject['codec_entries'][$streamnumber]['name']);
-						break;
-
-					case 2: // audio
-						$thisfile_audio['encoder'] = $this->TrimConvert($thisfile_asf_codeclistobject['codec_entries'][$streamnumber]['name']);
-
-						// AH 2003-10-01
-						$thisfile_audio['encoder_options'] = $this->TrimConvert($thisfile_asf_codeclistobject['codec_entries'][0]['description']);
-
-						$thisfile_audio['codec']   = $thisfile_audio['encoder'];
-						break;
-
-					default:
-						$info['warning'][] = 'Unknown streamtype: [codec_list_object][codec_entries]['.$streamnumber.'][type_raw] == '.$streamdata['type_raw'];
-						break;
-
-				}
-			}
-		}
-
-		if (isset($info['audio'])) {
-			$thisfile_audio['lossless']           = (isset($thisfile_audio['lossless'])           ? $thisfile_audio['lossless']           : false);
-			$thisfile_audio['dataformat']         = (!empty($thisfile_audio['dataformat'])        ? $thisfile_audio['dataformat']         : 'asf');
-		}
-		if (!empty($thisfile_video['dataformat'])) {
-			$thisfile_video['lossless']           = (isset($thisfile_audio['lossless'])           ? $thisfile_audio['lossless']           : false);
-			$thisfile_video['pixel_aspect_ratio'] = (isset($thisfile_audio['pixel_aspect_ratio']) ? $thisfile_audio['pixel_aspect_ratio'] : (float) 1);
-			$thisfile_video['dataformat']         = (!empty($thisfile_video['dataformat'])        ? $thisfile_video['dataformat']         : 'asf');
-		}
-		if (!empty($thisfile_video['streams'])) {
-			$thisfile_video['streams']['resolution_x'] = 0;
-			$thisfile_video['streams']['resolution_y'] = 0;
-			foreach ($thisfile_video['streams'] as $key => $valuearray) {
-				if (($valuearray['resolution_x'] > $thisfile_video['streams']['resolution_x']) || ($valuearray['resolution_y'] > $thisfile_video['streams']['resolution_y'])) {
-					$thisfile_video['resolution_x'] = $valuearray['resolution_x'];
-					$thisfile_video['resolution_y'] = $valuearray['resolution_y'];
-				}
-			}
-		}
-		$info['bitrate'] = (isset($thisfile_audio['bitrate']) ? $thisfile_audio['bitrate'] : 0) + (isset($thisfile_video['bitrate']) ? $thisfile_video['bitrate'] : 0);
-
-		if ((!isset($info['playtime_seconds']) || ($info['playtime_seconds'] <= 0)) && ($info['bitrate'] > 0)) {
-			$info['playtime_seconds'] = ($info['filesize'] - $info['avdataoffset']) / ($info['bitrate'] / 8);
-		}
-
-		return true;
-	}
-
-	static function ASFCodecListObjectTypeLookup($CodecListType) {
-		static $ASFCodecListObjectTypeLookup = array();
-		if (empty($ASFCodecListObjectTypeLookup)) {
-			$ASFCodecListObjectTypeLookup[0x0001] = 'Video Codec';
-			$ASFCodecListObjectTypeLookup[0x0002] = 'Audio Codec';
-			$ASFCodecListObjectTypeLookup[0xFFFF] = 'Unknown Codec';
-		}
-
-		return (isset($ASFCodecListObjectTypeLookup[$CodecListType]) ? $ASFCodecListObjectTypeLookup[$CodecListType] : 'Invalid Codec Type');
-	}
-
-	static function KnownGUIDs() {
-		static $GUIDarray = array(
-			'GETID3_ASF_Extended_Stream_Properties_Object'   => '14E6A5CB-C672-4332-8399-A96952065B5A',
-			'GETID3_ASF_Padding_Object'                      => '1806D474-CADF-4509-A4BA-9AABCB96AAE8',
-			'GETID3_ASF_Payload_Ext_Syst_Pixel_Aspect_Ratio' => '1B1EE554-F9EA-4BC8-821A-376B74E4C4B8',
-			'GETID3_ASF_Script_Command_Object'               => '1EFB1A30-0B62-11D0-A39B-00A0C90348F6',
-			'GETID3_ASF_No_Error_Correction'                 => '20FB5700-5B55-11CF-A8FD-00805F5C442B',
-			'GETID3_ASF_Content_Branding_Object'             => '2211B3FA-BD23-11D2-B4B7-00A0C955FC6E',
-			'GETID3_ASF_Content_Encryption_Object'           => '2211B3FB-BD23-11D2-B4B7-00A0C955FC6E',
-			'GETID3_ASF_Digital_Signature_Object'            => '2211B3FC-BD23-11D2-B4B7-00A0C955FC6E',
-			'GETID3_ASF_Extended_Content_Encryption_Object'  => '298AE614-2622-4C17-B935-DAE07EE9289C',
-			'GETID3_ASF_Simple_Index_Object'                 => '33000890-E5B1-11CF-89F4-00A0C90349CB',
-			'GETID3_ASF_Degradable_JPEG_Media'               => '35907DE0-E415-11CF-A917-00805F5C442B',
-			'GETID3_ASF_Payload_Extension_System_Timecode'   => '399595EC-8667-4E2D-8FDB-98814CE76C1E',
-			'GETID3_ASF_Binary_Media'                        => '3AFB65E2-47EF-40F2-AC2C-70A90D71D343',
-			'GETID3_ASF_Timecode_Index_Object'               => '3CB73FD0-0C4A-4803-953D-EDF7B6228F0C',
-			'GETID3_ASF_Metadata_Library_Object'             => '44231C94-9498-49D1-A141-1D134E457054',
-			'GETID3_ASF_Reserved_3'                          => '4B1ACBE3-100B-11D0-A39B-00A0C90348F6',
-			'GETID3_ASF_Reserved_4'                          => '4CFEDB20-75F6-11CF-9C0F-00A0C90349CB',
-			'GETID3_ASF_Command_Media'                       => '59DACFC0-59E6-11D0-A3AC-00A0C90348F6',
-			'GETID3_ASF_Header_Extension_Object'             => '5FBF03B5-A92E-11CF-8EE3-00C00C205365',
-			'GETID3_ASF_Media_Object_Index_Parameters_Obj'   => '6B203BAD-3F11-4E84-ACA8-D7613DE2CFA7',
-			'GETID3_ASF_Header_Object'                       => '75B22630-668E-11CF-A6D9-00AA0062CE6C',
-			'GETID3_ASF_Content_Description_Object'          => '75B22633-668E-11CF-A6D9-00AA0062CE6C',
-			'GETID3_ASF_Error_Correction_Object'             => '75B22635-668E-11CF-A6D9-00AA0062CE6C',
-			'GETID3_ASF_Data_Object'                         => '75B22636-668E-11CF-A6D9-00AA0062CE6C',
-			'GETID3_ASF_Web_Stream_Media_Subtype'            => '776257D4-C627-41CB-8F81-7AC7FF1C40CC',
-			'GETID3_ASF_Stream_Bitrate_Properties_Object'    => '7BF875CE-468D-11D1-8D82-006097C9A2B2',
-			'GETID3_ASF_Language_List_Object'                => '7C4346A9-EFE0-4BFC-B229-393EDE415C85',
-			'GETID3_ASF_Codec_List_Object'                   => '86D15240-311D-11D0-A3A4-00A0C90348F6',
-			'GETID3_ASF_Reserved_2'                          => '86D15241-311D-11D0-A3A4-00A0C90348F6',
-			'GETID3_ASF_File_Properties_Object'              => '8CABDCA1-A947-11CF-8EE4-00C00C205365',
-			'GETID3_ASF_File_Transfer_Media'                 => '91BD222C-F21C-497A-8B6D-5AA86BFC0185',
-			'GETID3_ASF_Old_RTP_Extension_Data'              => '96800C63-4C94-11D1-837B-0080C7A37F95',
-			'GETID3_ASF_Advanced_Mutual_Exclusion_Object'    => 'A08649CF-4775-4670-8A16-6E35357566CD',
-			'GETID3_ASF_Bandwidth_Sharing_Object'            => 'A69609E6-517B-11D2-B6AF-00C04FD908E9',
-			'GETID3_ASF_Reserved_1'                          => 'ABD3D211-A9BA-11cf-8EE6-00C00C205365',
-			'GETID3_ASF_Bandwidth_Sharing_Exclusive'         => 'AF6060AA-5197-11D2-B6AF-00C04FD908E9',
-			'GETID3_ASF_Bandwidth_Sharing_Partial'           => 'AF6060AB-5197-11D2-B6AF-00C04FD908E9',
-			'GETID3_ASF_JFIF_Media'                          => 'B61BE100-5B4E-11CF-A8FD-00805F5C442B',
-			'GETID3_ASF_Stream_Properties_Object'            => 'B7DC0791-A9B7-11CF-8EE6-00C00C205365',
-			'GETID3_ASF_Video_Media'                         => 'BC19EFC0-5B4D-11CF-A8FD-00805F5C442B',
-			'GETID3_ASF_Audio_Spread'                        => 'BFC3CD50-618F-11CF-8BB2-00AA00B4E220',
-			'GETID3_ASF_Metadata_Object'                     => 'C5F8CBEA-5BAF-4877-8467-AA8C44FA4CCA',
-			'GETID3_ASF_Payload_Ext_Syst_Sample_Duration'    => 'C6BD9450-867F-4907-83A3-C77921B733AD',
-			'GETID3_ASF_Group_Mutual_Exclusion_Object'       => 'D1465A40-5A79-4338-B71B-E36B8FD6C249',
-			'GETID3_ASF_Extended_Content_Description_Object' => 'D2D0A440-E307-11D2-97F0-00A0C95EA850',
-			'GETID3_ASF_Stream_Prioritization_Object'        => 'D4FED15B-88D3-454F-81F0-ED5C45999E24',
-			'GETID3_ASF_Payload_Ext_System_Content_Type'     => 'D590DC20-07BC-436C-9CF7-F3BBFBF1A4DC',
-			'GETID3_ASF_Old_File_Properties_Object'          => 'D6E229D0-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_ASF_Header_Object'               => 'D6E229D1-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_ASF_Data_Object'                 => 'D6E229D2-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Index_Object'                        => 'D6E229D3-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Stream_Properties_Object'        => 'D6E229D4-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Content_Description_Object'      => 'D6E229D5-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Script_Command_Object'           => 'D6E229D6-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Marker_Object'                   => 'D6E229D7-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Component_Download_Object'       => 'D6E229D8-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Stream_Group_Object'             => 'D6E229D9-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Scalable_Object'                 => 'D6E229DA-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Prioritization_Object'           => 'D6E229DB-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Bitrate_Mutual_Exclusion_Object'     => 'D6E229DC-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Inter_Media_Dependency_Object'   => 'D6E229DD-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Rating_Object'                   => 'D6E229DE-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Index_Parameters_Object'             => 'D6E229DF-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Color_Table_Object'              => 'D6E229E0-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Language_List_Object'            => 'D6E229E1-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Audio_Media'                     => 'D6E229E2-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Video_Media'                     => 'D6E229E3-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Image_Media'                     => 'D6E229E4-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Timecode_Media'                  => 'D6E229E5-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Text_Media'                      => 'D6E229E6-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_MIDI_Media'                      => 'D6E229E7-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Command_Media'                   => 'D6E229E8-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_No_Error_Concealment'            => 'D6E229EA-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Scrambled_Audio'                 => 'D6E229EB-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_No_Color_Table'                  => 'D6E229EC-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_SMPTE_Time'                      => 'D6E229ED-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_ASCII_Text'                      => 'D6E229EE-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Unicode_Text'                    => 'D6E229EF-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_HTML_Text'                       => 'D6E229F0-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_URL_Command'                     => 'D6E229F1-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Filename_Command'                => 'D6E229F2-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_ACM_Codec'                       => 'D6E229F3-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_VCM_Codec'                       => 'D6E229F4-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_QuickTime_Codec'                 => 'D6E229F5-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_DirectShow_Transform_Filter'     => 'D6E229F6-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_DirectShow_Rendering_Filter'     => 'D6E229F7-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_No_Enhancement'                  => 'D6E229F8-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Unknown_Enhancement_Type'        => 'D6E229F9-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Temporal_Enhancement'            => 'D6E229FA-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Spatial_Enhancement'             => 'D6E229FB-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Quality_Enhancement'             => 'D6E229FC-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Number_of_Channels_Enhancement'  => 'D6E229FD-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Frequency_Response_Enhancement'  => 'D6E229FE-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Media_Object'                    => 'D6E229FF-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Mutex_Language'                      => 'D6E22A00-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Mutex_Bitrate'                       => 'D6E22A01-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Mutex_Unknown'                       => 'D6E22A02-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_ASF_Placeholder_Object'          => 'D6E22A0E-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Old_Data_Unit_Extension_Object'      => 'D6E22A0F-35DA-11D1-9034-00A0C90349BE',
-			'GETID3_ASF_Web_Stream_Format'                   => 'DA1E6B13-8359-4050-B398-388E965BF00C',
-			'GETID3_ASF_Payload_Ext_System_File_Name'        => 'E165EC0E-19ED-45D7-B4A7-25CBD1E28E9B',
-			'GETID3_ASF_Marker_Object'                       => 'F487CD01-A951-11CF-8EE6-00C00C205365',
-			'GETID3_ASF_Timecode_Index_Parameters_Object'    => 'F55E496D-9797-4B5D-8C8B-604DFE9BFB24',
-			'GETID3_ASF_Audio_Media'                         => 'F8699E40-5B4D-11CF-A8FD-00805F5C442B',
-			'GETID3_ASF_Media_Object_Index_Object'           => 'FEB103F8-12AD-4C64-840F-2A1D2F7AD48C',
-			'GETID3_ASF_Alt_Extended_Content_Encryption_Obj' => 'FF889EF1-ADEE-40DA-9E71-98704BB928CE',
-			'GETID3_ASF_Index_Placeholder_Object'            => 'D9AADE20-7C17-4F9C-BC28-8555DD98E2A2', // http://cpan.uwinnipeg.ca/htdocs/Audio-WMA/Audio/WMA.pm.html
-			'GETID3_ASF_Compatibility_Object'                => '26F18B5D-4584-47EC-9F5F-0E651F0452C9', // http://cpan.uwinnipeg.ca/htdocs/Audio-WMA/Audio/WMA.pm.html
-		);
-		return $GUIDarray;
-	}
-
-	static function GUIDname($GUIDstring) {
-		static $GUIDarray = array();
-		if (empty($GUIDarray)) {
-			$GUIDarray = getid3_asf::KnownGUIDs();
-		}
-		return array_search($GUIDstring, $GUIDarray);
-	}
-
-	static function ASFIndexObjectIndexTypeLookup($id) {
-		static $ASFIndexObjectIndexTypeLookup = array();
-		if (empty($ASFIndexObjectIndexTypeLookup)) {
-			$ASFIndexObjectIndexTypeLookup[1] = 'Nearest Past Data Packet';
-			$ASFIndexObjectIndexTypeLookup[2] = 'Nearest Past Media Object';
-			$ASFIndexObjectIndexTypeLookup[3] = 'Nearest Past Cleanpoint';
-		}
-		return (isset($ASFIndexObjectIndexTypeLookup[$id]) ? $ASFIndexObjectIndexTypeLookup[$id] : 'invalid');
-	}
-
-	static function GUIDtoBytestring($GUIDstring) {
-		// Microsoft defines these 16-byte (128-bit) GUIDs in the strangest way:
-		// first 4 bytes are in little-endian order
-		// next 2 bytes are appended in little-endian order
-		// next 2 bytes are appended in little-endian order
-		// next 2 bytes are appended in big-endian order
-		// next 6 bytes are appended in big-endian order
-
-		// AaBbCcDd-EeFf-GgHh-IiJj-KkLlMmNnOoPp is stored as this 16-byte string:
-		// $Dd $Cc $Bb $Aa $Ff $Ee $Hh $Gg $Ii $Jj $Kk $Ll $Mm $Nn $Oo $Pp
-
-		$hexbytecharstring  = chr(hexdec(substr($GUIDstring,  6, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring,  4, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring,  2, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring,  0, 2)));
-
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 11, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring,  9, 2)));
-
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 16, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 14, 2)));
-
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 19, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 21, 2)));
-
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 24, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 26, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 28, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 30, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 32, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 34, 2)));
-
-		return $hexbytecharstring;
-	}
-
-	static function BytestringToGUID($Bytestring) {
-		$GUIDstring  = str_pad(dechex(ord($Bytestring{3})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{2})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{1})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{0})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= '-';
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{5})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{4})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= '-';
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{7})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{6})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= '-';
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{8})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{9})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= '-';
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{10})), 2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{11})), 2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{12})), 2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{13})), 2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{14})), 2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{15})), 2, '0', STR_PAD_LEFT);
-
-		return strtoupper($GUIDstring);
-	}
-
-	static function FILETIMEtoUNIXtime($FILETIME, $round=true) {
-		// FILETIME is a 64-bit unsigned integer representing
-		// the number of 100-nanosecond intervals since January 1, 1601
-		// UNIX timestamp is number of seconds since January 1, 1970
-		// 116444736000000000 = 10000000 * 60 * 60 * 24 * 365 * 369 + 89 leap days
-		if ($round) {
-			return intval(round(($FILETIME - 116444736000000000) / 10000000));
-		}
-		return ($FILETIME - 116444736000000000) / 10000000;
-	}
-
-	static function WMpictureTypeLookup($WMpictureType) {
-		static $WMpictureTypeLookup = array();
-		if (empty($WMpictureTypeLookup)) {
-			$WMpictureTypeLookup[0x03] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Front Cover');
-			$WMpictureTypeLookup[0x04] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Back Cover');
-			$WMpictureTypeLookup[0x00] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'User Defined');
-			$WMpictureTypeLookup[0x05] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Leaflet Page');
-			$WMpictureTypeLookup[0x06] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Media Label');
-			$WMpictureTypeLookup[0x07] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Lead Artist');
-			$WMpictureTypeLookup[0x08] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Artist');
-			$WMpictureTypeLookup[0x09] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Conductor');
-			$WMpictureTypeLookup[0x0A] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Band');
-			$WMpictureTypeLookup[0x0B] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Composer');
-			$WMpictureTypeLookup[0x0C] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Lyricist');
-			$WMpictureTypeLookup[0x0D] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Recording Location');
-			$WMpictureTypeLookup[0x0E] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'During Recording');
-			$WMpictureTypeLookup[0x0F] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'During Performance');
-			$WMpictureTypeLookup[0x10] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Video Screen Capture');
-			$WMpictureTypeLookup[0x12] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Illustration');
-			$WMpictureTypeLookup[0x13] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Band Logotype');
-			$WMpictureTypeLookup[0x14] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Publisher Logotype');
-		}
-		return (isset($WMpictureTypeLookup[$WMpictureType]) ? $WMpictureTypeLookup[$WMpictureType] : '');
-	}
-
-	function ASF_HeaderExtensionObjectDataParse(&$asf_header_extension_object_data, &$unhandled_sections) {
-		// http://msdn.microsoft.com/en-us/library/bb643323.aspx
-
-		$offset = 0;
-		$objectOffset = 0;
-		$HeaderExtensionObjectParsed = array();
-		while ($objectOffset < strlen($asf_header_extension_object_data)) {
-			$offset = $objectOffset;
-			$thisObject = array();
-
-			$thisObject['guid']                              =                              substr($asf_header_extension_object_data, $offset, 16);
-			$offset += 16;
-			$thisObject['guid_text'] = $this->BytestringToGUID($thisObject['guid']);
-			$thisObject['guid_name'] = $this->GUIDname($thisObject['guid_text']);
-
-			$thisObject['size']                              = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  8));
-			$offset += 8;
-			if ($thisObject['size'] <= 0) {
-				break;
-			}
-
-			switch ($thisObject['guid']) {
-				case GETID3_ASF_Extended_Stream_Properties_Object:
-					$thisObject['start_time']                        = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  8));
-					$offset += 8;
-					$thisObject['start_time_unix']                   = $this->FILETIMEtoUNIXtime($thisObject['start_time']);
-
-					$thisObject['end_time']                          = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  8));
-					$offset += 8;
-					$thisObject['end_time_unix']                     = $this->FILETIMEtoUNIXtime($thisObject['end_time']);
-
-					$thisObject['data_bitrate']                      = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
-					$offset += 4;
-
-					$thisObject['buffer_size']                       = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
-					$offset += 4;
-
-					$thisObject['initial_buffer_fullness']           = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
-					$offset += 4;
-
-					$thisObject['alternate_data_bitrate']            = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
-					$offset += 4;
-
-					$thisObject['alternate_buffer_size']             = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
-					$offset += 4;
-
-					$thisObject['alternate_initial_buffer_fullness'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
-					$offset += 4;
-
-					$thisObject['maximum_object_size']               = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
-					$offset += 4;
-
-					$thisObject['flags_raw']                         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
-					$offset += 4;
-					$thisObject['flags']['reliable']                = (bool) $thisObject['flags_raw'] & 0x00000001;
-					$thisObject['flags']['seekable']                = (bool) $thisObject['flags_raw'] & 0x00000002;
-					$thisObject['flags']['no_cleanpoints']          = (bool) $thisObject['flags_raw'] & 0x00000004;
-					$thisObject['flags']['resend_live_cleanpoints'] = (bool) $thisObject['flags_raw'] & 0x00000008;
-
-					$thisObject['stream_number']                     = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-					$offset += 2;
-
-					$thisObject['stream_language_id_index']          = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-					$offset += 2;
-
-					$thisObject['average_time_per_frame']            = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
-					$offset += 4;
-
-					$thisObject['stream_name_count']                 = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-					$offset += 2;
-
-					$thisObject['payload_extension_system_count']    = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-					$offset += 2;
-
-					for ($i = 0; $i < $thisObject['stream_name_count']; $i++) {
-						$streamName = array();
-
-						$streamName['language_id_index']             = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-						$offset += 2;
-
-						$streamName['stream_name_length']            = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-						$offset += 2;
-
-						$streamName['stream_name']                   = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  $streamName['stream_name_length']));
-						$offset += $streamName['stream_name_length'];
-
-						$thisObject['stream_names'][$i] = $streamName;
-					}
-
-					for ($i = 0; $i < $thisObject['payload_extension_system_count']; $i++) {
-						$payloadExtensionSystem = array();
-
-						$payloadExtensionSystem['extension_system_id']   =                              substr($asf_header_extension_object_data, $offset, 16);
-						$offset += 16;
-						$payloadExtensionSystem['extension_system_id_text'] = $this->BytestringToGUID($payloadExtensionSystem['extension_system_id']);
-
-						$payloadExtensionSystem['extension_system_size'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-						$offset += 2;
-						if ($payloadExtensionSystem['extension_system_size'] <= 0) {
-							break 2;
-						}
-
-						$payloadExtensionSystem['extension_system_info_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
-						$offset += 4;
-
-						$payloadExtensionSystem['extension_system_info_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  $payloadExtensionSystem['extension_system_info_length']));
-						$offset += $payloadExtensionSystem['extension_system_info_length'];
-
-						$thisObject['payload_extension_systems'][$i] = $payloadExtensionSystem;
-					}
-
-					break;
-
-				case GETID3_ASF_Padding_Object:
-					// padding, skip it
-					break;
-
-				case GETID3_ASF_Metadata_Object:
-					$thisObject['description_record_counts'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-					$offset += 2;
-
-					for ($i = 0; $i < $thisObject['description_record_counts']; $i++) {
-						$descriptionRecord = array();
-
-						$descriptionRecord['reserved_1']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2)); // must be zero
-						$offset += 2;
-
-						$descriptionRecord['stream_number']      = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-						$offset += 2;
-
-						$descriptionRecord['name_length']        = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-						$offset += 2;
-
-						$descriptionRecord['data_type']          = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-						$offset += 2;
-						$descriptionRecord['data_type_text'] = $this->ASFmetadataLibraryObjectDataTypeLookup($descriptionRecord['data_type']);
-
-						$descriptionRecord['data_length']        = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
-						$offset += 4;
-
-						$descriptionRecord['name']               =                              substr($asf_header_extension_object_data, $offset,  $descriptionRecord['name_length']);
-						$offset += $descriptionRecord['name_length'];
-
-						$descriptionRecord['data']               =                              substr($asf_header_extension_object_data, $offset,  $descriptionRecord['data_length']);
-						$offset += $descriptionRecord['data_length'];
-						switch ($descriptionRecord['data_type']) {
-							case 0x0000: // Unicode string
-								break;
-
-							case 0x0001: // BYTE array
-								// do nothing
-								break;
-
-							case 0x0002: // BOOL
-								$descriptionRecord['data'] = (bool) getid3_lib::LittleEndian2Int($descriptionRecord['data']);
-								break;
-
-							case 0x0003: // DWORD
-							case 0x0004: // QWORD
-							case 0x0005: // WORD
-								$descriptionRecord['data'] = getid3_lib::LittleEndian2Int($descriptionRecord['data']);
-								break;
-
-							case 0x0006: // GUID
-								$descriptionRecord['data_text'] = $this->BytestringToGUID($descriptionRecord['data']);
-								break;
-						}
-
-						$thisObject['description_record'][$i] = $descriptionRecord;
-					}
-					break;
-
-				case GETID3_ASF_Language_List_Object:
-					$thisObject['language_id_record_counts'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-					$offset += 2;
-
-					for ($i = 0; $i < $thisObject['language_id_record_counts']; $i++) {
-						$languageIDrecord = array();
-
-						$languageIDrecord['language_id_length']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  1));
-						$offset += 1;
-
-						$languageIDrecord['language_id']                =                              substr($asf_header_extension_object_data, $offset,  $languageIDrecord['language_id_length']);
-						$offset += $languageIDrecord['language_id_length'];
-
-						$thisObject['language_id_record'][$i] = $languageIDrecord;
-					}
-					break;
-
-				case GETID3_ASF_Metadata_Library_Object:
-					$thisObject['description_records_count'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-					$offset += 2;
-
-					for ($i = 0; $i < $thisObject['description_records_count']; $i++) {
-						$descriptionRecord = array();
-
-						$descriptionRecord['language_list_index'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-						$offset += 2;
-
-						$descriptionRecord['stream_number']       = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-						$offset += 2;
-
-						$descriptionRecord['name_length']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-						$offset += 2;
-
-						$descriptionRecord['data_type']           = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
-						$offset += 2;
-						$descriptionRecord['data_type_text'] = $this->ASFmetadataLibraryObjectDataTypeLookup($descriptionRecord['data_type']);
-
-						$descriptionRecord['data_length']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
-						$offset += 4;
-
-						$descriptionRecord['name']                =                              substr($asf_header_extension_object_data, $offset,  $descriptionRecord['name_length']);
-						$offset += $descriptionRecord['name_length'];
-
-						$descriptionRecord['data']                =                              substr($asf_header_extension_object_data, $offset,  $descriptionRecord['data_length']);
-						$offset += $descriptionRecord['data_length'];
-
-						if (preg_match('#^WM/Picture$#', str_replace("\x00", '', trim($descriptionRecord['name'])))) {
-							$WMpicture = $this->ASF_WMpicture($descriptionRecord['data']);
-							foreach ($WMpicture as $key => $value) {
-								$descriptionRecord['data'] = $WMpicture;
-							}
-							unset($WMpicture);
-						}
-
-						$thisObject['description_record'][$i] = $descriptionRecord;
-					}
-					break;
-
-				default:
-					$unhandled_sections++;
-					if ($this->GUIDname($thisObject['guid_text'])) {
-						$this->getid3->info['warning'][] = 'unhandled Header Extension Object GUID "'.$this->GUIDname($thisObject['guid_text']).'" {'.$thisObject['guid_text'].'} at offset '.($offset - 16 - 8);
-					} else {
-						$this->getid3->info['warning'][] = 'unknown Header Extension Object GUID {'.$thisObject['guid_text'].'} in at offset '.($offset - 16 - 8);
-					}
-					break;
-			}
-			$HeaderExtensionObjectParsed[] = $thisObject;
-
-			$objectOffset += $thisObject['size'];
-		}
-		return $HeaderExtensionObjectParsed;
-	}
-
-
-	static function ASFmetadataLibraryObjectDataTypeLookup($id) {
-		static $ASFmetadataLibraryObjectDataTypeLookup = array(
-			0x0000 => 'Unicode string', // The data consists of a sequence of Unicode characters
-			0x0001 => 'BYTE array',     // The type of the data is implementation-specific
-			0x0002 => 'BOOL',           // The data is 2 bytes long and should be interpreted as a 16-bit unsigned integer. Only 0x0000 or 0x0001 are permitted values
-			0x0003 => 'DWORD',          // The data is 4 bytes long and should be interpreted as a 32-bit unsigned integer
-			0x0004 => 'QWORD',          // The data is 8 bytes long and should be interpreted as a 64-bit unsigned integer
-			0x0005 => 'WORD',           // The data is 2 bytes long and should be interpreted as a 16-bit unsigned integer
-			0x0006 => 'GUID',           // The data is 16 bytes long and should be interpreted as a 128-bit GUID
-		);
-		return (isset($ASFmetadataLibraryObjectDataTypeLookup[$id]) ? $ASFmetadataLibraryObjectDataTypeLookup[$id] : 'invalid');
-	}
-
-	function ASF_WMpicture(&$data) {
-		//typedef struct _WMPicture{
-		//  LPWSTR  pwszMIMEType;
-		//  BYTE  bPictureType;
-		//  LPWSTR  pwszDescription;
-		//  DWORD  dwDataLen;
-		//  BYTE*  pbData;
-		//} WM_PICTURE;
-
-		$WMpicture = array();
-
-		$offset = 0;
-		$WMpicture['image_type_id'] = getid3_lib::LittleEndian2Int(substr($data, $offset, 1));
-		$offset += 1;
-		$WMpicture['image_type']    = $this->WMpictureTypeLookup($WMpicture['image_type_id']);
-		$WMpicture['image_size']    = getid3_lib::LittleEndian2Int(substr($data, $offset, 4));
-		$offset += 4;
-
-		$WMpicture['image_mime'] = '';
-		do {
-			$next_byte_pair = substr($data, $offset, 2);
-			$offset += 2;
-			$WMpicture['image_mime'] .= $next_byte_pair;
-		} while ($next_byte_pair !== "\x00\x00");
-
-		$WMpicture['image_description'] = '';
-		do {
-			$next_byte_pair = substr($data, $offset, 2);
-			$offset += 2;
-			$WMpicture['image_description'] .= $next_byte_pair;
-		} while ($next_byte_pair !== "\x00\x00");
-
-		$WMpicture['dataoffset'] = $offset;
-		$WMpicture['data'] = substr($data, $offset);
-
-		$imageinfo = array();
-		$WMpicture['image_mime'] = '';
-		$imagechunkcheck = getid3_lib::GetDataImageSize($WMpicture['data'], $imageinfo);
-		unset($imageinfo);
-		if (!empty($imagechunkcheck)) {
-			$WMpicture['image_mime'] = image_type_to_mime_type($imagechunkcheck[2]);
-		}
-		if (!isset($this->getid3->info['asf']['comments']['picture'])) {
-			$this->getid3->info['asf']['comments']['picture'] = array();
-		}
-		$this->getid3->info['asf']['comments']['picture'][] = array('data'=>$WMpicture['data'], 'image_mime'=>$WMpicture['image_mime']);
-
-		return $WMpicture;
-	}
-
-
-	// Remove terminator 00 00 and convert UTF-16LE to Latin-1
-	static function TrimConvert($string) {
-		return trim(getid3_lib::iconv_fallback('UTF-16LE', 'ISO-8859-1', getid3_asf::TrimTerm($string)), ' ');
-	}
-
-
-	// Remove terminator 00 00
-	static function TrimTerm($string) {
-		// remove terminator, only if present (it should be, but...)
-		if (substr($string, -2) === "\x00\x00") {
-			$string = substr($string, 0, -2);
-		}
-		return $string;
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio-video.bink.php b/lib/getid3/getid3/module.audio-video.bink.php
deleted file mode 100644
index 0a3213967..000000000
--- a/lib/getid3/getid3/module.audio-video.bink.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.bink.php                                       //
-// module for analyzing Bink or Smacker audio-video files      //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_bink extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-$info['error'][] = 'Bink / Smacker files not properly processed by this version of getID3() ['.$this->getid3->version().']';
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$fileTypeID = fread($this->getid3->fp, 3);
-		switch ($fileTypeID) {
-			case 'BIK':
-				return $this->ParseBink();
-				break;
-
-			case 'SMK':
-				return $this->ParseSmacker();
-				break;
-
-			default:
-				$info['error'][] = 'Expecting "BIK" or "SMK" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($fileTypeID).'"';
-				return false;
-				break;
-		}
-
-		return true;
-
-	}
-
-	function ParseBink() {
-		$info = &$this->getid3->info;
-		$info['fileformat']          = 'bink';
-		$info['video']['dataformat'] = 'bink';
-
-		$fileData = 'BIK'.fread($this->getid3->fp, 13);
-
-		$info['bink']['data_size']   = getid3_lib::LittleEndian2Int(substr($fileData, 4, 4));
-		$info['bink']['frame_count'] = getid3_lib::LittleEndian2Int(substr($fileData, 8, 2));
-
-		if (($info['avdataend'] - $info['avdataoffset']) != ($info['bink']['data_size'] + 8)) {
-			$info['error'][] = 'Probably truncated file: expecting '.$info['bink']['data_size'].' bytes, found '.($info['avdataend'] - $info['avdataoffset']);
-		}
-
-		return true;
-	}
-
-	function ParseSmacker() {
-		$info = &$this->getid3->info;
-		$info['fileformat']          = 'smacker';
-		$info['video']['dataformat'] = 'smacker';
-
-		return true;
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio-video.flv.php b/lib/getid3/getid3/module.audio-video.flv.php
deleted file mode 100644
index ba3cd908d..000000000
--- a/lib/getid3/getid3/module.audio-video.flv.php
+++ /dev/null
@@ -1,731 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-//                                                             //
-//  FLV module by Seth Kaufman <seth@whirl-i-gig.com>          //
-//                                                             //
-//  * version 0.1 (26 June 2005)                               //
-//                                                             //
-//                                                             //
-//  * version 0.1.1 (15 July 2005)                             //
-//  minor modifications by James Heinrich <info@getid3.org>    //
-//                                                             //
-//  * version 0.2 (22 February 2006)                           //
-//  Support for On2 VP6 codec and meta information             //
-//    by Steve Webster <steve.webster@featurecreep.com>        //
-//                                                             //
-//  * version 0.3 (15 June 2006)                               //
-//  Modified to not read entire file into memory               //
-//    by James Heinrich <info@getid3.org>                      //
-//                                                             //
-//  * version 0.4 (07 December 2007)                           //
-//  Bugfixes for incorrectly parsed FLV dimensions             //
-//    and incorrect parsing of onMetaTag                       //
-//    by Evgeny Moysevich <moysevich@gmail.com>                //
-//                                                             //
-//  * version 0.5 (21 May 2009)                                //
-//  Fixed parsing of audio tags and added additional codec     //
-//    details. The duration is now read from onMetaTag (if     //
-//    exists), rather than parsing whole file                  //
-//    by Nigel Barnes <ngbarnes@hotmail.com>                   //
-//                                                             //
-//  * version 0.6 (24 May 2009)                                //
-//  Better parsing of files with h264 video                    //
-//    by Evgeny Moysevich <moysevich�gmail*com>                //
-//                                                             //
-//  * version 0.6.1 (30 May 2011)                              //
-//    prevent infinite loops in expGolombUe()                  //
-//                                                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio-video.flv.php                                  //
-// module for analyzing Shockwave Flash Video files            //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-define('GETID3_FLV_TAG_AUDIO',          8);
-define('GETID3_FLV_TAG_VIDEO',          9);
-define('GETID3_FLV_TAG_META',          18);
-
-define('GETID3_FLV_VIDEO_H263',         2);
-define('GETID3_FLV_VIDEO_SCREEN',       3);
-define('GETID3_FLV_VIDEO_VP6FLV',       4);
-define('GETID3_FLV_VIDEO_VP6FLV_ALPHA', 5);
-define('GETID3_FLV_VIDEO_SCREENV2',     6);
-define('GETID3_FLV_VIDEO_H264',         7);
-
-define('H264_AVC_SEQUENCE_HEADER',          0);
-define('H264_PROFILE_BASELINE',            66);
-define('H264_PROFILE_MAIN',                77);
-define('H264_PROFILE_EXTENDED',            88);
-define('H264_PROFILE_HIGH',               100);
-define('H264_PROFILE_HIGH10',             110);
-define('H264_PROFILE_HIGH422',            122);
-define('H264_PROFILE_HIGH444',            144);
-define('H264_PROFILE_HIGH444_PREDICTIVE', 244);
-
-class getid3_flv extends getid3_handler
-{
-	var $max_frames = 100000; // break out of the loop if too many frames have been scanned; only scan this many if meta frame does not contain useful duration
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-
-		$FLVdataLength = $info['avdataend'] - $info['avdataoffset'];
-		$FLVheader = fread($this->getid3->fp, 5);
-
-		$info['fileformat'] = 'flv';
-		$info['flv']['header']['signature'] =                           substr($FLVheader, 0, 3);
-		$info['flv']['header']['version']   = getid3_lib::BigEndian2Int(substr($FLVheader, 3, 1));
-		$TypeFlags                          = getid3_lib::BigEndian2Int(substr($FLVheader, 4, 1));
-
-		$magic = 'FLV';
-		if ($info['flv']['header']['signature'] != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($info['flv']['header']['signature']).'"';
-			unset($info['flv']);
-			unset($info['fileformat']);
-			return false;
-		}
-
-		$info['flv']['header']['hasAudio'] = (bool) ($TypeFlags & 0x04);
-		$info['flv']['header']['hasVideo'] = (bool) ($TypeFlags & 0x01);
-
-		$FrameSizeDataLength = getid3_lib::BigEndian2Int(fread($this->getid3->fp, 4));
-		$FLVheaderFrameLength = 9;
-		if ($FrameSizeDataLength > $FLVheaderFrameLength) {
-			fseek($this->getid3->fp, $FrameSizeDataLength - $FLVheaderFrameLength, SEEK_CUR);
-		}
-		$Duration = 0;
-		$found_video = false;
-		$found_audio = false;
-		$found_meta  = false;
-		$found_valid_meta_playtime = false;
-		$tagParseCount = 0;
-		$info['flv']['framecount'] = array('total'=>0, 'audio'=>0, 'video'=>0);
-		$flv_framecount = &$info['flv']['framecount'];
-		while (((ftell($this->getid3->fp) + 16) < $info['avdataend']) && (($tagParseCount++ <= $this->max_frames) || !$found_valid_meta_playtime))  {
-			$ThisTagHeader = fread($this->getid3->fp, 16);
-
-			$PreviousTagLength = getid3_lib::BigEndian2Int(substr($ThisTagHeader,  0, 4));
-			$TagType           = getid3_lib::BigEndian2Int(substr($ThisTagHeader,  4, 1));
-			$DataLength        = getid3_lib::BigEndian2Int(substr($ThisTagHeader,  5, 3));
-			$Timestamp         = getid3_lib::BigEndian2Int(substr($ThisTagHeader,  8, 3));
-			$LastHeaderByte    = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 15, 1));
-			$NextOffset = ftell($this->getid3->fp) - 1 + $DataLength;
-			if ($Timestamp > $Duration) {
-				$Duration = $Timestamp;
-			}
-
-			$flv_framecount['total']++;
-			switch ($TagType) {
-				case GETID3_FLV_TAG_AUDIO:
-					$flv_framecount['audio']++;
-					if (!$found_audio) {
-						$found_audio = true;
-						$info['flv']['audio']['audioFormat']     = ($LastHeaderByte >> 4) & 0x0F;
-						$info['flv']['audio']['audioRate']       = ($LastHeaderByte >> 2) & 0x03;
-						$info['flv']['audio']['audioSampleSize'] = ($LastHeaderByte >> 1) & 0x01;
-						$info['flv']['audio']['audioType']       =  $LastHeaderByte       & 0x01;
-					}
-					break;
-
-				case GETID3_FLV_TAG_VIDEO:
-					$flv_framecount['video']++;
-					if (!$found_video) {
-						$found_video = true;
-						$info['flv']['video']['videoCodec'] = $LastHeaderByte & 0x07;
-
-						$FLVvideoHeader = fread($this->getid3->fp, 11);
-
-						if ($info['flv']['video']['videoCodec'] == GETID3_FLV_VIDEO_H264) {
-							// this code block contributed by: moysevich�gmail*com
-
-							$AVCPacketType = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 0, 1));
-							if ($AVCPacketType == H264_AVC_SEQUENCE_HEADER) {
-								//	read AVCDecoderConfigurationRecord
-								$configurationVersion       = getid3_lib::BigEndian2Int(substr($FLVvideoHeader,  4, 1));
-								$AVCProfileIndication       = getid3_lib::BigEndian2Int(substr($FLVvideoHeader,  5, 1));
-								$profile_compatibility      = getid3_lib::BigEndian2Int(substr($FLVvideoHeader,  6, 1));
-								$lengthSizeMinusOne         = getid3_lib::BigEndian2Int(substr($FLVvideoHeader,  7, 1));
-								$numOfSequenceParameterSets = getid3_lib::BigEndian2Int(substr($FLVvideoHeader,  8, 1));
-
-								if (($numOfSequenceParameterSets & 0x1F) != 0) {
-									//	there is at least one SequenceParameterSet
-									//	read size of the first SequenceParameterSet
-									//$spsSize = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 9, 2));
-									$spsSize = getid3_lib::LittleEndian2Int(substr($FLVvideoHeader, 9, 2));
-									//	read the first SequenceParameterSet
-									$sps = fread($this->getid3->fp, $spsSize);
-									if (strlen($sps) == $spsSize) {	//	make sure that whole SequenceParameterSet was red
-										$spsReader = new AVCSequenceParameterSetReader($sps);
-										$spsReader->readData();
-										$info['video']['resolution_x'] = $spsReader->getWidth();
-										$info['video']['resolution_y'] = $spsReader->getHeight();
-									}
-								}
-							}
-							// end: moysevich�gmail*com
-
-						} elseif ($info['flv']['video']['videoCodec'] == GETID3_FLV_VIDEO_H263) {
-
-							$PictureSizeType = (getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 3, 2))) >> 7;
-							$PictureSizeType = $PictureSizeType & 0x0007;
-							$info['flv']['header']['videoSizeType'] = $PictureSizeType;
-							switch ($PictureSizeType) {
-								case 0:
-									//$PictureSizeEnc = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 5, 2));
-									//$PictureSizeEnc <<= 1;
-									//$info['video']['resolution_x'] = ($PictureSizeEnc & 0xFF00) >> 8;
-									//$PictureSizeEnc = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 6, 2));
-									//$PictureSizeEnc <<= 1;
-									//$info['video']['resolution_y'] = ($PictureSizeEnc & 0xFF00) >> 8;
-
-									$PictureSizeEnc['x'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 4, 2));
-									$PictureSizeEnc['y'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 5, 2));
-									$PictureSizeEnc['x'] >>= 7;
-									$PictureSizeEnc['y'] >>= 7;
-									$info['video']['resolution_x'] = $PictureSizeEnc['x'] & 0xFF;
-									$info['video']['resolution_y'] = $PictureSizeEnc['y'] & 0xFF;
-									break;
-
-								case 1:
-									$PictureSizeEnc['x'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 4, 3));
-									$PictureSizeEnc['y'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 6, 3));
-									$PictureSizeEnc['x'] >>= 7;
-									$PictureSizeEnc['y'] >>= 7;
-									$info['video']['resolution_x'] = $PictureSizeEnc['x'] & 0xFFFF;
-									$info['video']['resolution_y'] = $PictureSizeEnc['y'] & 0xFFFF;
-									break;
-
-								case 2:
-									$info['video']['resolution_x'] = 352;
-									$info['video']['resolution_y'] = 288;
-									break;
-
-								case 3:
-									$info['video']['resolution_x'] = 176;
-									$info['video']['resolution_y'] = 144;
-									break;
-
-								case 4:
-									$info['video']['resolution_x'] = 128;
-									$info['video']['resolution_y'] = 96;
-									break;
-
-								case 5:
-									$info['video']['resolution_x'] = 320;
-									$info['video']['resolution_y'] = 240;
-									break;
-
-								case 6:
-									$info['video']['resolution_x'] = 160;
-									$info['video']['resolution_y'] = 120;
-									break;
-
-								default:
-									$info['video']['resolution_x'] = 0;
-									$info['video']['resolution_y'] = 0;
-									break;
-
-							}
-						}
-						$info['video']['pixel_aspect_ratio'] = $info['video']['resolution_x'] / $info['video']['resolution_y'];
-					}
-					break;
-
-				// Meta tag
-				case GETID3_FLV_TAG_META:
-					if (!$found_meta) {
-						$found_meta = true;
-						fseek($this->getid3->fp, -1, SEEK_CUR);
-						$datachunk = fread($this->getid3->fp, $DataLength);
-						$AMFstream = new AMFStream($datachunk);
-						$reader = new AMFReader($AMFstream);
-						$eventName = $reader->readData();
-						$info['flv']['meta'][$eventName] = $reader->readData();
-						unset($reader);
-
-						$copykeys = array('framerate'=>'frame_rate', 'width'=>'resolution_x', 'height'=>'resolution_y', 'audiodatarate'=>'bitrate', 'videodatarate'=>'bitrate');
-						foreach ($copykeys as $sourcekey => $destkey) {
-							if (isset($info['flv']['meta']['onMetaData'][$sourcekey])) {
-								switch ($sourcekey) {
-									case 'width':
-									case 'height':
-										$info['video'][$destkey] = intval(round($info['flv']['meta']['onMetaData'][$sourcekey]));
-										break;
-									case 'audiodatarate':
-										$info['audio'][$destkey] = getid3_lib::CastAsInt(round($info['flv']['meta']['onMetaData'][$sourcekey] * 1000));
-										break;
-									case 'videodatarate':
-									case 'frame_rate':
-									default:
-										$info['video'][$destkey] = $info['flv']['meta']['onMetaData'][$sourcekey];
-										break;
-								}
-							}
-						}
-						if (!empty($info['flv']['meta']['onMetaData']['duration'])) {
-							$found_valid_meta_playtime = true;
-						}
-					}
-					break;
-
-				default:
-					// noop
-					break;
-			}
-			fseek($this->getid3->fp, $NextOffset, SEEK_SET);
-		}
-
-		$info['playtime_seconds'] = $Duration / 1000;
-		if ($info['playtime_seconds'] > 0) {
-			$info['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-		}
-
-		if ($info['flv']['header']['hasAudio']) {
-			$info['audio']['codec']           =   $this->FLVaudioFormat($info['flv']['audio']['audioFormat']);
-			$info['audio']['sample_rate']     =     $this->FLVaudioRate($info['flv']['audio']['audioRate']);
-			$info['audio']['bits_per_sample'] = $this->FLVaudioBitDepth($info['flv']['audio']['audioSampleSize']);
-
-			$info['audio']['channels']   =  $info['flv']['audio']['audioType'] + 1; // 0=mono,1=stereo
-			$info['audio']['lossless']   = ($info['flv']['audio']['audioFormat'] ? false : true); // 0=uncompressed
-			$info['audio']['dataformat'] = 'flv';
-		}
-		if (!empty($info['flv']['header']['hasVideo'])) {
-			$info['video']['codec']      = $this->FLVvideoCodec($info['flv']['video']['videoCodec']);
-			$info['video']['dataformat'] = 'flv';
-			$info['video']['lossless']   = false;
-		}
-
-		// Set information from meta
-		if (!empty($info['flv']['meta']['onMetaData']['duration'])) {
-			$info['playtime_seconds'] = $info['flv']['meta']['onMetaData']['duration'];
-			$info['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-		}
-		if (isset($info['flv']['meta']['onMetaData']['audiocodecid'])) {
-			$info['audio']['codec'] = $this->FLVaudioFormat($info['flv']['meta']['onMetaData']['audiocodecid']);
-		}
-		if (isset($info['flv']['meta']['onMetaData']['videocodecid'])) {
-			$info['video']['codec'] = $this->FLVvideoCodec($info['flv']['meta']['onMetaData']['videocodecid']);
-		}
-		return true;
-	}
-
-
-	function FLVaudioFormat($id) {
-		$FLVaudioFormat = array(
-			0  => 'Linear PCM, platform endian',
-			1  => 'ADPCM',
-			2  => 'mp3',
-			3  => 'Linear PCM, little endian',
-			4  => 'Nellymoser 16kHz mono',
-			5  => 'Nellymoser 8kHz mono',
-			6  => 'Nellymoser',
-			7  => 'G.711A-law logarithmic PCM',
-			8  => 'G.711 mu-law logarithmic PCM',
-			9  => 'reserved',
-			10 => 'AAC',
-			11 => false, // unknown?
-			12 => false, // unknown?
-			13 => false, // unknown?
-			14 => 'mp3 8kHz',
-			15 => 'Device-specific sound',
-		);
-		return (isset($FLVaudioFormat[$id]) ? $FLVaudioFormat[$id] : false);
-	}
-
-	function FLVaudioRate($id) {
-		$FLVaudioRate = array(
-			0 =>  5500,
-			1 => 11025,
-			2 => 22050,
-			3 => 44100,
-		);
-		return (isset($FLVaudioRate[$id]) ? $FLVaudioRate[$id] : false);
-	}
-
-	function FLVaudioBitDepth($id) {
-		$FLVaudioBitDepth = array(
-			0 =>  8,
-			1 => 16,
-		);
-		return (isset($FLVaudioBitDepth[$id]) ? $FLVaudioBitDepth[$id] : false);
-	}
-
-	function FLVvideoCodec($id) {
-		$FLVvideoCodec = array(
-			GETID3_FLV_VIDEO_H263         => 'Sorenson H.263',
-			GETID3_FLV_VIDEO_SCREEN       => 'Screen video',
-			GETID3_FLV_VIDEO_VP6FLV       => 'On2 VP6',
-			GETID3_FLV_VIDEO_VP6FLV_ALPHA => 'On2 VP6 with alpha channel',
-			GETID3_FLV_VIDEO_SCREENV2     => 'Screen video v2',
-			GETID3_FLV_VIDEO_H264         => 'Sorenson H.264',
-		);
-		return (isset($FLVvideoCodec[$id]) ? $FLVvideoCodec[$id] : false);
-	}
-}
-
-class AMFStream {
-	var $bytes;
-	var $pos;
-
-	function AMFStream(&$bytes) {
-		$this->bytes =& $bytes;
-		$this->pos = 0;
-	}
-
-	function readByte() {
-		return getid3_lib::BigEndian2Int(substr($this->bytes, $this->pos++, 1));
-	}
-
-	function readInt() {
-		return ($this->readByte() << 8) + $this->readByte();
-	}
-
-	function readLong() {
-		return ($this->readByte() << 24) + ($this->readByte() << 16) + ($this->readByte() << 8) + $this->readByte();
-	}
-
-	function readDouble() {
-		return getid3_lib::BigEndian2Float($this->read(8));
-	}
-
-	function readUTF() {
-		$length = $this->readInt();
-		return $this->read($length);
-	}
-
-	function readLongUTF() {
-		$length = $this->readLong();
-		return $this->read($length);
-	}
-
-	function read($length) {
-		$val = substr($this->bytes, $this->pos, $length);
-		$this->pos += $length;
-		return $val;
-	}
-
-	function peekByte() {
-		$pos = $this->pos;
-		$val = $this->readByte();
-		$this->pos = $pos;
-		return $val;
-	}
-
-	function peekInt() {
-		$pos = $this->pos;
-		$val = $this->readInt();
-		$this->pos = $pos;
-		return $val;
-	}
-
-	function peekLong() {
-		$pos = $this->pos;
-		$val = $this->readLong();
-		$this->pos = $pos;
-		return $val;
-	}
-
-	function peekDouble() {
-		$pos = $this->pos;
-		$val = $this->readDouble();
-		$this->pos = $pos;
-		return $val;
-	}
-
-	function peekUTF() {
-		$pos = $this->pos;
-		$val = $this->readUTF();
-		$this->pos = $pos;
-		return $val;
-	}
-
-	function peekLongUTF() {
-		$pos = $this->pos;
-		$val = $this->readLongUTF();
-		$this->pos = $pos;
-		return $val;
-	}
-}
-
-class AMFReader {
-	var $stream;
-
-	function AMFReader(&$stream) {
-		$this->stream =& $stream;
-	}
-
-	function readData() {
-		$value = null;
-
-		$type = $this->stream->readByte();
-		switch ($type) {
-
-			// Double
-			case 0:
-				$value = $this->readDouble();
-			break;
-
-			// Boolean
-			case 1:
-				$value = $this->readBoolean();
-				break;
-
-			// String
-			case 2:
-				$value = $this->readString();
-				break;
-
-			// Object
-			case 3:
-				$value = $this->readObject();
-				break;
-
-			// null
-			case 6:
-				return null;
-				break;
-
-			// Mixed array
-			case 8:
-				$value = $this->readMixedArray();
-				break;
-
-			// Array
-			case 10:
-				$value = $this->readArray();
-				break;
-
-			// Date
-			case 11:
-				$value = $this->readDate();
-				break;
-
-			// Long string
-			case 13:
-				$value = $this->readLongString();
-				break;
-
-			// XML (handled as string)
-			case 15:
-				$value = $this->readXML();
-				break;
-
-			// Typed object (handled as object)
-			case 16:
-				$value = $this->readTypedObject();
-				break;
-
-			// Long string
-			default:
-				$value = '(unknown or unsupported data type)';
-			break;
-		}
-
-		return $value;
-	}
-
-	function readDouble() {
-		return $this->stream->readDouble();
-	}
-
-	function readBoolean() {
-		return $this->stream->readByte() == 1;
-	}
-
-	function readString() {
-		return $this->stream->readUTF();
-	}
-
-	function readObject() {
-		// Get highest numerical index - ignored
-//		$highestIndex = $this->stream->readLong();
-
-		$data = array();
-
-		while ($key = $this->stream->readUTF()) {
-			$data[$key] = $this->readData();
-		}
-		// Mixed array record ends with empty string (0x00 0x00) and 0x09
-		if (($key == '') && ($this->stream->peekByte() == 0x09)) {
-			// Consume byte
-			$this->stream->readByte();
-		}
-		return $data;
-	}
-
-	function readMixedArray() {
-		// Get highest numerical index - ignored
-		$highestIndex = $this->stream->readLong();
-
-		$data = array();
-
-		while ($key = $this->stream->readUTF()) {
-			if (is_numeric($key)) {
-				$key = (float) $key;
-			}
-			$data[$key] = $this->readData();
-		}
-		// Mixed array record ends with empty string (0x00 0x00) and 0x09
-		if (($key == '') && ($this->stream->peekByte() == 0x09)) {
-			// Consume byte
-			$this->stream->readByte();
-		}
-
-		return $data;
-	}
-
-	function readArray() {
-		$length = $this->stream->readLong();
-		$data = array();
-
-		for ($i = 0; $i < $length; $i++) {
-			$data[] = $this->readData();
-		}
-		return $data;
-	}
-
-	function readDate() {
-		$timestamp = $this->stream->readDouble();
-		$timezone = $this->stream->readInt();
-		return $timestamp;
-	}
-
-	function readLongString() {
-		return $this->stream->readLongUTF();
-	}
-
-	function readXML() {
-		return $this->stream->readLongUTF();
-	}
-
-	function readTypedObject() {
-		$className = $this->stream->readUTF();
-		return $this->readObject();
-	}
-}
-
-class AVCSequenceParameterSetReader {
-	var $sps;
-	var $start = 0;
-	var $currentBytes = 0;
-	var $currentBits = 0;
-	var $width;
-	var $height;
-
-	function AVCSequenceParameterSetReader($sps) {
-		$this->sps = $sps;
-	}
-
-	function readData() {
-		$this->skipBits(8);
-		$this->skipBits(8);
-		$profile = $this->getBits(8);	//	read profile
-		$this->skipBits(16);
-		$this->expGolombUe();	//	read sps id
-		if (in_array($profile, array(H264_PROFILE_HIGH, H264_PROFILE_HIGH10, H264_PROFILE_HIGH422, H264_PROFILE_HIGH444, H264_PROFILE_HIGH444_PREDICTIVE))) {
-			if ($this->expGolombUe() == 3) {
-				$this->skipBits(1);
-			}
-			$this->expGolombUe();
-			$this->expGolombUe();
-			$this->skipBits(1);
-			if ($this->getBit()) {
-				for ($i = 0; $i < 8; $i++) {
-					if ($this->getBit()) {
-						$size = $i < 6 ? 16 : 64;
-						$lastScale = 8;
-						$nextScale = 8;
-						for ($j = 0; $j < $size; $j++) {
-							if ($nextScale != 0) {
-								$deltaScale = $this->expGolombUe();
-								$nextScale = ($lastScale + $deltaScale + 256) % 256;
-							}
-							if ($nextScale != 0) {
-								$lastScale = $nextScale;
-							}
-						}
-					}
-				}
-			}
-		}
-		$this->expGolombUe();
-		$pocType = $this->expGolombUe();
-		if ($pocType == 0) {
-			$this->expGolombUe();
-		} elseif ($pocType == 1) {
-			$this->skipBits(1);
-			$this->expGolombSe();
-			$this->expGolombSe();
-			$pocCycleLength = $this->expGolombUe();
-			for ($i = 0; $i < $pocCycleLength; $i++) {
-				$this->expGolombSe();
-			}
-		}
-		$this->expGolombUe();
-		$this->skipBits(1);
-		$this->width = ($this->expGolombUe() + 1) * 16;
-		$heightMap = $this->expGolombUe() + 1;
-		$this->height = (2 - $this->getBit()) * $heightMap * 16;
-	}
-
-	function skipBits($bits) {
-		$newBits = $this->currentBits + $bits;
-		$this->currentBytes += (int)floor($newBits / 8);
-		$this->currentBits = $newBits % 8;
-	}
-
-	function getBit() {
-		$result = (getid3_lib::BigEndian2Int(substr($this->sps, $this->currentBytes, 1)) >> (7 - $this->currentBits)) & 0x01;
-		$this->skipBits(1);
-		return $result;
-	}
-
-	function getBits($bits) {
-		$result = 0;
-		for ($i = 0; $i < $bits; $i++) {
-			$result = ($result << 1) + $this->getBit();
-		}
-		return $result;
-	}
-
-	function expGolombUe() {
-		$significantBits = 0;
-		$bit = $this->getBit();
-		while ($bit == 0) {
-			$significantBits++;
-			$bit = $this->getBit();
-
-			if ($significantBits > 31) {
-				// something is broken, this is an emergency escape to prevent infinite loops
-				return 0;
-			}
-		}
-		return (1 << $significantBits) + $this->getBits($significantBits) - 1;
-	}
-
-	function expGolombSe() {
-		$result = $this->expGolombUe();
-		if (($result & 0x01) == 0) {
-			return -($result >> 1);
-		} else {
-			return ($result + 1) >> 1;
-		}
-	}
-
-	function getWidth() {
-		return $this->width;
-	}
-
-	function getHeight() {
-		return $this->height;
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio-video.matroska.php b/lib/getid3/getid3/module.audio-video.matroska.php
deleted file mode 100644
index b7ab66798..000000000
--- a/lib/getid3/getid3/module.audio-video.matroska.php
+++ /dev/null
@@ -1,1706 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio-video.matriska.php                             //
-// module for analyzing Matroska containers                    //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-// from: http://www.matroska.org/technical/specs/index.html
-define('EBML_ID_CHAPTERS',                  0x0043A770); // [10][43][A7][70] -- A system to define basic menus and partition data. For more detailed information, look at the Chapters Explanation.
-define('EBML_ID_SEEKHEAD',                  0x014D9B74); // [11][4D][9B][74] -- Contains the position of other level 1 elements.
-define('EBML_ID_TAGS',                      0x0254C367); // [12][54][C3][67] -- Element containing elements specific to Tracks/Chapters. A list of valid tags can be found <http://www.matroska.org/technical/specs/tagging/index.html>.
-define('EBML_ID_INFO',                      0x0549A966); // [15][49][A9][66] -- Contains miscellaneous general information and statistics on the file.
-define('EBML_ID_TRACKS',                    0x0654AE6B); // [16][54][AE][6B] -- A top-level block of information with many tracks described.
-define('EBML_ID_SEGMENT',                   0x08538067); // [18][53][80][67] -- This element contains all other top-level (level 1) elements. Typically a Matroska file is composed of 1 segment.
-define('EBML_ID_ATTACHMENTS',               0x0941A469); // [19][41][A4][69] -- Contain attached files.
-define('EBML_ID_EBML',                      0x0A45DFA3); // [1A][45][DF][A3] -- Set the EBML characteristics of the data to follow. Each EBML document has to start with this.
-define('EBML_ID_CUES',                      0x0C53BB6B); // [1C][53][BB][6B] -- A top-level element to speed seeking access. All entries are local to the segment.
-define('EBML_ID_CLUSTER',                   0x0F43B675); // [1F][43][B6][75] -- The lower level element containing the (monolithic) Block structure.
-define('EBML_ID_LANGUAGE',                    0x02B59C); //     [22][B5][9C] -- Specifies the language of the track in the Matroska languages form.
-define('EBML_ID_TRACKTIMECODESCALE',          0x03314F); //     [23][31][4F] -- The scale to apply on this track to work at normal speed in relation with other tracks (mostly used to adjust video speed when the audio length differs).
-define('EBML_ID_DEFAULTDURATION',             0x03E383); //     [23][E3][83] -- Number of nanoseconds (i.e. not scaled) per frame.
-define('EBML_ID_CODECNAME',                   0x058688); //     [25][86][88] -- A human-readable string specifying the codec.
-define('EBML_ID_CODECDOWNLOADURL',            0x06B240); //     [26][B2][40] -- A URL to download about the codec used.
-define('EBML_ID_TIMECODESCALE',               0x0AD7B1); //     [2A][D7][B1] -- Timecode scale in nanoseconds (1.000.000 means all timecodes in the segment are expressed in milliseconds).
-define('EBML_ID_COLOURSPACE',                 0x0EB524); //     [2E][B5][24] -- Same value as in AVI (32 bits).
-define('EBML_ID_GAMMAVALUE',                  0x0FB523); //     [2F][B5][23] -- Gamma Value.
-define('EBML_ID_CODECSETTINGS',               0x1A9697); //     [3A][96][97] -- A string describing the encoding setting used.
-define('EBML_ID_CODECINFOURL',                0x1B4040); //     [3B][40][40] -- A URL to find information about the codec used.
-define('EBML_ID_PREVFILENAME',                0x1C83AB); //     [3C][83][AB] -- An escaped filename corresponding to the previous segment.
-define('EBML_ID_PREVUID',                     0x1CB923); //     [3C][B9][23] -- A unique ID to identify the previous chained segment (128 bits).
-define('EBML_ID_NEXTFILENAME',                0x1E83BB); //     [3E][83][BB] -- An escaped filename corresponding to the next segment.
-define('EBML_ID_NEXTUID',                     0x1EB923); //     [3E][B9][23] -- A unique ID to identify the next chained segment (128 bits).
-define('EBML_ID_CONTENTCOMPALGO',               0x0254); //         [42][54] -- The compression algorithm used. Algorithms that have been specified so far are:
-define('EBML_ID_CONTENTCOMPSETTINGS',           0x0255); //         [42][55] -- Settings that might be needed by the decompressor. For Header Stripping (ContentCompAlgo=3), the bytes that were removed from the beggining of each frames of the track.
-define('EBML_ID_DOCTYPE',                       0x0282); //         [42][82] -- A string that describes the type of document that follows this EBML header ('matroska' in our case).
-define('EBML_ID_DOCTYPEREADVERSION',            0x0285); //         [42][85] -- The minimum DocType version an interpreter has to support to read this file.
-define('EBML_ID_EBMLVERSION',                   0x0286); //         [42][86] -- The version of EBML parser used to create the file.
-define('EBML_ID_DOCTYPEVERSION',                0x0287); //         [42][87] -- The version of DocType interpreter used to create the file.
-define('EBML_ID_EBMLMAXIDLENGTH',               0x02F2); //         [42][F2] -- The maximum length of the IDs you'll find in this file (4 or less in Matroska).
-define('EBML_ID_EBMLMAXSIZELENGTH',             0x02F3); //         [42][F3] -- The maximum length of the sizes you'll find in this file (8 or less in Matroska). This does not override the element size indicated at the beginning of an element. Elements that have an indicated size which is larger than what is allowed by EBMLMaxSizeLength shall be considered invalid.
-define('EBML_ID_EBMLREADVERSION',               0x02F7); //         [42][F7] -- The minimum EBML version a parser has to support to read this file.
-define('EBML_ID_CHAPLANGUAGE',                  0x037C); //         [43][7C] -- The languages corresponding to the string, in the bibliographic ISO-639-2 form.
-define('EBML_ID_CHAPCOUNTRY',                   0x037E); //         [43][7E] -- The countries corresponding to the string, same 2 octets as in Internet domains.
-define('EBML_ID_SEGMENTFAMILY',                 0x0444); //         [44][44] -- A randomly generated unique ID that all segments related to each other must use (128 bits).
-define('EBML_ID_DATEUTC',                       0x0461); //         [44][61] -- Date of the origin of timecode (value 0), i.e. production date.
-define('EBML_ID_TAGLANGUAGE',                   0x047A); //         [44][7A] -- Specifies the language of the tag specified, in the Matroska languages form.
-define('EBML_ID_TAGDEFAULT',                    0x0484); //         [44][84] -- Indication to know if this is the default/original language to use for the given tag.
-define('EBML_ID_TAGBINARY',                     0x0485); //         [44][85] -- The values of the Tag if it is binary. Note that this cannot be used in the same SimpleTag as TagString.
-define('EBML_ID_TAGSTRING',                     0x0487); //         [44][87] -- The value of the Tag.
-define('EBML_ID_DURATION',                      0x0489); //         [44][89] -- Duration of the segment (based on TimecodeScale).
-define('EBML_ID_CHAPPROCESSPRIVATE',            0x050D); //         [45][0D] -- Some optional data attached to the ChapProcessCodecID information. For ChapProcessCodecID = 1, it is the "DVD level" equivalent.
-define('EBML_ID_CHAPTERFLAGENABLED',            0x0598); //         [45][98] -- Specify wether the chapter is enabled. It can be enabled/disabled by a Control Track. When disabled, the movie should skip all the content between the TimeStart and TimeEnd of this chapter.
-define('EBML_ID_TAGNAME',                       0x05A3); //         [45][A3] -- The name of the Tag that is going to be stored.
-define('EBML_ID_EDITIONENTRY',                  0x05B9); //         [45][B9] -- Contains all information about a segment edition.
-define('EBML_ID_EDITIONUID',                    0x05BC); //         [45][BC] -- A unique ID to identify the edition. It's useful for tagging an edition.
-define('EBML_ID_EDITIONFLAGHIDDEN',             0x05BD); //         [45][BD] -- If an edition is hidden (1), it should not be available to the user interface (but still to Control Tracks).
-define('EBML_ID_EDITIONFLAGDEFAULT',            0x05DB); //         [45][DB] -- If a flag is set (1) the edition should be used as the default one.
-define('EBML_ID_EDITIONFLAGORDERED',            0x05DD); //         [45][DD] -- Specify if the chapters can be defined multiple times and the order to play them is enforced.
-define('EBML_ID_FILEDATA',                      0x065C); //         [46][5C] -- The data of the file.
-define('EBML_ID_FILEMIMETYPE',                  0x0660); //         [46][60] -- MIME type of the file.
-define('EBML_ID_FILENAME',                      0x066E); //         [46][6E] -- Filename of the attached file.
-define('EBML_ID_FILEREFERRAL',                  0x0675); //         [46][75] -- A binary value that a track/codec can refer to when the attachment is needed.
-define('EBML_ID_FILEDESCRIPTION',               0x067E); //         [46][7E] -- A human-friendly name for the attached file.
-define('EBML_ID_FILEUID',                       0x06AE); //         [46][AE] -- Unique ID representing the file, as random as possible.
-define('EBML_ID_CONTENTENCALGO',                0x07E1); //         [47][E1] -- The encryption algorithm used. The value '0' means that the contents have not been encrypted but only signed. Predefined values:
-define('EBML_ID_CONTENTENCKEYID',               0x07E2); //         [47][E2] -- For public key algorithms this is the ID of the public key the the data was encrypted with.
-define('EBML_ID_CONTENTSIGNATURE',              0x07E3); //         [47][E3] -- A cryptographic signature of the contents.
-define('EBML_ID_CONTENTSIGKEYID',               0x07E4); //         [47][E4] -- This is the ID of the private key the data was signed with.
-define('EBML_ID_CONTENTSIGALGO',                0x07E5); //         [47][E5] -- The algorithm used for the signature. A value of '0' means that the contents have not been signed but only encrypted. Predefined values:
-define('EBML_ID_CONTENTSIGHASHALGO',            0x07E6); //         [47][E6] -- The hash algorithm used for the signature. A value of '0' means that the contents have not been signed but only encrypted. Predefined values:
-define('EBML_ID_MUXINGAPP',                     0x0D80); //         [4D][80] -- Muxing application or library ("libmatroska-0.4.3").
-define('EBML_ID_SEEK',                          0x0DBB); //         [4D][BB] -- Contains a single seek entry to an EBML element.
-define('EBML_ID_CONTENTENCODINGORDER',          0x1031); //         [50][31] -- Tells when this modification was used during encoding/muxing starting with 0 and counting upwards. The decoder/demuxer has to start with the highest order number it finds and work its way down. This value has to be unique over all ContentEncodingOrder elements in the segment.
-define('EBML_ID_CONTENTENCODINGSCOPE',          0x1032); //         [50][32] -- A bit field that describes which elements have been modified in this way. Values (big endian) can be OR'ed. Possible values:
-define('EBML_ID_CONTENTENCODINGTYPE',           0x1033); //         [50][33] -- A value describing what kind of transformation has been done. Possible values:
-define('EBML_ID_CONTENTCOMPRESSION',            0x1034); //         [50][34] -- Settings describing the compression used. Must be present if the value of ContentEncodingType is 0 and absent otherwise. Each block must be decompressable even if no previous block is available in order not to prevent seeking.
-define('EBML_ID_CONTENTENCRYPTION',             0x1035); //         [50][35] -- Settings describing the encryption used. Must be present if the value of ContentEncodingType is 1 and absent otherwise.
-define('EBML_ID_CUEREFNUMBER',                  0x135F); //         [53][5F] -- Number of the referenced Block of Track X in the specified Cluster.
-define('EBML_ID_NAME',                          0x136E); //         [53][6E] -- A human-readable track name.
-define('EBML_ID_CUEBLOCKNUMBER',                0x1378); //         [53][78] -- Number of the Block in the specified Cluster.
-define('EBML_ID_TRACKOFFSET',                   0x137F); //         [53][7F] -- A value to add to the Block's Timecode. This can be used to adjust the playback offset of a track.
-define('EBML_ID_SEEKID',                        0x13AB); //         [53][AB] -- The binary ID corresponding to the element name.
-define('EBML_ID_SEEKPOSITION',                  0x13AC); //         [53][AC] -- The position of the element in the segment in octets (0 = first level 1 element).
-define('EBML_ID_STEREOMODE',                    0x13B8); //         [53][B8] -- Stereo-3D video mode on 2 bits (0: mono, 1: right eye, 2: left eye, 3: both eyes).
-define('EBML_ID_PIXELCROPBOTTOM',               0x14AA); //         [54][AA] -- The number of video pixels to remove at the bottom of the image (for HDTV content).
-define('EBML_ID_DISPLAYWIDTH',                  0x14B0); //         [54][B0] -- Width of the video frames to display.
-define('EBML_ID_DISPLAYUNIT',                   0x14B2); //         [54][B2] -- Type of the unit for DisplayWidth/Height (0: pixels, 1: centimeters, 2: inches).
-define('EBML_ID_ASPECTRATIOTYPE',               0x14B3); //         [54][B3] -- Specify the possible modifications to the aspect ratio (0: free resizing, 1: keep aspect ratio, 2: fixed).
-define('EBML_ID_DISPLAYHEIGHT',                 0x14BA); //         [54][BA] -- Height of the video frames to display.
-define('EBML_ID_PIXELCROPTOP',                  0x14BB); //         [54][BB] -- The number of video pixels to remove at the top of the image.
-define('EBML_ID_PIXELCROPLEFT',                 0x14CC); //         [54][CC] -- The number of video pixels to remove on the left of the image.
-define('EBML_ID_PIXELCROPRIGHT',                0x14DD); //         [54][DD] -- The number of video pixels to remove on the right of the image.
-define('EBML_ID_FLAGFORCED',                    0x15AA); //         [55][AA] -- Set if that track MUST be used during playback. There can be many forced track for a kind (audio, video or subs), the player should select the one which language matches the user preference or the default + forced track. Overlay MAY happen between a forced and non-forced track of the same kind.
-define('EBML_ID_MAXBLOCKADDITIONID',            0x15EE); //         [55][EE] -- The maximum value of BlockAddID. A value 0 means there is no BlockAdditions for this track.
-define('EBML_ID_WRITINGAPP',                    0x1741); //         [57][41] -- Writing application ("mkvmerge-0.3.3").
-define('EBML_ID_CLUSTERSILENTTRACKS',           0x1854); //         [58][54] -- The list of tracks that are not used in that part of the stream. It is useful when using overlay tracks on seeking. Then you should decide what track to use.
-define('EBML_ID_CLUSTERSILENTTRACKNUMBER',      0x18D7); //         [58][D7] -- One of the track number that are not used from now on in the stream. It could change later if not specified as silent in a further Cluster.
-define('EBML_ID_ATTACHEDFILE',                  0x21A7); //         [61][A7] -- An attached file.
-define('EBML_ID_CONTENTENCODING',               0x2240); //         [62][40] -- Settings for one content encoding like compression or encryption.
-define('EBML_ID_BITDEPTH',                      0x2264); //         [62][64] -- Bits per sample, mostly used for PCM.
-define('EBML_ID_CODECPRIVATE',                  0x23A2); //         [63][A2] -- Private data only known to the codec.
-define('EBML_ID_TARGETS',                       0x23C0); //         [63][C0] -- Contain all UIDs where the specified meta data apply. It is void to describe everything in the segment.
-define('EBML_ID_CHAPTERPHYSICALEQUIV',          0x23C3); //         [63][C3] -- Specify the physical equivalent of this ChapterAtom like "DVD" (60) or "SIDE" (50), see complete list of values.
-define('EBML_ID_TAGCHAPTERUID',                 0x23C4); //         [63][C4] -- A unique ID to identify the Chapter(s) the tags belong to. If the value is 0 at this level, the tags apply to all chapters in the Segment.
-define('EBML_ID_TAGTRACKUID',                   0x23C5); //         [63][C5] -- A unique ID to identify the Track(s) the tags belong to. If the value is 0 at this level, the tags apply to all tracks in the Segment.
-define('EBML_ID_TAGATTACHMENTUID',              0x23C6); //         [63][C6] -- A unique ID to identify the Attachment(s) the tags belong to. If the value is 0 at this level, the tags apply to all the attachments in the Segment.
-define('EBML_ID_TAGEDITIONUID',                 0x23C9); //         [63][C9] -- A unique ID to identify the EditionEntry(s) the tags belong to. If the value is 0 at this level, the tags apply to all editions in the Segment.
-define('EBML_ID_TARGETTYPE',                    0x23CA); //         [63][CA] -- An informational string that can be used to display the logical level of the target like "ALBUM", "TRACK", "MOVIE", "CHAPTER", etc (see TargetType).
-define('EBML_ID_TRACKTRANSLATE',                0x2624); //         [66][24] -- The track identification for the given Chapter Codec.
-define('EBML_ID_TRACKTRANSLATETRACKID',         0x26A5); //         [66][A5] -- The binary value used to represent this track in the chapter codec data. The format depends on the ChapProcessCodecID used.
-define('EBML_ID_TRACKTRANSLATECODEC',           0x26BF); //         [66][BF] -- The chapter codec using this ID (0: Matroska Script, 1: DVD-menu).
-define('EBML_ID_TRACKTRANSLATEEDITIONUID',      0x26FC); //         [66][FC] -- Specify an edition UID on which this translation applies. When not specified, it means for all editions found in the segment.
-define('EBML_ID_SIMPLETAG',                     0x27C8); //         [67][C8] -- Contains general information about the target.
-define('EBML_ID_TARGETTYPEVALUE',               0x28CA); //         [68][CA] -- A number to indicate the logical level of the target (see TargetType).
-define('EBML_ID_CHAPPROCESSCOMMAND',            0x2911); //         [69][11] -- Contains all the commands associated to the Atom.
-define('EBML_ID_CHAPPROCESSTIME',               0x2922); //         [69][22] -- Defines when the process command should be handled (0: during the whole chapter, 1: before starting playback, 2: after playback of the chapter).
-define('EBML_ID_CHAPTERTRANSLATE',              0x2924); //         [69][24] -- A tuple of corresponding ID used by chapter codecs to represent this segment.
-define('EBML_ID_CHAPPROCESSDATA',               0x2933); //         [69][33] -- Contains the command information. The data should be interpreted depending on the ChapProcessCodecID value. For ChapProcessCodecID = 1, the data correspond to the binary DVD cell pre/post commands.
-define('EBML_ID_CHAPPROCESS',                   0x2944); //         [69][44] -- Contains all the commands associated to the Atom.
-define('EBML_ID_CHAPPROCESSCODECID',            0x2955); //         [69][55] -- Contains the type of the codec used for the processing. A value of 0 means native Matroska processing (to be defined), a value of 1 means the DVD command set is used. More codec IDs can be added later.
-define('EBML_ID_CHAPTERTRANSLATEID',            0x29A5); //         [69][A5] -- The binary value used to represent this segment in the chapter codec data. The format depends on the ChapProcessCodecID used.
-define('EBML_ID_CHAPTERTRANSLATECODEC',         0x29BF); //         [69][BF] -- The chapter codec using this ID (0: Matroska Script, 1: DVD-menu).
-define('EBML_ID_CHAPTERTRANSLATEEDITIONUID',    0x29FC); //         [69][FC] -- Specify an edition UID on which this correspondance applies. When not specified, it means for all editions found in the segment.
-define('EBML_ID_CONTENTENCODINGS',              0x2D80); //         [6D][80] -- Settings for several content encoding mechanisms like compression or encryption.
-define('EBML_ID_MINCACHE',                      0x2DE7); //         [6D][E7] -- The minimum number of frames a player should be able to cache during playback. If set to 0, the reference pseudo-cache system is not used.
-define('EBML_ID_MAXCACHE',                      0x2DF8); //         [6D][F8] -- The maximum cache size required to store referenced frames in and the current frame. 0 means no cache is needed.
-define('EBML_ID_CHAPTERSEGMENTUID',             0x2E67); //         [6E][67] -- A segment to play in place of this chapter. Edition ChapterSegmentEditionUID should be used for this segment, otherwise no edition is used.
-define('EBML_ID_CHAPTERSEGMENTEDITIONUID',      0x2EBC); //         [6E][BC] -- The edition to play from the segment linked in ChapterSegmentUID.
-define('EBML_ID_TRACKOVERLAY',                  0x2FAB); //         [6F][AB] -- Specify that this track is an overlay track for the Track specified (in the u-integer). That means when this track has a gap (see SilentTracks) the overlay track should be used instead. The order of multiple TrackOverlay matters, the first one is the one that should be used. If not found it should be the second, etc.
-define('EBML_ID_TAG',                           0x3373); //         [73][73] -- Element containing elements specific to Tracks/Chapters.
-define('EBML_ID_SEGMENTFILENAME',               0x3384); //         [73][84] -- A filename corresponding to this segment.
-define('EBML_ID_SEGMENTUID',                    0x33A4); //         [73][A4] -- A randomly generated unique ID to identify the current segment between many others (128 bits).
-define('EBML_ID_CHAPTERUID',                    0x33C4); //         [73][C4] -- A unique ID to identify the Chapter.
-define('EBML_ID_TRACKUID',                      0x33C5); //         [73][C5] -- A unique ID to identify the Track. This should be kept the same when making a direct stream copy of the Track to another file.
-define('EBML_ID_ATTACHMENTLINK',                0x3446); //         [74][46] -- The UID of an attachment that is used by this codec.
-define('EBML_ID_CLUSTERBLOCKADDITIONS',         0x35A1); //         [75][A1] -- Contain additional blocks to complete the main one. An EBML parser that has no knowledge of the Block structure could still see and use/skip these data.
-define('EBML_ID_CHANNELPOSITIONS',              0x347B); //         [7D][7B] -- Table of horizontal angles for each successive channel, see appendix.
-define('EBML_ID_OUTPUTSAMPLINGFREQUENCY',       0x38B5); //         [78][B5] -- Real output sampling frequency in Hz (used for SBR techniques).
-define('EBML_ID_TITLE',                         0x3BA9); //         [7B][A9] -- General name of the segment.
-define('EBML_ID_CHAPTERDISPLAY',                  0x00); //             [80] -- Contains all possible strings to use for the chapter display.
-define('EBML_ID_TRACKTYPE',                       0x03); //             [83] -- A set of track types coded on 8 bits (1: video, 2: audio, 3: complex, 0x10: logo, 0x11: subtitle, 0x12: buttons, 0x20: control).
-define('EBML_ID_CHAPSTRING',                      0x05); //             [85] -- Contains the string to use as the chapter atom.
-define('EBML_ID_CODECID',                         0x06); //             [86] -- An ID corresponding to the codec, see the codec page for more info.
-define('EBML_ID_FLAGDEFAULT',                     0x08); //             [88] -- Set if that track (audio, video or subs) SHOULD be used if no language found matches the user preference.
-define('EBML_ID_CHAPTERTRACKNUMBER',              0x09); //             [89] -- UID of the Track to apply this chapter too. In the absense of a control track, choosing this chapter will select the listed Tracks and deselect unlisted tracks. Absense of this element indicates that the Chapter should be applied to any currently used Tracks.
-define('EBML_ID_CLUSTERSLICES',                   0x0E); //             [8E] -- Contains slices description.
-define('EBML_ID_CHAPTERTRACK',                    0x0F); //             [8F] -- List of tracks on which the chapter applies. If this element is not present, all tracks apply
-define('EBML_ID_CHAPTERTIMESTART',                0x11); //             [91] -- Timecode of the start of Chapter (not scaled).
-define('EBML_ID_CHAPTERTIMEEND',                  0x12); //             [92] -- Timecode of the end of Chapter (timecode excluded, not scaled).
-define('EBML_ID_CUEREFTIME',                      0x16); //             [96] -- Timecode of the referenced Block.
-define('EBML_ID_CUEREFCLUSTER',                   0x17); //             [97] -- Position of the Cluster containing the referenced Block.
-define('EBML_ID_CHAPTERFLAGHIDDEN',               0x18); //             [98] -- If a chapter is hidden (1), it should not be available to the user interface (but still to Control Tracks).
-define('EBML_ID_FLAGINTERLACED',                  0x1A); //             [9A] -- Set if the video is interlaced.
-define('EBML_ID_CLUSTERBLOCKDURATION',            0x1B); //             [9B] -- The duration of the Block (based on TimecodeScale). This element is mandatory when DefaultDuration is set for the track. When not written and with no DefaultDuration, the value is assumed to be the difference between the timecode of this Block and the timecode of the next Block in "display" order (not coding order). This element can be useful at the end of a Track (as there is not other Block available), or when there is a break in a track like for subtitle tracks.
-define('EBML_ID_FLAGLACING',                      0x1C); //             [9C] -- Set if the track may contain blocks using lacing.
-define('EBML_ID_CHANNELS',                        0x1F); //             [9F] -- Numbers of channels in the track.
-define('EBML_ID_CLUSTERBLOCKGROUP',               0x20); //             [A0] -- Basic container of information containing a single Block or BlockVirtual, and information specific to that Block/VirtualBlock.
-define('EBML_ID_CLUSTERBLOCK',                    0x21); //             [A1] -- Block containing the actual data to be rendered and a timecode relative to the Cluster Timecode.
-define('EBML_ID_CLUSTERBLOCKVIRTUAL',             0x22); //             [A2] -- A Block with no data. It must be stored in the stream at the place the real Block should be in display order.
-define('EBML_ID_CLUSTERSIMPLEBLOCK',              0x23); //             [A3] -- Similar to Block but without all the extra information, mostly used to reduced overhead when no extra feature is needed.
-define('EBML_ID_CLUSTERCODECSTATE',               0x24); //             [A4] -- The new codec state to use. Data interpretation is private to the codec. This information should always be referenced by a seek entry.
-define('EBML_ID_CLUSTERBLOCKADDITIONAL',          0x25); //             [A5] -- Interpreted by the codec as it wishes (using the BlockAddID).
-define('EBML_ID_CLUSTERBLOCKMORE',                0x26); //             [A6] -- Contain the BlockAdditional and some parameters.
-define('EBML_ID_CLUSTERPOSITION',                 0x27); //             [A7] -- Position of the Cluster in the segment (0 in live broadcast streams). It might help to resynchronise offset on damaged streams.
-define('EBML_ID_CODECDECODEALL',                  0x2A); //             [AA] -- The codec can decode potentially damaged data.
-define('EBML_ID_CLUSTERPREVSIZE',                 0x2B); //             [AB] -- Size of the previous Cluster, in octets. Can be useful for backward playing.
-define('EBML_ID_TRACKENTRY',                      0x2E); //             [AE] -- Describes a track with all elements.
-define('EBML_ID_CLUSTERENCRYPTEDBLOCK',           0x2F); //             [AF] -- Similar to SimpleBlock but the data inside the Block are Transformed (encrypt and/or signed).
-define('EBML_ID_PIXELWIDTH',                      0x30); //             [B0] -- Width of the encoded video frames in pixels.
-define('EBML_ID_CUETIME',                         0x33); //             [B3] -- Absolute timecode according to the segment time base.
-define('EBML_ID_SAMPLINGFREQUENCY',               0x35); //             [B5] -- Sampling frequency in Hz.
-define('EBML_ID_CHAPTERATOM',                     0x36); //             [B6] -- Contains the atom information to use as the chapter atom (apply to all tracks).
-define('EBML_ID_CUETRACKPOSITIONS',               0x37); //             [B7] -- Contain positions for different tracks corresponding to the timecode.
-define('EBML_ID_FLAGENABLED',                     0x39); //             [B9] -- Set if the track is used.
-define('EBML_ID_PIXELHEIGHT',                     0x3A); //             [BA] -- Height of the encoded video frames in pixels.
-define('EBML_ID_CUEPOINT',                        0x3B); //             [BB] -- Contains all information relative to a seek point in the segment.
-define('EBML_ID_CRC32',                           0x3F); //             [BF] -- The CRC is computed on all the data of the Master element it's in, regardless of its position. It's recommended to put the CRC value at the beggining of the Master element for easier reading. All level 1 elements should include a CRC-32.
-define('EBML_ID_CLUSTERBLOCKADDITIONID',          0x4B); //             [CB] -- The ID of the BlockAdditional element (0 is the main Block).
-define('EBML_ID_CLUSTERLACENUMBER',               0x4C); //             [CC] -- The reverse number of the frame in the lace (0 is the last frame, 1 is the next to last, etc). While there are a few files in the wild with this element, it is no longer in use and has been deprecated. Being able to interpret this element is not required for playback.
-define('EBML_ID_CLUSTERFRAMENUMBER',              0x4D); //             [CD] -- The number of the frame to generate from this lace with this delay (allow you to generate many frames from the same Block/Frame).
-define('EBML_ID_CLUSTERDELAY',                    0x4E); //             [CE] -- The (scaled) delay to apply to the element.
-define('EBML_ID_CLUSTERDURATION',                 0x4F); //             [CF] -- The (scaled) duration to apply to the element.
-define('EBML_ID_TRACKNUMBER',                     0x57); //             [D7] -- The track number as used in the Block Header (using more than 127 tracks is not encouraged, though the design allows an unlimited number).
-define('EBML_ID_CUEREFERENCE',                    0x5B); //             [DB] -- The Clusters containing the required referenced Blocks.
-define('EBML_ID_VIDEO',                           0x60); //             [E0] -- Video settings.
-define('EBML_ID_AUDIO',                           0x61); //             [E1] -- Audio settings.
-define('EBML_ID_CLUSTERTIMESLICE',                0x68); //             [E8] -- Contains extra time information about the data contained in the Block. While there are a few files in the wild with this element, it is no longer in use and has been deprecated. Being able to interpret this element is not required for playback.
-define('EBML_ID_CUECODECSTATE',                   0x6A); //             [EA] -- The position of the Codec State corresponding to this Cue element. 0 means that the data is taken from the initial Track Entry.
-define('EBML_ID_CUEREFCODECSTATE',                0x6B); //             [EB] -- The position of the Codec State corresponding to this referenced element. 0 means that the data is taken from the initial Track Entry.
-define('EBML_ID_VOID',                            0x6C); //             [EC] -- Used to void damaged data, to avoid unexpected behaviors when using damaged data. The content is discarded. Also used to reserve space in a sub-element for later use.
-define('EBML_ID_CLUSTERTIMECODE',                 0x67); //             [E7] -- Absolute timecode of the cluster (based on TimecodeScale).
-define('EBML_ID_CLUSTERBLOCKADDID',               0x6E); //             [EE] -- An ID to identify the BlockAdditional level.
-define('EBML_ID_CUECLUSTERPOSITION',              0x71); //             [F1] -- The position of the Cluster containing the required Block.
-define('EBML_ID_CUETRACK',                        0x77); //             [F7] -- The track for which a position is given.
-define('EBML_ID_CLUSTERREFERENCEPRIORITY',        0x7A); //             [FA] -- This frame is referenced and has the specified cache priority. In cache only a frame of the same or higher priority can replace this frame. A value of 0 means the frame is not referenced.
-define('EBML_ID_CLUSTERREFERENCEBLOCK',           0x7B); //             [FB] -- Timecode of another frame used as a reference (ie: B or P frame). The timecode is relative to the block it's attached to.
-define('EBML_ID_CLUSTERREFERENCEVIRTUAL',         0x7D); //             [FD] -- Relative position of the data that should be in position of the virtual block.
-
-
-class getid3_matroska extends getid3_handler
-{
-	// public options
-	public static $hide_clusters      = true;  // if true, do not return information about CLUSTER chunks, since there's a lot of them and they're not usually useful [default: TRUE]
-    public static $parse_whole_file   = false; // true to parse the whole file, not only header [default: FALSE]
-
-    // private parser settings/placeholders
-    private $EBMLbuffer        = '';
-    private $EBMLbuffer_offset = 0;
-    private $EBMLbuffer_length = 0;
-    private $current_offset    = 0;
-    private $unuseful_elements = array(EBML_ID_CRC32, EBML_ID_VOID);
-    
-	public function Analyze()
-	{
-		$info = &$this->getid3->info;
-
-		// parse container
-		try {
-			$this->parseEBML($info);
-		}
-		catch (Exception $e) {
-			$info['error'][] = 'EBML parser: '.$e->getMessage();
-		}
-
-		// calculate playtime
-		if (isset($info['matroska']['info']) && is_array($info['matroska']['info'])) {
-			foreach ($info['matroska']['info'] as $key => $infoarray) {
-				if (isset($infoarray['Duration'])) {
-					// TimecodeScale is how many nanoseconds each Duration unit is
-					$info['playtime_seconds'] = $infoarray['Duration'] * ((isset($infoarray['TimecodeScale']) ? $infoarray['TimecodeScale'] : 1000000) / 1000000000);
-					break;
-				}
-			}
-		}
-
-		// extract tags
-		if (isset($info['matroska']['tags']) && is_array($info['matroska']['tags'])) {
-			foreach ($info['matroska']['tags'] as $key => $infoarray) {
-				$this->ExtractCommentsSimpleTag($infoarray);
-			}
-		}
-
-		// process tracks
-		if (isset($info['matroska']['tracks']['tracks']) && is_array($info['matroska']['tracks']['tracks'])) {
-			foreach ($info['matroska']['tracks']['tracks'] as $key => $trackarray) {
-				
-				$track_info = array();
-				$track_info['dataformat'] = self::MatroskaCodecIDtoCommonName($trackarray['CodecID']);
-				$track_info['default'] = (isset($trackarray['FlagDefault']) ? $trackarray['FlagDefault'] : true);
-				if (isset($trackarray['Name'])) { $track_info['name'] = $trackarray['Name']; }
-				
-				switch ($trackarray['TrackType']) {
-					
-					case 1: // Video
-						$track_info['resolution_x'] = $trackarray['PixelWidth'];
-						$track_info['resolution_y'] = $trackarray['PixelHeight'];
-						if (isset($trackarray['DisplayWidth']))    { $track_info['display_x']  = $trackarray['DisplayWidth']; }
-						if (isset($trackarray['DisplayHeight']))   { $track_info['display_y']  = $trackarray['DisplayHeight']; }
-						if (isset($trackarray['DefaultDuration'])) { $track_info['frame_rate'] = round(1000000000 / $trackarray['DefaultDuration'], 3); }
-						//if (isset($trackarray['CodecName']))       { $track_info['codec']      = $trackarray['CodecName']; }
-						
-						switch ($trackarray['CodecID']) {
-							case 'V_MS/VFW/FOURCC':
-								if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, false)) {
-									$this->getid3->warning('Unable to parse codec private data ['.basename(__FILE__).':'.__LINE__.'] because cannot include "module.audio-video.riff.php"');
-									break;
-								}
-								$parsed = getid3_riff::ParseBITMAPINFOHEADER($trackarray['CodecPrivate']);
-								$track_info['codec'] = getid3_riff::RIFFfourccLookup($parsed['fourcc']);
-								$info['matroska']['track_codec_parsed'][$trackarray['TrackNumber']] = $parsed;
-								break;
-						}
-						
-						$info['video']['streams'][] = $track_info;
-						break;
-					
-					case 2: // Audio
-						$track_info['sample_rate'] = (isset($trackarray['SamplingFrequency']) ? $trackarray['SamplingFrequency'] : 8000.0);
-						$track_info['channels']    = (isset($trackarray['Channels']) ? $trackarray['Channels'] : 1);
-						$track_info['language']    = (isset($trackarray['Language']) ? $trackarray['Language'] : 'eng');
-						if (isset($trackarray['BitDepth']))  { $track_info['bits_per_sample'] = $trackarray['BitDepth']; }
-						//if (isset($trackarray['CodecName'])) { $track_info['codec']           = $trackarray['CodecName']; }
-						
-						switch ($trackarray['CodecID']) {
-							case 'A_PCM/INT/LIT':
-							case 'A_PCM/INT/BIG':
-								$track_info['bitrate'] = $trackarray['SamplingFrequency'] * $trackarray['Channels'] * $trackarray['BitDepth'];
-								break;
-
-							case 'A_AC3':
-							case 'A_DTS':
-							case 'A_MPEG/L3':
-							//case 'A_FLAC':
-								if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.'.$track_info['dataformat'].'.php', __FILE__, false)) {
-									$this->getid3->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because cannot include "module.audio.'.$track_info['dataformat'].'.php"');
-									break;
-								}
-
-								if (!isset($info['matroska']['track_data_offsets'][$trackarray['TrackNumber']])) {
-									$this->getid3->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because $info[matroska][track_data_offsets]['.$trackarray['TrackNumber'].'] not set');
-									break;
-								}
-
-								// create temp instance
-								$getid3_temp = new getID3();
-								$getid3_temp->openfile($this->getid3->filename);
-								$getid3_temp->info['avdataoffset'] = $info['matroska']['track_data_offsets'][$trackarray['TrackNumber']]['offset'];
-								if ($track_info['dataformat'] == 'mp3' || $track_info['dataformat'] == 'flac') {
-									$getid3_temp->info['avdataend'] = $info['matroska']['track_data_offsets'][$trackarray['TrackNumber']]['offset'] + $info['matroska']['track_data_offsets'][$trackarray['TrackNumber']]['length'];
-								}
-
-								// analyze
-								$class = 'getid3_'.$track_info['dataformat'];
-								$header_data_key = $track_info['dataformat'] == 'mp3' ? 'mpeg' : $track_info['dataformat'];
-								$getid3_audio = new $class($getid3_temp);
-								if ($track_info['dataformat'] == 'mp3') {
-									$getid3_audio->allow_bruteforce = true;
-								}
-								if ($track_info['dataformat'] == 'flac') {
-									$getid3_audio->AnalyzeString($trackarray['CodecPrivate']);
-								}
-								else {
-									$getid3_audio->Analyze();
-								}
-								if (!empty($getid3_temp->info[$header_data_key])) {
-									unset($getid3_temp->info[$header_data_key]['GETID3_VERSION']);
-									$info['matroska']['track_codec_parsed'][$trackarray['TrackNumber']] = $getid3_temp->info[$header_data_key];
-									if (isset($getid3_temp->info['audio']) && is_array($getid3_temp->info['audio'])) {
-										foreach ($getid3_temp->info['audio'] as $key => $value) {
-											$track_info[$key] = $value;
-										}
-									}
-								}
-								else {
-									$this->getid3->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because '.$class.'::Analyze() failed at offset '.$getid3_temp->info['avdataoffset']);
-								}
-
-								// copy errors and warnings
-								if (!empty($getid3_temp->info['error'])) {
-									foreach ($getid3_temp->info['error'] as $newerror) {
-										$this->getid3->warning($class.'() says: ['.$newerror.']');
-									}
-								}
-								if (!empty($getid3_temp->info['warning'])) {
-									foreach ($getid3_temp->info['warning'] as $newerror) {
-										if ($track_info['dataformat'] == 'mp3' && preg_match('/^Probable truncated file: expecting \d+ bytes of audio data, only found \d+ \(short by \d+ bytes\)$/', $newerror)) {
-											// LAME/Xing header is probably set, but audio data is chunked into Matroska file and near-impossible to verify if audio stream is complete, so ignore useless warning
-											continue;
-										}
-										$this->getid3->warning($class.'() says: ['.$newerror.']');
-									}
-								}
-								unset($getid3_temp, $getid3_audio);
-								break;
-
-							case 'A_AAC':
-							case 'A_AAC/MPEG2/LC':
-							case 'A_AAC/MPEG4/LC':
-							case 'A_AAC/MPEG4/LC/SBR':
-							    $this->getid3->warning($trackarray['CodecID'].' audio data contains no header, audio/video bitrates can\'t be calculated');
-								break;
-
-							case 'A_VORBIS':
-								if (!isset($trackarray['CodecPrivate'])) {
-									$this->getid3->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because CodecPrivate data not set');
-									break;
-								}
-								$vorbis_offset = strpos($trackarray['CodecPrivate'], 'vorbis', 1);
-								if ($vorbis_offset === false) {
-									$this->getid3->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because CodecPrivate data does not contain "vorbis" keyword');
-									break;
-								}
-								$vorbis_offset -= 1;
-
-								if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ogg.php', __FILE__, false)) {
-									$this->getid3->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because cannot include "module.audio.ogg.php"');
-								}
-
-								// create temp instance
-								$getid3_temp = new getID3();
-								$getid3_temp->openfile($this->getid3->filename);
-
-								// analyze
-								$getid3_ogg = new getid3_ogg($getid3_temp);
-								$oggpageinfo['page_seqno'] = 0;
-								$getid3_ogg->ParseVorbisPageHeader($trackarray['CodecPrivate'], $vorbis_offset, $oggpageinfo);
-								if (!empty($getid3_temp->info['ogg'])) {
-									$info['matroska']['track_codec_parsed'][$trackarray['TrackNumber']] = $getid3_temp->info['ogg'];
-									if (isset($getid3_temp->info['audio']) && is_array($getid3_temp->info['audio'])) {
-										foreach ($getid3_temp->info['audio'] as $key => $value) {
-											$track_info[$key] = $value;
-										}
-									}
-								}
-								
-								// copy errors and warnings
-								if (!empty($getid3_temp->info['error'])) {
-									foreach ($getid3_temp->info['error'] as $newerror) {
-										$this->getid3->warning('getid3_ogg() says: ['.$newerror.']');
-									}
-								}
-								if (!empty($getid3_temp->info['warning'])) {
-									foreach ($getid3_temp->info['warning'] as $newerror) {
-										$this->getid3->warning('getid3_ogg() says: ['.$newerror.']');
-									}
-								}
-								
-								if (!empty($getid3_temp->info['ogg']['bitrate_nominal'])) {
-									$track_info['bitrate'] = $getid3_temp->info['ogg']['bitrate_nominal'];
-								}
-								unset($getid3_temp, $getid3_ogg, $oggpageinfo, $vorbis_offset);
-								break;
-
-							case 'A_MS/ACM':
-								if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, false)) {
-									$this->getid3->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because cannot include "module.audio-video.riff.php"');
-									break;
-								}
-								
-								$parsed = getid3_riff::RIFFparseWAVEFORMATex($trackarray['CodecPrivate']);
-								foreach ($parsed as $key => $value) {
-									if ($key != 'raw') {
-										$track_info[$key] = $value;
-									}
-								}
-								$info['matroska']['track_codec_parsed'][$trackarray['TrackNumber']] = $parsed;
-								break;
-								
-							default:
-								$this->getid3->warning('Unhandled audio type "'.(isset($trackarray['CodecID']) ? $trackarray['CodecID'] : '').'"');
-						}
-
-						$info['audio']['streams'][] = $track_info;
-						break;
-				}
-			}
-		
-			if (!empty($info['video']['streams'])) {
-				$info['video'] = self::getDefaultStreamInfo($info['video']['streams']);
-			}
-			if (!empty($info['audio']['streams'])) {
-				$info['audio'] = self::getDefaultStreamInfo($info['audio']['streams']);
-			}
-		}
-
-        // determine mime type
-		if (!empty($info['video']['streams'])) {
-			$info['mime_type'] = ($info['matroska']['doctype'] == 'webm' ? 'video/webm' : 'video/x-matroska');
-		} elseif (!empty($info['audio']['streams'])) {
-			$info['mime_type'] = ($info['matroska']['doctype'] == 'webm' ? 'audio/webm' : 'audio/x-matroska');
-		} elseif (isset($info['mime_type'])) {
-			unset($info['mime_type']);
-		}
-
-		return true;
-	}
-
-
-///////////////////////////////////////
-
-    private function parseEBML(&$info)
-    {
-		// http://www.matroska.org/technical/specs/index.html#EBMLBasics
-		$this->current_offset = $info['avdataoffset'];
-
-		while ($this->getEBMLelement($top_element, $info['avdataend'])) {
-			switch ($top_element['id']) {
-
-				case EBML_ID_EBML:
-					$info['fileformat'] = 'matroska';
-					$info['matroska']['header']['offset'] = $top_element['offset'];
-					$info['matroska']['header']['length'] = $top_element['length'];
-
-					while ($this->getEBMLelement($element_data, $top_element['end'], true)) {
-						switch ($element_data['id']) {
-
-							case EBML_ID_EBMLVERSION:
-							case EBML_ID_EBMLREADVERSION:
-							case EBML_ID_EBMLMAXIDLENGTH:
-							case EBML_ID_EBMLMAXSIZELENGTH:
-							case EBML_ID_DOCTYPEVERSION:
-							case EBML_ID_DOCTYPEREADVERSION:
-								$element_data['data'] = getid3_lib::BigEndian2Int($element_data['data']);
-								break;
-
-							case EBML_ID_DOCTYPE:
-								$element_data['data'] = getid3_lib::trimNullByte($element_data['data']);
-								$info['matroska']['doctype'] = $element_data['data'];
-								break;
-
-							case EBML_ID_CRC32: // not useful, ignore
-								$this->current_offset = $element_data['end'];
-								unset($element_data);
-								break;
-
-							default:
-								$this->unhandledElement('header', __LINE__, $element_data);
-						}
-						if (!empty($element_data)) {
-							unset($element_data['offset'], $element_data['end']);
-							$info['matroska']['header']['elements'][] = $element_data;
-						}
-					}
-					break;
-
-				case EBML_ID_SEGMENT:
-					$info['matroska']['segment'][0]['offset'] = $top_element['offset'];
-					$info['matroska']['segment'][0]['length'] = $top_element['length'];
-
-					while ($this->getEBMLelement($element_data, $top_element['end'])) {
-						if ($element_data['id'] != EBML_ID_CLUSTER || !self::$hide_clusters) { // collect clusters only if required
-							$info['matroska']['segments'][] = $element_data;
-						}
-						switch ($element_data['id']) {
-
-							case EBML_ID_SEEKHEAD: // Contains the position of other level 1 elements.
-
-								while ($this->getEBMLelement($seek_entry, $element_data['end'])) {
-									switch ($seek_entry['id']) {
-
-										case EBML_ID_SEEK: // Contains a single seek entry to an EBML element
-											while ($this->getEBMLelement($sub_seek_entry, $seek_entry['end'], true)) {
-
-												switch ($sub_seek_entry['id']) {
-
-													case EBML_ID_SEEKID:
-														$seek_entry['target_id']   = self::EBML2Int($sub_seek_entry['data']);
-														$seek_entry['target_name'] = self::EBMLidName($seek_entry['target_id']);
-														break;
-
-													case EBML_ID_SEEKPOSITION:
-														$seek_entry['target_offset'] = $element_data['offset'] + getid3_lib::BigEndian2Int($sub_seek_entry['data']);
-														break;
-
-													default:
-														$this->unhandledElement('seekhead.seek', __LINE__, $sub_seek_entry);												}
-											}
-
-											if ($seek_entry['target_id'] != EBML_ID_CLUSTER || !self::$hide_clusters) { // collect clusters only if required
-												$info['matroska']['seek'][] = $seek_entry;
-											}
-											break;
-
-										default:
-											$this->unhandledElement('seekhead', __LINE__, $seek_entry);
-									}
-								}
-								break;
-
-							case EBML_ID_TRACKS: // A top-level block of information with many tracks described.
-								$info['matroska']['tracks'] = $element_data;
-
-								while ($this->getEBMLelement($track_entry, $element_data['end'])) {
-									switch ($track_entry['id']) {
-
-										case EBML_ID_TRACKENTRY: //subelements: Describes a track with all elements.
-
-											while ($this->getEBMLelement($subelement, $track_entry['end'], array(EBML_ID_VIDEO, EBML_ID_AUDIO, EBML_ID_CONTENTENCODINGS))) {
-												switch ($subelement['id']) {
-
-													case EBML_ID_TRACKNUMBER:
-													case EBML_ID_TRACKUID:
-													case EBML_ID_TRACKTYPE:
-													case EBML_ID_MINCACHE:
-													case EBML_ID_MAXCACHE:
-													case EBML_ID_MAXBLOCKADDITIONID:
-													case EBML_ID_DEFAULTDURATION: // nanoseconds per frame
-														$track_entry[$subelement['id_name']] = getid3_lib::BigEndian2Int($subelement['data']);
-														break;
-
-													case EBML_ID_TRACKTIMECODESCALE:
-														$track_entry[$subelement['id_name']] = getid3_lib::BigEndian2Float($subelement['data']);
-														break;
-
-													case EBML_ID_CODECID:
-													case EBML_ID_LANGUAGE:
-													case EBML_ID_NAME:
-													case EBML_ID_CODECNAME:
-														$track_entry[$subelement['id_name']] = getid3_lib::trimNullByte($subelement['data']);
-														break;
-														
-													case EBML_ID_CODECPRIVATE:
-														$track_entry[$subelement['id_name']] = $subelement['data'];
-														break;
-
-													case EBML_ID_FLAGENABLED:
-													case EBML_ID_FLAGDEFAULT:
-													case EBML_ID_FLAGFORCED:
-													case EBML_ID_FLAGLACING:
-													case EBML_ID_CODECDECODEALL:
-														$track_entry[$subelement['id_name']] = (bool) getid3_lib::BigEndian2Int($subelement['data']);
-														break;
-
-													case EBML_ID_VIDEO:
-
-														while ($this->getEBMLelement($sub_subelement, $subelement['end'], true)) {
-															switch ($sub_subelement['id']) {
-
-																case EBML_ID_PIXELWIDTH:
-																case EBML_ID_PIXELHEIGHT:
-																case EBML_ID_STEREOMODE:
-																case EBML_ID_PIXELCROPBOTTOM:
-																case EBML_ID_PIXELCROPTOP:
-																case EBML_ID_PIXELCROPLEFT:
-																case EBML_ID_PIXELCROPRIGHT:
-																case EBML_ID_DISPLAYWIDTH:
-																case EBML_ID_DISPLAYHEIGHT:
-																case EBML_ID_DISPLAYUNIT:
-																case EBML_ID_ASPECTRATIOTYPE:
-																	$track_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_subelement['data']);
-																	break;
-
-																case EBML_ID_FLAGINTERLACED:
-																	$track_entry[$sub_subelement['id_name']] = (bool)getid3_lib::BigEndian2Int($sub_subelement['data']);
-																	break;
-
-																case EBML_ID_GAMMAVALUE:
-																	$track_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Float($sub_subelement['data']);
-																	break;
-
-																case EBML_ID_COLOURSPACE:
-																	$track_entry[$sub_subelement['id_name']] = getid3_lib::trimNullByte($sub_subelement['data']);
-																	break;
-
-																default:
-																	$this->unhandledElement('track.video', __LINE__, $sub_subelement);
-															}
-														}
-														break;
-
-													case EBML_ID_AUDIO:
-
-														while ($this->getEBMLelement($sub_subelement, $subelement['end'], true)) {
-															switch ($sub_subelement['id']) {
-
-																case EBML_ID_CHANNELS:
-																case EBML_ID_BITDEPTH:
-																	$track_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_subelement['data']);
-																	break;
-
-																case EBML_ID_SAMPLINGFREQUENCY:
-																case EBML_ID_OUTPUTSAMPLINGFREQUENCY:
-																	$track_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Float($sub_subelement['data']);
-																	break;
-
-																case EBML_ID_CHANNELPOSITIONS:
-																	$track_entry[$sub_subelement['id_name']] = getid3_lib::trimNullByte($sub_subelement['data']);
-																	break;
-
-																default:
-																	$this->unhandledElement('track.audio', __LINE__, $sub_subelement);
-															}
-														}
-														break;
-
-													case EBML_ID_CONTENTENCODINGS:
-
-														while ($this->getEBMLelement($sub_subelement, $subelement['end'])) {
-															switch ($sub_subelement['id']) {
-
-																case EBML_ID_CONTENTENCODING:
-
-																	while ($this->getEBMLelement($sub_sub_subelement, $sub_subelement['end'], array(EBML_ID_CONTENTCOMPRESSION, EBML_ID_CONTENTENCRYPTION))) {
-																		switch ($sub_sub_subelement['id']) {
-
-																			case EBML_ID_CONTENTENCODINGORDER:
-																			case EBML_ID_CONTENTENCODINGSCOPE:
-																			case EBML_ID_CONTENTENCODINGTYPE:
-																				$track_entry[$sub_subelement['id_name']][$sub_sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_sub_subelement['data']);
-																				break;
-
-																			case EBML_ID_CONTENTCOMPRESSION:
-
-																				while ($this->getEBMLelement($sub_sub_sub_subelement, $sub_sub_subelement['end'], true)) {
-																					switch ($sub_sub_sub_subelement['id']) {
-
-																						case EBML_ID_CONTENTCOMPALGO:
-																							$track_entry[$sub_subelement['id_name']][$sub_sub_subelement['id_name']][$sub_sub_sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_sub_sub_subelement['data']);
-																							break;
-
-																						case EBML_ID_CONTENTCOMPSETTINGS:
-																							$track_entry[$sub_subelement['id_name']][$sub_sub_subelement['id_name']][$sub_sub_sub_subelement['id_name']] = $sub_sub_sub_subelement['data'];
-																							break;
-
-																						default:
-																							$this->unhandledElement('track.contentencodings.contentencoding.contentcompression', __LINE__, $sub_sub_sub_subelement);
-																					}
-																				}
-																				break;
-
-																			case EBML_ID_CONTENTENCRYPTION:
-
-																				while ($this->getEBMLelement($sub_sub_sub_subelement, $sub_sub_subelement['end'], true)) {
-																					switch ($sub_sub_sub_subelement['id']) {
-
-																						case EBML_ID_CONTENTENCALGO:
-																						case EBML_ID_CONTENTSIGALGO:
-																						case EBML_ID_CONTENTSIGHASHALGO:
-																							$track_entry[$sub_subelement['id_name']][$sub_sub_subelement['id_name']][$sub_sub_sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_sub_sub_subelement['data']);
-																							break;
-
-																						case EBML_ID_CONTENTENCKEYID:
-																						case EBML_ID_CONTENTSIGNATURE:
-																						case EBML_ID_CONTENTSIGKEYID:
-																							$track_entry[$sub_subelement['id_name']][$sub_sub_subelement['id_name']][$sub_sub_sub_subelement['id_name']] = $sub_sub_sub_subelement['data'];
-																							break;
-
-																						default:
-																							$this->unhandledElement('track.contentencodings.contentencoding.contentcompression', __LINE__, $sub_sub_sub_subelement);
-																					}
-																				}
-																				break;
-
-																			default:
-																				$this->unhandledElement('track.contentencodings.contentencoding', __LINE__, $sub_sub_subelement);
-																		}
-																	}
-																	break;
-
-																default:
-																	$this->unhandledElement('track.contentencodings', __LINE__, $sub_subelement);
-															}
-														}
-														break;
-
-													default:
-														$this->unhandledElement('track', __LINE__, $subelement);
-												}
-											}
-
-											$info['matroska']['tracks']['tracks'][] = $track_entry;
-											break;
-
-										default:
-											$this->unhandledElement('tracks', __LINE__, $track_entry);
-									}
-								}
-								break;
-
-							case EBML_ID_INFO: // Contains miscellaneous general information and statistics on the file.
-								$info_entry = array();
-
-								while ($this->getEBMLelement($subelement, $element_data['end'], true)) {
-									switch ($subelement['id']) {
-
-										case EBML_ID_CHAPTERTRANSLATEEDITIONUID:
-										case EBML_ID_CHAPTERTRANSLATECODEC:
-										case EBML_ID_TIMECODESCALE:
-											$info_entry[$subelement['id_name']] = getid3_lib::BigEndian2Int($subelement['data']);
-											break;
-
-										case EBML_ID_DURATION:
-											$info_entry[$subelement['id_name']] = getid3_lib::BigEndian2Float($subelement['data']);
-											break;
-
-										case EBML_ID_DATEUTC:
-											$info_entry[$subelement['id_name']]         = getid3_lib::BigEndian2Int($subelement['data']);
-											$info_entry[$subelement['id_name'].'_unix'] = self::EBMLdate2unix($info_entry[$subelement['id_name']]);
-											break;
-
-										case EBML_ID_SEGMENTUID:
-										case EBML_ID_PREVUID:
-										case EBML_ID_NEXTUID:
-										case EBML_ID_SEGMENTFAMILY:
-										case EBML_ID_CHAPTERTRANSLATEID:
-											$info_entry[$subelement['id_name']] = getid3_lib::trimNullByte($subelement['data']);
-											break;
-
-										case EBML_ID_SEGMENTFILENAME:
-										case EBML_ID_PREVFILENAME:
-										case EBML_ID_NEXTFILENAME:
-										case EBML_ID_TITLE:
-										case EBML_ID_MUXINGAPP:
-										case EBML_ID_WRITINGAPP:
-											$info_entry[$subelement['id_name']] = getid3_lib::trimNullByte($subelement['data']);
-											$info['matroska']['comments'][strtolower($subelement['id_name'])][] = $info_entry[$subelement['id_name']];
-											break;
-
-										default:
-											$this->unhandledElement('info', __LINE__, $subelement);
-									}
-								}
-								$info['matroska']['info'][] = $info_entry;
-								break;
-
-							case EBML_ID_CUES: // A top-level element to speed seeking access. All entries are local to the segment. Should be mandatory for non "live" streams.
-								if (self::$hide_clusters) { // do not parse cues if hide clusters is "ON" till they point to clusters anyway
-									$this->current_offset = $element_data['end'];
-									break;
-								}
-								$cues_entry = array();
-
-								while ($this->getEBMLelement($subelement, $element_data['end'])) {
-									switch ($subelement['id']) {
-
-										case EBML_ID_CUEPOINT:
-											$cuepoint_entry = array();
-
-											while ($this->getEBMLelement($sub_subelement, $subelement['end'], array(EBML_ID_CUETRACKPOSITIONS))) {
-												switch ($sub_subelement['id']) {
-
-													case EBML_ID_CUETRACKPOSITIONS:
-                                                    	$cuetrackpositions_entry = array();
-													
-														while ($this->getEBMLelement($sub_sub_subelement, $sub_subelement['end'], true)) {
-															switch ($sub_sub_subelement['id']) {
-
-																case EBML_ID_CUETRACK:
-																case EBML_ID_CUECLUSTERPOSITION:
-																case EBML_ID_CUEBLOCKNUMBER:
-																case EBML_ID_CUECODECSTATE:
-																	$cuetrackpositions_entry[$sub_sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_sub_subelement['data']);
-																	break;
-
-																default:
-																	$this->unhandledElement('cues.cuepoint.cuetrackpositions', __LINE__, $sub_sub_subelement);
-															}
-														}
-														$cuepoint_entry[$sub_subelement['id_name']][] = $cuetrackpositions_entry;
-														break;
-
-													case EBML_ID_CUETIME:
-														$cuepoint_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_subelement['data']);
-														break;
-
-													default:
-														$this->unhandledElement('cues.cuepoint', __LINE__, $sub_subelement);
-												}
-											}
-											$cues_entry[] = $cuepoint_entry;
-											break;
-
-										default:
-											$this->unhandledElement('cues', __LINE__, $subelement);
-									}
-								}
-								$info['matroska']['cues'] = $cues_entry;
-								break;
-
-							case EBML_ID_TAGS: // Element containing elements specific to Tracks/Chapters.
-                            	$tags_entry = array();
-							
-								while ($this->getEBMLelement($subelement, $element_data['end'], false)) {
-									switch ($subelement['id']) {
-
-										case EBML_ID_TAG:
-											$tag_entry = array();
-										
-											while ($this->getEBMLelement($sub_subelement, $subelement['end'], false)) {
-												switch ($sub_subelement['id']) {
-
-													case EBML_ID_TARGETS:
-														$targets_entry = array();
-
-														while ($this->getEBMLelement($sub_sub_subelement, $sub_subelement['end'], true)) {
-															switch ($sub_sub_subelement['id']) {
-
-																case EBML_ID_TARGETTYPEVALUE:
-																	$targets_entry[$sub_sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_sub_subelement['data']);
-																	$targets_entry[strtolower($sub_sub_subelement['id_name']).'_long'] = self::MatroskaTargetTypeValue($targets_entry[$sub_sub_subelement['id_name']]);
-																	break;
-
-																case EBML_ID_TARGETTYPE:
-																	$targets_entry[$sub_sub_subelement['id_name']] = $sub_sub_subelement['data'];
-																	break;
-																
-																case EBML_ID_TAGTRACKUID:	
-																case EBML_ID_TAGEDITIONUID:
-																case EBML_ID_TAGCHAPTERUID:
-																case EBML_ID_TAGATTACHMENTUID:
-																	$targets_entry[$sub_sub_subelement['id_name']][] = getid3_lib::BigEndian2Int($sub_sub_subelement['data']);
-																	break;
-
-																default:
-																	$this->unhandledElement('tags.tag.targets', __LINE__, $sub_sub_subelement);
-															}
-														}
-														$tag_entry[$sub_subelement['id_name']] = $targets_entry;
-														break;
-
-													case EBML_ID_SIMPLETAG:
-														$tag_entry[$sub_subelement['id_name']][] = $this->HandleEMBLSimpleTag($sub_subelement['end']);
-														break;
-
-													default:
-														$this->unhandledElement('tags.tag', __LINE__, $sub_subelement);
-												}
-											}
-											$tags_entry[] = $tag_entry;
-											break;
-
-										default:
-											$this->unhandledElement('tags', __LINE__, $subelement);
-									}
-								}
-								$info['matroska']['tags'] = $tags_entry;
-								break;
-
-							case EBML_ID_ATTACHMENTS: // Contain attached files.
-
-								while ($this->getEBMLelement($subelement, $element_data['end'])) {
-									switch ($subelement['id']) {
-
-										case EBML_ID_ATTACHEDFILE:
-											$attachedfile_entry = array();
-
-											while ($this->getEBMLelement($sub_subelement, $subelement['end'], array(EBML_ID_FILEDATA))) {
-												switch ($sub_subelement['id']) {
-
-													case EBML_ID_FILEDESCRIPTION:
-													case EBML_ID_FILENAME:
-													case EBML_ID_FILEMIMETYPE:
-														$attachedfile_entry[$sub_subelement['id_name']] = $sub_subelement['data'];
-														break;
-
-													case EBML_ID_FILEDATA:
-														$attachedfile_entry['data_offset'] = $this->current_offset;
-														$attachedfile_entry['data_length'] = $sub_subelement['length'];
-
-														$this->getid3->saveAttachment(
-															$attachedfile_entry[$sub_subelement['id_name']],
-															$attachedfile_entry['FileName'],
-															$attachedfile_entry['data_offset'],
-															$attachedfile_entry['data_length']);
-
-														if (@$attachedfile_entry[$sub_subelement['id_name']] && is_file($attachedfile_entry[$sub_subelement['id_name']])) {
-															$attachedfile_entry[$sub_subelement['id_name'].'_filename'] = $attachedfile_entry[$sub_subelement['id_name']];
-															unset($attachedfile_entry[$sub_subelement['id_name']]);
-														}
-
-														$this->current_offset = $sub_subelement['end'];
-														break;
-
-													case EBML_ID_FILEUID:
-														$attachedfile_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_subelement['data']);
-														break;
-
-													default:
-														$this->unhandledElement('attachments.attachedfile', __LINE__, $sub_subelement);
-												}
-											}
-											if (!empty($attachedfile_entry['FileData']) && !empty($attachedfile_entry['FileMimeType']) && preg_match('#^image/#i', $attachedfile_entry['FileMimeType'])) {
-												if ($this->getid3->option_save_attachments === getID3::ATTACHMENTS_INLINE) {
-													$attachedfile_entry['data']       = $attachedfile_entry['FileData'];
-													$attachedfile_entry['image_mime'] = $attachedfile_entry['FileMimeType'];
-													$info['matroska']['comments']['picture'][] = array('data' => $attachedfile_entry['data'], 'image_mime' => $attachedfile_entry['image_mime'], 'filename' => (!empty($attachedfile_entry['FileName']) ? $attachedfile_entry['FileName'] : ''));
-													unset($attachedfile_entry['FileData'], $attachedfile_entry['FileMimeType']);
-												}
-											}
-											if (!empty($attachedfile_entry['image_mime']) && preg_match('#^image/#i', $attachedfile_entry['image_mime'])) {
-												// don't add a second copy of attached images, which are grouped under the standard location [comments][picture]
-											} else {
-												$info['matroska']['attachments'][] = $attachedfile_entry;
-											}
-											break;
-
-										default:
-											$this->unhandledElement('attachments', __LINE__, $subelement);
-									}
-								}
-								break;
-
-							case EBML_ID_CHAPTERS:
-
-								while ($this->getEBMLelement($subelement, $element_data['end'])) {
-									switch ($subelement['id']) {
-
-										case EBML_ID_EDITIONENTRY:
-											$editionentry_entry = array();
-
-											while ($this->getEBMLelement($sub_subelement, $subelement['end'], array(EBML_ID_CHAPTERATOM))) {
-												switch ($sub_subelement['id']) {
-
-													case EBML_ID_EDITIONUID:
-														$editionentry_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_subelement['data']);
-														break;
-
-													case EBML_ID_EDITIONFLAGHIDDEN:
-													case EBML_ID_EDITIONFLAGDEFAULT:
-													case EBML_ID_EDITIONFLAGORDERED:
-														$editionentry_entry[$sub_subelement['id_name']] = (bool)getid3_lib::BigEndian2Int($sub_subelement['data']);
-														break;
-
-													case EBML_ID_CHAPTERATOM:
-														$chapteratom_entry = array();
-
-														while ($this->getEBMLelement($sub_sub_subelement, $sub_subelement['end'], array(EBML_ID_CHAPTERTRACK, EBML_ID_CHAPTERDISPLAY))) {
-															switch ($sub_sub_subelement['id']) {
-
-																case EBML_ID_CHAPTERSEGMENTUID:
-																case EBML_ID_CHAPTERSEGMENTEDITIONUID:
-																	$chapteratom_entry[$sub_sub_subelement['id_name']] = $sub_sub_subelement['data'];
-																	break;
-
-																case EBML_ID_CHAPTERFLAGENABLED:
-																case EBML_ID_CHAPTERFLAGHIDDEN:
-																	$chapteratom_entry[$sub_sub_subelement['id_name']] = (bool)getid3_lib::BigEndian2Int($sub_sub_subelement['data']);
-																	break;
-
-																case EBML_ID_CHAPTERUID:
-																case EBML_ID_CHAPTERTIMESTART:
-																case EBML_ID_CHAPTERTIMEEND:
-																	$chapteratom_entry[$sub_sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_sub_subelement['data']);
-																	break;
-
-																case EBML_ID_CHAPTERTRACK:
-																	$chaptertrack_entry = array();
-
-																	while ($this->getEBMLelement($sub_sub_sub_subelement, $sub_sub_subelement['end'], true)) {
-																		switch ($sub_sub_sub_subelement['id']) {
-
-																			case EBML_ID_CHAPTERTRACKNUMBER:
-																				$chaptertrack_entry[$sub_sub_sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_sub_sub_subelement['data']);
-																				break;
-
-																			default:
-																				$this->unhandledElement('chapters.editionentry.chapteratom.chaptertrack', __LINE__, $sub_sub_sub_subelement);
-																		}
-																	}
-																	$chapteratom_entry[$sub_sub_subelement['id_name']][] = $chaptertrack_entry;
-																	break;
-
-																case EBML_ID_CHAPTERDISPLAY:
-																	$chapterdisplay_entry = array();
-
-																	while ($this->getEBMLelement($sub_sub_sub_subelement, $sub_sub_subelement['end'], true)) {
-																		switch ($sub_sub_sub_subelement['id']) {
-
-																			case EBML_ID_CHAPSTRING:
-																			case EBML_ID_CHAPLANGUAGE:
-																			case EBML_ID_CHAPCOUNTRY:
-																				$chapterdisplay_entry[$sub_sub_sub_subelement['id_name']] = $sub_sub_sub_subelement['data'];
-																				break;
-
-																			default:
-																				$this->unhandledElement('chapters.editionentry.chapteratom.chapterdisplay', __LINE__, $sub_sub_sub_subelement);
-																		}
-																	}
-																	$chapteratom_entry[$sub_sub_subelement['id_name']][] = $chapterdisplay_entry;
-																	break;
-
-																default:
-																	$this->unhandledElement('chapters.editionentry.chapteratom', __LINE__, $sub_sub_subelement);
-															}
-														}
-														$editionentry_entry[$sub_subelement['id_name']][] = $chapteratom_entry;
-														break;
-
-													default:
-														$this->unhandledElement('chapters.editionentry', __LINE__, $sub_subelement);
-												}
-											}
-											$info['matroska']['chapters'][] = $editionentry_entry;
-											break;
-
-										default:
-											$this->unhandledElement('chapters', __LINE__, $subelement);
-									}
-								}
-								break;
-
-							case EBML_ID_CLUSTER: // The lower level element containing the (monolithic) Block structure.
-								$cluster_entry = array();
-
-								while ($this->getEBMLelement($subelement, $element_data['end'], array(EBML_ID_CLUSTERSILENTTRACKS, EBML_ID_CLUSTERBLOCKGROUP, EBML_ID_CLUSTERSIMPLEBLOCK))) {
-									switch ($subelement['id']) {
-
-										case EBML_ID_CLUSTERTIMECODE:
-										case EBML_ID_CLUSTERPOSITION:
-										case EBML_ID_CLUSTERPREVSIZE:
-											$cluster_entry[$subelement['id_name']] = getid3_lib::BigEndian2Int($subelement['data']);
-											break;
-
-										case EBML_ID_CLUSTERSILENTTRACKS:
-											$cluster_silent_tracks = array();
-
-											while ($this->getEBMLelement($sub_subelement, $subelement['end'], true)) {
-												switch ($sub_subelement['id']) {
-
-													case EBML_ID_CLUSTERSILENTTRACKNUMBER:
-														$cluster_silent_tracks[] = getid3_lib::BigEndian2Int($sub_subelement['data']);
-														break;
-
-													default:
-														$this->unhandledElement('cluster.silenttracks', __LINE__, $sub_subelement);
-												}
-											}
-											$cluster_entry[$subelement['id_name']][] = $cluster_silent_tracks;
-											break;
-
-										case EBML_ID_CLUSTERBLOCKGROUP:
-											$cluster_block_group = array('offset' => $this->current_offset);
-
-											while ($this->getEBMLelement($sub_subelement, $subelement['end'], array(EBML_ID_CLUSTERBLOCK))) {
-												switch ($sub_subelement['id']) {
-
-													case EBML_ID_CLUSTERBLOCK:
-														$cluster_block_group[$sub_subelement['id_name']] = $this->HandleEMBLClusterBlock($sub_subelement, EBML_ID_CLUSTERBLOCK, $info);
-														break;
-
-													case EBML_ID_CLUSTERREFERENCEPRIORITY: // unsigned-int
-													case EBML_ID_CLUSTERBLOCKDURATION:     // unsigned-int
-														$cluster_block_group[$sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_subelement['data']);
-														break;
-
-													case EBML_ID_CLUSTERREFERENCEBLOCK:    // signed-int
-														$cluster_block_group[$sub_subelement['id_name']][] = getid3_lib::BigEndian2Int($sub_subelement['data'], false, true);
-														break;
-													
-													case EBML_ID_CLUSTERCODECSTATE:
-														$cluster_block_group[$sub_subelement['id_name']] = getid3_lib::trimNullByte($sub_subelement['data']);
-														break;
-
-													default:
-														$this->unhandledElement('clusters.blockgroup', __LINE__, $sub_subelement);
-												}
-											}
-											$cluster_entry[$subelement['id_name']][] = $cluster_block_group;
-											break;
-
-										case EBML_ID_CLUSTERSIMPLEBLOCK:
-											$cluster_entry[$subelement['id_name']][] = $this->HandleEMBLClusterBlock($subelement, EBML_ID_CLUSTERSIMPLEBLOCK, $info);
-											break;
-
-										default:
-											$this->unhandledElement('cluster', __LINE__, $subelement);
-									}
-									$this->current_offset = $subelement['end'];
-								}
-								if (!self::$hide_clusters) {
-									$info['matroska']['cluster'][] = $cluster_entry;
-								}
-
-								// check to see if all the data we need exists already, if so, break out of the loop
-								if (!self::$parse_whole_file) {
-									if (isset($info['matroska']['info']) && is_array($info['matroska']['info'])) {
-										if (isset($info['matroska']['tracks']['tracks']) && is_array($info['matroska']['tracks']['tracks'])) {
-											return;
-										}
-									}
-								}
-								break;
-
-							default:
-								$this->unhandledElement('segment', __LINE__, $element_data);
-						}
-					}
-					break;
-
-				default:
-					$this->unhandledElement('root', __LINE__, $top_element);
-			}
-		}
-    }
-
-	private function EnsureBufferHasEnoughData($min_data = 1024)
-	{
-		if (($this->current_offset - $this->EBMLbuffer_offset) >= ($this->EBMLbuffer_length - $min_data)) {
-
-			if (!getid3_lib::intValueSupported($this->current_offset + $this->getid3->fread_buffer_size())) {
-				$this->getid3->info['error'][] = 'EBML parser: cannot read past '.$this->current_offset;
-				return false;
-			}
-
-			fseek($this->getid3->fp, $this->current_offset, SEEK_SET);
-			$this->EBMLbuffer_offset = $this->current_offset;
-			$this->EBMLbuffer = fread($this->getid3->fp, max($min_data, $this->getid3->fread_buffer_size()));
-			$this->EBMLbuffer_length = strlen($this->EBMLbuffer);
-
-			if ($this->EBMLbuffer_length == 0 && feof($this->getid3->fp)) {
-				$this->getid3->info['error'][] = 'EBML parser: ran out of file at offset '.$this->current_offset;
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	private function readEBMLint()
-	{
-		$actual_offset = $this->current_offset - $this->EBMLbuffer_offset;
-
-		// get length of integer
-		$first_byte_int = ord($this->EBMLbuffer[$actual_offset]);
-		if (0x80 & $first_byte_int) {
-			$length = 1;
-		} elseif (0x40 & $first_byte_int) {
-			$length = 2;
-		} elseif (0x20 & $first_byte_int) {
-			$length = 3;
-		} elseif (0x10 & $first_byte_int) {
-			$length = 4;
-		} elseif (0x08 & $first_byte_int) {
-			$length = 5;
-		} elseif (0x04 & $first_byte_int) {
-			$length = 6;
-		} elseif (0x02 & $first_byte_int) {
-			$length = 7;
-		} elseif (0x01 & $first_byte_int) {
-			$length = 8;
-		} else {
-			throw new Exception('invalid EBML integer (leading 0x00) at '.$this->current_offset);
-		}
-
-		// read
-		$int_value = self::EBML2Int(substr($this->EBMLbuffer, $actual_offset, $length));
-		$this->current_offset += $length;
-
-		return $int_value;
-	}
-
-	private function readEBMLelementData($length)
-	{
-		$data = substr($this->EBMLbuffer, $this->current_offset - $this->EBMLbuffer_offset, $length);
-		$this->current_offset += $length;
-
-		return $data;
-	}
-
-	private function getEBMLelement(&$element, $parent_end, $get_data = false)
-	{
-		if ($this->current_offset >= $parent_end) {
-			return false;
-		}
-
-		if (!$this->EnsureBufferHasEnoughData()) {
-			$this->current_offset = PHP_INT_MAX; // do not exit parser right now, allow to finish current loop to gather maximum information
-			return false;
-		}
-
-		$element = array();
-
-		// set offset
-		$element['offset'] = $this->current_offset;
-
-		// get ID
-		$element['id'] = $this->readEBMLint();
-
-		// get name
-		$element['id_name'] = self::EBMLidName($element['id']);
-
-		// get length
-		$element['length'] = $this->readEBMLint();
-
-		// get end offset
-		$element['end'] = $this->current_offset + $element['length'];
-
-		// get raw data
-		$dont_parse = (in_array($element['id'], $this->unuseful_elements) || $element['id_name'] == dechex($element['id']));
-		if (($get_data === true || (is_array($get_data) && !in_array($element['id'], $get_data))) && !$dont_parse) {
-			$element['data'] = $this->readEBMLelementData($element['length'], $element);
-		}
-
-		return true;
-	}
-
-	private function unhandledElement($type, $line, $element)
-	{
-		// warn only about unknown and missed elements, not about unuseful
-		if (!in_array($element['id'], $this->unuseful_elements)) {
-			$this->getid3->warning('Unhandled '.$type.' element ['.basename(__FILE__).':'.$line.'] ('.$element['id'].'::'.$element['id_name'].' ['.$element['length'].' bytes]) at '.$element['offset']);
-		}
-
-		// increase offset for unparsed elements
-		if (!isset($element['data'])) {
-			$this->current_offset = $element['end'];
-		}
-	}
-
-	private function ExtractCommentsSimpleTag($SimpleTagArray)
-	{
-		if (!empty($SimpleTagArray['SimpleTag'])) {
-			foreach ($SimpleTagArray['SimpleTag'] as $SimpleTagKey => $SimpleTagData) {
-				if (!empty($SimpleTagData['TagName']) && !empty($SimpleTagData['TagString'])) {
-					$this->getid3->info['matroska']['comments'][strtolower($SimpleTagData['TagName'])][] = $SimpleTagData['TagString'];
-				}
-				if (!empty($SimpleTagData['SimpleTag'])) {
-					$this->ExtractCommentsSimpleTag($SimpleTagData);
-				}
-			}
-		}
-
-		return true;
-	}
-
-	private function HandleEMBLSimpleTag($parent_end)
-	{
-		$simpletag_entry = array();
-
-		while ($this->getEBMLelement($element, $parent_end, array(EBML_ID_SIMPLETAG))) {
-			switch ($element['id']) {
-
-				case EBML_ID_TAGNAME:
-				case EBML_ID_TAGLANGUAGE:
-				case EBML_ID_TAGSTRING:
-				case EBML_ID_TAGBINARY:
-					$simpletag_entry[$element['id_name']] = $element['data'];
-					break;
-
-				case EBML_ID_SIMPLETAG:
-					$simpletag_entry[$element['id_name']][] = $this->HandleEMBLSimpleTag($element['end']);
-					break;
-
-				case EBML_ID_TAGDEFAULT:
-					$simpletag_entry[$element['id_name']] = (bool)getid3_lib::BigEndian2Int($element['data']);
-					break;
-
-				default:
-					$this->unhandledElement('tag.simpletag', __LINE__, $element);
-			}
-		}
-
-		return $simpletag_entry;
-	}
-
-	private function HandleEMBLClusterBlock($element, $block_type, &$info)
-	{
-		// http://www.matroska.org/technical/specs/index.html#block_structure
-		// http://www.matroska.org/technical/specs/index.html#simpleblock_structure
-
-		$cluster_block_data = array();
-		$cluster_block_data['tracknumber'] = $this->readEBMLint();
-		$cluster_block_data['timecode']    = getid3_lib::BigEndian2Int($this->readEBMLelementData(2));
-		$cluster_block_data['flags_raw']   = getid3_lib::BigEndian2Int($this->readEBMLelementData(1));
-
-		if ($block_type == EBML_ID_CLUSTERSIMPLEBLOCK) {
-			$cluster_block_data['flags']['keyframe']  = (($cluster_block_data['flags_raw'] & 0x80) >> 7);
-			//$cluster_block_data['flags']['reserved1'] = (($cluster_block_data['flags_raw'] & 0x70) >> 4);
-		}
-		else {
-			//$cluster_block_data['flags']['reserved1'] = (($cluster_block_data['flags_raw'] & 0xF0) >> 4);
-		}
-		$cluster_block_data['flags']['invisible'] = (bool)(($cluster_block_data['flags_raw'] & 0x08) >> 3);
-		$cluster_block_data['flags']['lacing']    =       (($cluster_block_data['flags_raw'] & 0x06) >> 1);  // 00=no lacing; 01=Xiph lacing; 11=EBML lacing; 10=fixed-size lacing
-		if ($block_type == EBML_ID_CLUSTERSIMPLEBLOCK) {
-			$cluster_block_data['flags']['discardable'] = (($cluster_block_data['flags_raw'] & 0x01));
-		}
-		else {
-			//$cluster_block_data['flags']['reserved2'] = (($cluster_block_data['flags_raw'] & 0x01) >> 0);
-		}
-		$cluster_block_data['flags']['lacing_type'] = self::MatroskaBlockLacingType($cluster_block_data['flags']['lacing']);
-
-        // Lace (when lacing bit is set)
-		if ($cluster_block_data['flags']['lacing'] > 0) {
-			$cluster_block_data['lace_frames'] = getid3_lib::BigEndian2Int($this->readEBMLelementData(1)) + 1; // Number of frames in the lace-1 (uint8)
-			if ($cluster_block_data['flags']['lacing'] != 0x02) { // Lace-coded size of each frame of the lace, except for the last one (multiple uint8). *This is not used with Fixed-size lacing as it is calculated automatically from (total size of lace) / (number of frames in lace).
-				for ($i = 1; $i < $cluster_block_data['lace_frames']; $i ++) {
-					if ($cluster_block_data['flags']['lacing'] == 0x03) { // EBML lacing
-						// TODO: read size correctly, calc size for the last frame. For now offsets are deteminded OK with readEBMLint() and that's the most important thing.
-						$cluster_block_data['lace_frames_size'][$i] = $this->readEBMLint();
-					}
-					else { // Xiph lacing
-						$cluster_block_data['lace_frames_size'][$i] = getid3_lib::BigEndian2Int($this->readEBMLelementData(1));
-					}
-				}
-			}
-		}
-
-		if (!isset($info['matroska']['track_data_offsets'][$cluster_block_data['tracknumber']])) {
-			$info['matroska']['track_data_offsets'][$cluster_block_data['tracknumber']]['offset'] = $this->current_offset;
-			$info['matroska']['track_data_offsets'][$cluster_block_data['tracknumber']]['length'] = $element['end'] - $this->current_offset;
-		}
-
-		// set offset manually
-		$this->current_offset = $element['end'];
-
-		return $cluster_block_data;
-	}
-
-	private static function EBML2Int($EBMLstring) {
-		// http://matroska.org/specs/
-
-		// Element ID coded with an UTF-8 like system:
-		// 1xxx xxxx                                  - Class A IDs (2^7 -2 possible values) (base 0x8X)
-		// 01xx xxxx  xxxx xxxx                       - Class B IDs (2^14-2 possible values) (base 0x4X 0xXX)
-		// 001x xxxx  xxxx xxxx  xxxx xxxx            - Class C IDs (2^21-2 possible values) (base 0x2X 0xXX 0xXX)
-		// 0001 xxxx  xxxx xxxx  xxxx xxxx  xxxx xxxx - Class D IDs (2^28-2 possible values) (base 0x1X 0xXX 0xXX 0xXX)
-		// Values with all x at 0 and 1 are reserved (hence the -2).
-
-		// Data size, in octets, is also coded with an UTF-8 like system :
-		// 1xxx xxxx                                                                              - value 0 to  2^7-2
-		// 01xx xxxx  xxxx xxxx                                                                   - value 0 to 2^14-2
-		// 001x xxxx  xxxx xxxx  xxxx xxxx                                                        - value 0 to 2^21-2
-		// 0001 xxxx  xxxx xxxx  xxxx xxxx  xxxx xxxx                                             - value 0 to 2^28-2
-		// 0000 1xxx  xxxx xxxx  xxxx xxxx  xxxx xxxx  xxxx xxxx                                  - value 0 to 2^35-2
-		// 0000 01xx  xxxx xxxx  xxxx xxxx  xxxx xxxx  xxxx xxxx  xxxx xxxx                       - value 0 to 2^42-2
-		// 0000 001x  xxxx xxxx  xxxx xxxx  xxxx xxxx  xxxx xxxx  xxxx xxxx  xxxx xxxx            - value 0 to 2^49-2
-		// 0000 0001  xxxx xxxx  xxxx xxxx  xxxx xxxx  xxxx xxxx  xxxx xxxx  xxxx xxxx  xxxx xxxx - value 0 to 2^56-2
-
-		$first_byte_int = ord($EBMLstring[0]);
-		if (0x80 & $first_byte_int) {
-			$EBMLstring[0] = chr($first_byte_int & 0x7F);
-		} elseif (0x40 & $first_byte_int) {
-			$EBMLstring[0] = chr($first_byte_int & 0x3F);
-		} elseif (0x20 & $first_byte_int) {
-			$EBMLstring[0] = chr($first_byte_int & 0x1F);
-		} elseif (0x10 & $first_byte_int) {
-			$EBMLstring[0] = chr($first_byte_int & 0x0F);
-		} elseif (0x08 & $first_byte_int) {
-			$EBMLstring[0] = chr($first_byte_int & 0x07);
-		} elseif (0x04 & $first_byte_int) {
-			$EBMLstring[0] = chr($first_byte_int & 0x03);
-		} elseif (0x02 & $first_byte_int) {
-			$EBMLstring[0] = chr($first_byte_int & 0x01);
-		} elseif (0x01 & $first_byte_int) {
-			$EBMLstring[0] = chr($first_byte_int & 0x00);
-		}
-
-		return getid3_lib::BigEndian2Int($EBMLstring);
-	}
-
-	private static function EBMLdate2unix($EBMLdatestamp) {
-		// Date - signed 8 octets integer in nanoseconds with 0 indicating the precise beginning of the millennium (at 2001-01-01T00:00:00,000000000 UTC)
-		// 978307200 == mktime(0, 0, 0, 1, 1, 2001) == January 1, 2001 12:00:00am UTC
-		return round(($EBMLdatestamp / 1000000000) + 978307200);
-	}
-
-	public static function MatroskaTargetTypeValue($target_type) {
-		// http://www.matroska.org/technical/specs/tagging/index.html
-		static $MatroskaTargetTypeValue = array();
-		if (empty($MatroskaTargetTypeValue)) {
-			$MatroskaTargetTypeValue[10] = 'A: ~ V:shot';                                           // the lowest hierarchy found in music or movies
-			$MatroskaTargetTypeValue[20] = 'A:subtrack/part/movement ~ V:scene';                    // corresponds to parts of a track for audio (like a movement)
-			$MatroskaTargetTypeValue[30] = 'A:track/song ~ V:chapter';                              // the common parts of an album or a movie
-			$MatroskaTargetTypeValue[40] = 'A:part/session ~ V:part/session';                       // when an album or episode has different logical parts
-			$MatroskaTargetTypeValue[50] = 'A:album/opera/concert ~ V:movie/episode/concert';       // the most common grouping level of music and video (equals to an episode for TV series)
-			$MatroskaTargetTypeValue[60] = 'A:edition/issue/volume/opus ~ V:season/sequel/volume';  // a list of lower levels grouped together
-			$MatroskaTargetTypeValue[70] = 'A:collection ~ V:collection';                           // the high hierarchy consisting of many different lower items
-		}
-		return (isset($MatroskaTargetTypeValue[$target_type]) ? $MatroskaTargetTypeValue[$target_type] : $target_type);
-	}
-
-	public static function MatroskaBlockLacingType($lacingtype) {
-		// http://matroska.org/technical/specs/index.html#block_structure
-		static $MatroskaBlockLacingType = array();
-		if (empty($MatroskaBlockLacingType)) {
-			$MatroskaBlockLacingType[0x00] = 'no lacing';
-			$MatroskaBlockLacingType[0x01] = 'Xiph lacing';
-			$MatroskaBlockLacingType[0x02] = 'fixed-size lacing';
-			$MatroskaBlockLacingType[0x03] = 'EBML lacing';
-		}
-		return (isset($MatroskaBlockLacingType[$lacingtype]) ? $MatroskaBlockLacingType[$lacingtype] : $lacingtype);
-	}
-
-	public static function MatroskaCodecIDtoCommonName($codecid) {
-		// http://www.matroska.org/technical/specs/codecid/index.html
-		static $MatroskaCodecIDlist = array();
-		if (empty($MatroskaCodecIDlist)) {
-			$MatroskaCodecIDlist['A_AAC']            = 'aac';
-			$MatroskaCodecIDlist['A_AAC/MPEG2/LC']   = 'aac';
-			$MatroskaCodecIDlist['A_AC3']            = 'ac3';
-			$MatroskaCodecIDlist['A_DTS']            = 'dts';
-			$MatroskaCodecIDlist['A_FLAC']           = 'flac';
-			$MatroskaCodecIDlist['A_MPEG/L1']        = 'mp1';
-			$MatroskaCodecIDlist['A_MPEG/L2']        = 'mp2';
-			$MatroskaCodecIDlist['A_MPEG/L3']        = 'mp3';
-			$MatroskaCodecIDlist['A_PCM/INT/LIT']    = 'pcm';       // PCM Integer Little Endian
-			$MatroskaCodecIDlist['A_PCM/INT/BIG']    = 'pcm';       // PCM Integer Big Endian
-			$MatroskaCodecIDlist['A_QUICKTIME/QDMC'] = 'quicktime'; // Quicktime: QDesign Music
-			$MatroskaCodecIDlist['A_QUICKTIME/QDM2'] = 'quicktime'; // Quicktime: QDesign Music v2
-			$MatroskaCodecIDlist['A_VORBIS']         = 'vorbis';
-			$MatroskaCodecIDlist['V_MPEG1']          = 'mpeg';
-			$MatroskaCodecIDlist['V_THEORA']         = 'theora';
-			$MatroskaCodecIDlist['V_REAL/RV40']      = 'real';
-			$MatroskaCodecIDlist['V_REAL/RV10']      = 'real';
-			$MatroskaCodecIDlist['V_REAL/RV20']      = 'real';
-			$MatroskaCodecIDlist['V_REAL/RV30']      = 'real';
-			$MatroskaCodecIDlist['V_QUICKTIME']      = 'quicktime'; // Quicktime
-			$MatroskaCodecIDlist['V_MPEG4/ISO/AP']   = 'mpeg4';
-			$MatroskaCodecIDlist['V_MPEG4/ISO/ASP']  = 'mpeg4';
-			$MatroskaCodecIDlist['V_MPEG4/ISO/AVC']  = 'h264';
-			$MatroskaCodecIDlist['V_MPEG4/ISO/SP']   = 'mpeg4';
-			$MatroskaCodecIDlist['V_VP8']            = 'vp8';
-			$MatroskaCodecIDlist['V_MS/VFW/FOURCC']  = 'riff';
-			$MatroskaCodecIDlist['A_MS/ACM']         = 'riff';
-		}
-		return (isset($MatroskaCodecIDlist[$codecid]) ? $MatroskaCodecIDlist[$codecid] : $codecid);
-	}
-
-	private static function EBMLidName($value) {
-		static $EBMLidList = array();
-		if (empty($EBMLidList)) {
-			$EBMLidList[EBML_ID_ASPECTRATIOTYPE]            = 'AspectRatioType';
-			$EBMLidList[EBML_ID_ATTACHEDFILE]               = 'AttachedFile';
-			$EBMLidList[EBML_ID_ATTACHMENTLINK]             = 'AttachmentLink';
-			$EBMLidList[EBML_ID_ATTACHMENTS]                = 'Attachments';
-			$EBMLidList[EBML_ID_AUDIO]                      = 'Audio';
-			$EBMLidList[EBML_ID_BITDEPTH]                   = 'BitDepth';
-			$EBMLidList[EBML_ID_CHANNELPOSITIONS]           = 'ChannelPositions';
-			$EBMLidList[EBML_ID_CHANNELS]                   = 'Channels';
-			$EBMLidList[EBML_ID_CHAPCOUNTRY]                = 'ChapCountry';
-			$EBMLidList[EBML_ID_CHAPLANGUAGE]               = 'ChapLanguage';
-			$EBMLidList[EBML_ID_CHAPPROCESS]                = 'ChapProcess';
-			$EBMLidList[EBML_ID_CHAPPROCESSCODECID]         = 'ChapProcessCodecID';
-			$EBMLidList[EBML_ID_CHAPPROCESSCOMMAND]         = 'ChapProcessCommand';
-			$EBMLidList[EBML_ID_CHAPPROCESSDATA]            = 'ChapProcessData';
-			$EBMLidList[EBML_ID_CHAPPROCESSPRIVATE]         = 'ChapProcessPrivate';
-			$EBMLidList[EBML_ID_CHAPPROCESSTIME]            = 'ChapProcessTime';
-			$EBMLidList[EBML_ID_CHAPSTRING]                 = 'ChapString';
-			$EBMLidList[EBML_ID_CHAPTERATOM]                = 'ChapterAtom';
-			$EBMLidList[EBML_ID_CHAPTERDISPLAY]             = 'ChapterDisplay';
-			$EBMLidList[EBML_ID_CHAPTERFLAGENABLED]         = 'ChapterFlagEnabled';
-			$EBMLidList[EBML_ID_CHAPTERFLAGHIDDEN]          = 'ChapterFlagHidden';
-			$EBMLidList[EBML_ID_CHAPTERPHYSICALEQUIV]       = 'ChapterPhysicalEquiv';
-			$EBMLidList[EBML_ID_CHAPTERS]                   = 'Chapters';
-			$EBMLidList[EBML_ID_CHAPTERSEGMENTEDITIONUID]   = 'ChapterSegmentEditionUID';
-			$EBMLidList[EBML_ID_CHAPTERSEGMENTUID]          = 'ChapterSegmentUID';
-			$EBMLidList[EBML_ID_CHAPTERTIMEEND]             = 'ChapterTimeEnd';
-			$EBMLidList[EBML_ID_CHAPTERTIMESTART]           = 'ChapterTimeStart';
-			$EBMLidList[EBML_ID_CHAPTERTRACK]               = 'ChapterTrack';
-			$EBMLidList[EBML_ID_CHAPTERTRACKNUMBER]         = 'ChapterTrackNumber';
-			$EBMLidList[EBML_ID_CHAPTERTRANSLATE]           = 'ChapterTranslate';
-			$EBMLidList[EBML_ID_CHAPTERTRANSLATECODEC]      = 'ChapterTranslateCodec';
-			$EBMLidList[EBML_ID_CHAPTERTRANSLATEEDITIONUID] = 'ChapterTranslateEditionUID';
-			$EBMLidList[EBML_ID_CHAPTERTRANSLATEID]         = 'ChapterTranslateID';
-			$EBMLidList[EBML_ID_CHAPTERUID]                 = 'ChapterUID';
-			$EBMLidList[EBML_ID_CLUSTER]                    = 'Cluster';
-			$EBMLidList[EBML_ID_CLUSTERBLOCK]               = 'ClusterBlock';
-			$EBMLidList[EBML_ID_CLUSTERBLOCKADDID]          = 'ClusterBlockAddID';
-			$EBMLidList[EBML_ID_CLUSTERBLOCKADDITIONAL]     = 'ClusterBlockAdditional';
-			$EBMLidList[EBML_ID_CLUSTERBLOCKADDITIONID]     = 'ClusterBlockAdditionID';
-			$EBMLidList[EBML_ID_CLUSTERBLOCKADDITIONS]      = 'ClusterBlockAdditions';
-			$EBMLidList[EBML_ID_CLUSTERBLOCKDURATION]       = 'ClusterBlockDuration';
-			$EBMLidList[EBML_ID_CLUSTERBLOCKGROUP]          = 'ClusterBlockGroup';
-			$EBMLidList[EBML_ID_CLUSTERBLOCKMORE]           = 'ClusterBlockMore';
-			$EBMLidList[EBML_ID_CLUSTERBLOCKVIRTUAL]        = 'ClusterBlockVirtual';
-			$EBMLidList[EBML_ID_CLUSTERCODECSTATE]          = 'ClusterCodecState';
-			$EBMLidList[EBML_ID_CLUSTERDELAY]               = 'ClusterDelay';
-			$EBMLidList[EBML_ID_CLUSTERDURATION]            = 'ClusterDuration';
-			$EBMLidList[EBML_ID_CLUSTERENCRYPTEDBLOCK]      = 'ClusterEncryptedBlock';
-			$EBMLidList[EBML_ID_CLUSTERFRAMENUMBER]         = 'ClusterFrameNumber';
-			$EBMLidList[EBML_ID_CLUSTERLACENUMBER]          = 'ClusterLaceNumber';
-			$EBMLidList[EBML_ID_CLUSTERPOSITION]            = 'ClusterPosition';
-			$EBMLidList[EBML_ID_CLUSTERPREVSIZE]            = 'ClusterPrevSize';
-			$EBMLidList[EBML_ID_CLUSTERREFERENCEBLOCK]      = 'ClusterReferenceBlock';
-			$EBMLidList[EBML_ID_CLUSTERREFERENCEPRIORITY]   = 'ClusterReferencePriority';
-			$EBMLidList[EBML_ID_CLUSTERREFERENCEVIRTUAL]    = 'ClusterReferenceVirtual';
-			$EBMLidList[EBML_ID_CLUSTERSILENTTRACKNUMBER]   = 'ClusterSilentTrackNumber';
-			$EBMLidList[EBML_ID_CLUSTERSILENTTRACKS]        = 'ClusterSilentTracks';
-			$EBMLidList[EBML_ID_CLUSTERSIMPLEBLOCK]         = 'ClusterSimpleBlock';
-			$EBMLidList[EBML_ID_CLUSTERTIMECODE]            = 'ClusterTimecode';
-			$EBMLidList[EBML_ID_CLUSTERTIMESLICE]           = 'ClusterTimeSlice';
-			$EBMLidList[EBML_ID_CODECDECODEALL]             = 'CodecDecodeAll';
-			$EBMLidList[EBML_ID_CODECDOWNLOADURL]           = 'CodecDownloadURL';
-			$EBMLidList[EBML_ID_CODECID]                    = 'CodecID';
-			$EBMLidList[EBML_ID_CODECINFOURL]               = 'CodecInfoURL';
-			$EBMLidList[EBML_ID_CODECNAME]                  = 'CodecName';
-			$EBMLidList[EBML_ID_CODECPRIVATE]               = 'CodecPrivate';
-			$EBMLidList[EBML_ID_CODECSETTINGS]              = 'CodecSettings';
-			$EBMLidList[EBML_ID_COLOURSPACE]                = 'ColourSpace';
-			$EBMLidList[EBML_ID_CONTENTCOMPALGO]            = 'ContentCompAlgo';
-			$EBMLidList[EBML_ID_CONTENTCOMPRESSION]         = 'ContentCompression';
-			$EBMLidList[EBML_ID_CONTENTCOMPSETTINGS]        = 'ContentCompSettings';
-			$EBMLidList[EBML_ID_CONTENTENCALGO]             = 'ContentEncAlgo';
-			$EBMLidList[EBML_ID_CONTENTENCKEYID]            = 'ContentEncKeyID';
-			$EBMLidList[EBML_ID_CONTENTENCODING]            = 'ContentEncoding';
-			$EBMLidList[EBML_ID_CONTENTENCODINGORDER]       = 'ContentEncodingOrder';
-			$EBMLidList[EBML_ID_CONTENTENCODINGS]           = 'ContentEncodings';
-			$EBMLidList[EBML_ID_CONTENTENCODINGSCOPE]       = 'ContentEncodingScope';
-			$EBMLidList[EBML_ID_CONTENTENCODINGTYPE]        = 'ContentEncodingType';
-			$EBMLidList[EBML_ID_CONTENTENCRYPTION]          = 'ContentEncryption';
-			$EBMLidList[EBML_ID_CONTENTSIGALGO]             = 'ContentSigAlgo';
-			$EBMLidList[EBML_ID_CONTENTSIGHASHALGO]         = 'ContentSigHashAlgo';
-			$EBMLidList[EBML_ID_CONTENTSIGKEYID]            = 'ContentSigKeyID';
-			$EBMLidList[EBML_ID_CONTENTSIGNATURE]           = 'ContentSignature';
-			$EBMLidList[EBML_ID_CRC32]                      = 'CRC32';
-			$EBMLidList[EBML_ID_CUEBLOCKNUMBER]             = 'CueBlockNumber';
-			$EBMLidList[EBML_ID_CUECLUSTERPOSITION]         = 'CueClusterPosition';
-			$EBMLidList[EBML_ID_CUECODECSTATE]              = 'CueCodecState';
-			$EBMLidList[EBML_ID_CUEPOINT]                   = 'CuePoint';
-			$EBMLidList[EBML_ID_CUEREFCLUSTER]              = 'CueRefCluster';
-			$EBMLidList[EBML_ID_CUEREFCODECSTATE]           = 'CueRefCodecState';
-			$EBMLidList[EBML_ID_CUEREFERENCE]               = 'CueReference';
-			$EBMLidList[EBML_ID_CUEREFNUMBER]               = 'CueRefNumber';
-			$EBMLidList[EBML_ID_CUEREFTIME]                 = 'CueRefTime';
-			$EBMLidList[EBML_ID_CUES]                       = 'Cues';
-			$EBMLidList[EBML_ID_CUETIME]                    = 'CueTime';
-			$EBMLidList[EBML_ID_CUETRACK]                   = 'CueTrack';
-			$EBMLidList[EBML_ID_CUETRACKPOSITIONS]          = 'CueTrackPositions';
-			$EBMLidList[EBML_ID_DATEUTC]                    = 'DateUTC';
-			$EBMLidList[EBML_ID_DEFAULTDURATION]            = 'DefaultDuration';
-			$EBMLidList[EBML_ID_DISPLAYHEIGHT]              = 'DisplayHeight';
-			$EBMLidList[EBML_ID_DISPLAYUNIT]                = 'DisplayUnit';
-			$EBMLidList[EBML_ID_DISPLAYWIDTH]               = 'DisplayWidth';
-			$EBMLidList[EBML_ID_DOCTYPE]                    = 'DocType';
-			$EBMLidList[EBML_ID_DOCTYPEREADVERSION]         = 'DocTypeReadVersion';
-			$EBMLidList[EBML_ID_DOCTYPEVERSION]             = 'DocTypeVersion';
-			$EBMLidList[EBML_ID_DURATION]                   = 'Duration';
-			$EBMLidList[EBML_ID_EBML]                       = 'EBML';
-			$EBMLidList[EBML_ID_EBMLMAXIDLENGTH]            = 'EBMLMaxIDLength';
-			$EBMLidList[EBML_ID_EBMLMAXSIZELENGTH]          = 'EBMLMaxSizeLength';
-			$EBMLidList[EBML_ID_EBMLREADVERSION]            = 'EBMLReadVersion';
-			$EBMLidList[EBML_ID_EBMLVERSION]                = 'EBMLVersion';
-			$EBMLidList[EBML_ID_EDITIONENTRY]               = 'EditionEntry';
-			$EBMLidList[EBML_ID_EDITIONFLAGDEFAULT]         = 'EditionFlagDefault';
-			$EBMLidList[EBML_ID_EDITIONFLAGHIDDEN]          = 'EditionFlagHidden';
-			$EBMLidList[EBML_ID_EDITIONFLAGORDERED]         = 'EditionFlagOrdered';
-			$EBMLidList[EBML_ID_EDITIONUID]                 = 'EditionUID';
-			$EBMLidList[EBML_ID_FILEDATA]                   = 'FileData';
-			$EBMLidList[EBML_ID_FILEDESCRIPTION]            = 'FileDescription';
-			$EBMLidList[EBML_ID_FILEMIMETYPE]               = 'FileMimeType';
-			$EBMLidList[EBML_ID_FILENAME]                   = 'FileName';
-			$EBMLidList[EBML_ID_FILEREFERRAL]               = 'FileReferral';
-			$EBMLidList[EBML_ID_FILEUID]                    = 'FileUID';
-			$EBMLidList[EBML_ID_FLAGDEFAULT]                = 'FlagDefault';
-			$EBMLidList[EBML_ID_FLAGENABLED]                = 'FlagEnabled';
-			$EBMLidList[EBML_ID_FLAGFORCED]                 = 'FlagForced';
-			$EBMLidList[EBML_ID_FLAGINTERLACED]             = 'FlagInterlaced';
-			$EBMLidList[EBML_ID_FLAGLACING]                 = 'FlagLacing';
-			$EBMLidList[EBML_ID_GAMMAVALUE]                 = 'GammaValue';
-			$EBMLidList[EBML_ID_INFO]                       = 'Info';
-			$EBMLidList[EBML_ID_LANGUAGE]                   = 'Language';
-			$EBMLidList[EBML_ID_MAXBLOCKADDITIONID]         = 'MaxBlockAdditionID';
-			$EBMLidList[EBML_ID_MAXCACHE]                   = 'MaxCache';
-			$EBMLidList[EBML_ID_MINCACHE]                   = 'MinCache';
-			$EBMLidList[EBML_ID_MUXINGAPP]                  = 'MuxingApp';
-			$EBMLidList[EBML_ID_NAME]                       = 'Name';
-			$EBMLidList[EBML_ID_NEXTFILENAME]               = 'NextFilename';
-			$EBMLidList[EBML_ID_NEXTUID]                    = 'NextUID';
-			$EBMLidList[EBML_ID_OUTPUTSAMPLINGFREQUENCY]    = 'OutputSamplingFrequency';
-			$EBMLidList[EBML_ID_PIXELCROPBOTTOM]            = 'PixelCropBottom';
-			$EBMLidList[EBML_ID_PIXELCROPLEFT]              = 'PixelCropLeft';
-			$EBMLidList[EBML_ID_PIXELCROPRIGHT]             = 'PixelCropRight';
-			$EBMLidList[EBML_ID_PIXELCROPTOP]               = 'PixelCropTop';
-			$EBMLidList[EBML_ID_PIXELHEIGHT]                = 'PixelHeight';
-			$EBMLidList[EBML_ID_PIXELWIDTH]                 = 'PixelWidth';
-			$EBMLidList[EBML_ID_PREVFILENAME]               = 'PrevFilename';
-			$EBMLidList[EBML_ID_PREVUID]                    = 'PrevUID';
-			$EBMLidList[EBML_ID_SAMPLINGFREQUENCY]          = 'SamplingFrequency';
-			$EBMLidList[EBML_ID_SEEK]                       = 'Seek';
-			$EBMLidList[EBML_ID_SEEKHEAD]                   = 'SeekHead';
-			$EBMLidList[EBML_ID_SEEKID]                     = 'SeekID';
-			$EBMLidList[EBML_ID_SEEKPOSITION]               = 'SeekPosition';
-			$EBMLidList[EBML_ID_SEGMENT]                    = 'Segment';
-			$EBMLidList[EBML_ID_SEGMENTFAMILY]              = 'SegmentFamily';
-			$EBMLidList[EBML_ID_SEGMENTFILENAME]            = 'SegmentFilename';
-			$EBMLidList[EBML_ID_SEGMENTUID]                 = 'SegmentUID';
-			$EBMLidList[EBML_ID_SIMPLETAG]                  = 'SimpleTag';
-			$EBMLidList[EBML_ID_CLUSTERSLICES]              = 'ClusterSlices';
-			$EBMLidList[EBML_ID_STEREOMODE]                 = 'StereoMode';
-			$EBMLidList[EBML_ID_TAG]                        = 'Tag';
-			$EBMLidList[EBML_ID_TAGATTACHMENTUID]           = 'TagAttachmentUID';
-			$EBMLidList[EBML_ID_TAGBINARY]                  = 'TagBinary';
-			$EBMLidList[EBML_ID_TAGCHAPTERUID]              = 'TagChapterUID';
-			$EBMLidList[EBML_ID_TAGDEFAULT]                 = 'TagDefault';
-			$EBMLidList[EBML_ID_TAGEDITIONUID]              = 'TagEditionUID';
-			$EBMLidList[EBML_ID_TAGLANGUAGE]                = 'TagLanguage';
-			$EBMLidList[EBML_ID_TAGNAME]                    = 'TagName';
-			$EBMLidList[EBML_ID_TAGTRACKUID]                = 'TagTrackUID';
-			$EBMLidList[EBML_ID_TAGS]                       = 'Tags';
-			$EBMLidList[EBML_ID_TAGSTRING]                  = 'TagString';
-			$EBMLidList[EBML_ID_TARGETS]                    = 'Targets';
-			$EBMLidList[EBML_ID_TARGETTYPE]                 = 'TargetType';
-			$EBMLidList[EBML_ID_TARGETTYPEVALUE]            = 'TargetTypeValue';
-			$EBMLidList[EBML_ID_TIMECODESCALE]              = 'TimecodeScale';
-			$EBMLidList[EBML_ID_TITLE]                      = 'Title';
-			$EBMLidList[EBML_ID_TRACKENTRY]                 = 'TrackEntry';
-			$EBMLidList[EBML_ID_TRACKNUMBER]                = 'TrackNumber';
-			$EBMLidList[EBML_ID_TRACKOFFSET]                = 'TrackOffset';
-			$EBMLidList[EBML_ID_TRACKOVERLAY]               = 'TrackOverlay';
-			$EBMLidList[EBML_ID_TRACKS]                     = 'Tracks';
-			$EBMLidList[EBML_ID_TRACKTIMECODESCALE]         = 'TrackTimecodeScale';
-			$EBMLidList[EBML_ID_TRACKTRANSLATE]             = 'TrackTranslate';
-			$EBMLidList[EBML_ID_TRACKTRANSLATECODEC]        = 'TrackTranslateCodec';
-			$EBMLidList[EBML_ID_TRACKTRANSLATEEDITIONUID]   = 'TrackTranslateEditionUID';
-			$EBMLidList[EBML_ID_TRACKTRANSLATETRACKID]      = 'TrackTranslateTrackID';
-			$EBMLidList[EBML_ID_TRACKTYPE]                  = 'TrackType';
-			$EBMLidList[EBML_ID_TRACKUID]                   = 'TrackUID';
-			$EBMLidList[EBML_ID_VIDEO]                      = 'Video';
-			$EBMLidList[EBML_ID_VOID]                       = 'Void';
-			$EBMLidList[EBML_ID_WRITINGAPP]                 = 'WritingApp';
-		}
-
-		return (isset($EBMLidList[$value]) ? $EBMLidList[$value] : dechex($value));
-	}
-	
-	private static function getDefaultStreamInfo($streams)
-	{
-		foreach (array_reverse($streams) as $stream) {
-			if ($stream['default']) {
-				break;
-			}
-		}
-		unset($stream['default']);
-		if (isset($stream['name'])) {
-			unset($stream['name']);
-		}
-		
-		$info = $stream;
-		$info['streams'] = $streams;
-		
-		return $info;
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio-video.mpeg.php b/lib/getid3/getid3/module.audio-video.mpeg.php
deleted file mode 100644
index 499b740c3..000000000
--- a/lib/getid3/getid3/module.audio-video.mpeg.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio-video.mpeg.php                                 //
-// module for analyzing MPEG files                             //
-// dependencies: module.audio.mp3.php                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.mp3.php', __FILE__, true);
-
-define('GETID3_MPEG_VIDEO_PICTURE_START',   "\x00\x00\x01\x00");
-define('GETID3_MPEG_VIDEO_USER_DATA_START', "\x00\x00\x01\xB2");
-define('GETID3_MPEG_VIDEO_SEQUENCE_HEADER', "\x00\x00\x01\xB3");
-define('GETID3_MPEG_VIDEO_SEQUENCE_ERROR',  "\x00\x00\x01\xB4");
-define('GETID3_MPEG_VIDEO_EXTENSION_START', "\x00\x00\x01\xB5");
-define('GETID3_MPEG_VIDEO_SEQUENCE_END',    "\x00\x00\x01\xB7");
-define('GETID3_MPEG_VIDEO_GROUP_START',     "\x00\x00\x01\xB8");
-define('GETID3_MPEG_AUDIO_START',           "\x00\x00\x01\xC0");
-
-
-class getid3_mpeg extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		if ($info['avdataend'] <= $info['avdataoffset']) {
-			$info['error'][] = '"avdataend" ('.$info['avdataend'].') is unexpectedly less-than-or-equal-to "avdataoffset" ('.$info['avdataoffset'].')';
-			return false;
-		}
-		$info['fileformat'] = 'mpeg';
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$MPEGstreamData       = fread($this->getid3->fp, min(100000, $info['avdataend'] - $info['avdataoffset']));
-		$MPEGstreamDataLength = strlen($MPEGstreamData);
-
-		$foundVideo = true;
-		$VideoChunkOffset = 0;
-		while (substr($MPEGstreamData, $VideoChunkOffset++, 4) !== GETID3_MPEG_VIDEO_SEQUENCE_HEADER) {
-			if ($VideoChunkOffset >= $MPEGstreamDataLength) {
-				$foundVideo = false;
-				break;
-			}
-		}
-		if ($foundVideo) {
-
-			// Start code                       32 bits
-			// horizontal frame size            12 bits
-			// vertical frame size              12 bits
-			// pixel aspect ratio                4 bits
-			// frame rate                        4 bits
-			// bitrate                          18 bits
-			// marker bit                        1 bit
-			// VBV buffer size                  10 bits
-			// constrained parameter flag        1 bit
-			// intra quant. matrix flag          1 bit
-			// intra quant. matrix values      512 bits (present if matrix flag == 1)
-			// non-intra quant. matrix flag      1 bit
-			// non-intra quant. matrix values  512 bits (present if matrix flag == 1)
-
-			$info['video']['dataformat'] = 'mpeg';
-
-			$VideoChunkOffset += (strlen(GETID3_MPEG_VIDEO_SEQUENCE_HEADER) - 1);
-
-			$FrameSizeDWORD = getid3_lib::BigEndian2Int(substr($MPEGstreamData, $VideoChunkOffset, 3));
-			$VideoChunkOffset += 3;
-
-			$AspectRatioFrameRateDWORD = getid3_lib::BigEndian2Int(substr($MPEGstreamData, $VideoChunkOffset, 1));
-			$VideoChunkOffset += 1;
-
-			$assortedinformation = getid3_lib::BigEndian2Bin(substr($MPEGstreamData, $VideoChunkOffset, 4));
-			$VideoChunkOffset += 4;
-
-			$info['mpeg']['video']['raw']['framesize_horizontal'] = ($FrameSizeDWORD & 0xFFF000) >> 12; // 12 bits for horizontal frame size
-			$info['mpeg']['video']['raw']['framesize_vertical']   = ($FrameSizeDWORD & 0x000FFF);       // 12 bits for vertical frame size
-			$info['mpeg']['video']['raw']['pixel_aspect_ratio']   = ($AspectRatioFrameRateDWORD & 0xF0) >> 4;
-			$info['mpeg']['video']['raw']['frame_rate']           = ($AspectRatioFrameRateDWORD & 0x0F);
-
-			$info['mpeg']['video']['framesize_horizontal'] = $info['mpeg']['video']['raw']['framesize_horizontal'];
-			$info['mpeg']['video']['framesize_vertical']   = $info['mpeg']['video']['raw']['framesize_vertical'];
-
-			$info['mpeg']['video']['pixel_aspect_ratio']      = $this->MPEGvideoAspectRatioLookup($info['mpeg']['video']['raw']['pixel_aspect_ratio']);
-			$info['mpeg']['video']['pixel_aspect_ratio_text'] = $this->MPEGvideoAspectRatioTextLookup($info['mpeg']['video']['raw']['pixel_aspect_ratio']);
-			$info['mpeg']['video']['frame_rate']              = $this->MPEGvideoFramerateLookup($info['mpeg']['video']['raw']['frame_rate']);
-
-			$info['mpeg']['video']['raw']['bitrate']                =        getid3_lib::Bin2Dec(substr($assortedinformation,  0, 18));
-			$info['mpeg']['video']['raw']['marker_bit']             = (bool) getid3_lib::Bin2Dec(substr($assortedinformation, 18,  1));
-			$info['mpeg']['video']['raw']['vbv_buffer_size']        =        getid3_lib::Bin2Dec(substr($assortedinformation, 19, 10));
-			$info['mpeg']['video']['raw']['constrained_param_flag'] = (bool) getid3_lib::Bin2Dec(substr($assortedinformation, 29,  1));
-			$info['mpeg']['video']['raw']['intra_quant_flag']       = (bool) getid3_lib::Bin2Dec(substr($assortedinformation, 30,  1));
-			if ($info['mpeg']['video']['raw']['intra_quant_flag']) {
-
-				// read 512 bits
-				$info['mpeg']['video']['raw']['intra_quant']          = getid3_lib::BigEndian2Bin(substr($MPEGstreamData, $VideoChunkOffset, 64));
-				$VideoChunkOffset += 64;
-
-				$info['mpeg']['video']['raw']['non_intra_quant_flag'] = (bool) getid3_lib::Bin2Dec(substr($info['mpeg']['video']['raw']['intra_quant'], 511,  1));
-				$info['mpeg']['video']['raw']['intra_quant']          =        getid3_lib::Bin2Dec(substr($assortedinformation, 31,  1)).substr(getid3_lib::BigEndian2Bin(substr($MPEGstreamData, $VideoChunkOffset, 64)), 0, 511);
-
-				if ($info['mpeg']['video']['raw']['non_intra_quant_flag']) {
-					$info['mpeg']['video']['raw']['non_intra_quant'] = substr($MPEGstreamData, $VideoChunkOffset, 64);
-					$VideoChunkOffset += 64;
-				}
-
-			} else {
-
-				$info['mpeg']['video']['raw']['non_intra_quant_flag'] = (bool) getid3_lib::Bin2Dec(substr($assortedinformation, 31,  1));
-				if ($info['mpeg']['video']['raw']['non_intra_quant_flag']) {
-					$info['mpeg']['video']['raw']['non_intra_quant'] = substr($MPEGstreamData, $VideoChunkOffset, 64);
-					$VideoChunkOffset += 64;
-				}
-
-			}
-
-			if ($info['mpeg']['video']['raw']['bitrate'] == 0x3FFFF) { // 18 set bits
-
-				$info['warning'][] = 'This version of getID3() ['.$this->getid3->version().'] cannot determine average bitrate of VBR MPEG video files';
-				$info['mpeg']['video']['bitrate_mode'] = 'vbr';
-
-			} else {
-
-				$info['mpeg']['video']['bitrate']      = $info['mpeg']['video']['raw']['bitrate'] * 400;
-				$info['mpeg']['video']['bitrate_mode'] = 'cbr';
-				$info['video']['bitrate']              = $info['mpeg']['video']['bitrate'];
-
-			}
-
-			$info['video']['resolution_x']       = $info['mpeg']['video']['framesize_horizontal'];
-			$info['video']['resolution_y']       = $info['mpeg']['video']['framesize_vertical'];
-			$info['video']['frame_rate']         = $info['mpeg']['video']['frame_rate'];
-			$info['video']['bitrate_mode']       = $info['mpeg']['video']['bitrate_mode'];
-			$info['video']['pixel_aspect_ratio'] = $info['mpeg']['video']['pixel_aspect_ratio'];
-			$info['video']['lossless']           = false;
-			$info['video']['bits_per_sample']    = 24;
-
-		} else {
-
-			$info['error'][] = 'Could not find start of video block in the first 100,000 bytes (or before end of file) - this might not be an MPEG-video file?';
-
-		}
-
-		//0x000001B3 begins the sequence_header of every MPEG video stream.
-		//But in MPEG-2, this header must immediately be followed by an
-		//extension_start_code (0x000001B5) with a sequence_extension ID (1).
-		//(This extension contains all the additional MPEG-2 stuff.)
-		//MPEG-1 doesn't have this extension, so that's a sure way to tell the
-		//difference between MPEG-1 and MPEG-2 video streams.
-
-		if (substr($MPEGstreamData, $VideoChunkOffset, 4) == GETID3_MPEG_VIDEO_EXTENSION_START) {
-			$info['video']['codec'] = 'MPEG-2';
-		} else {
-			$info['video']['codec'] = 'MPEG-1';
-		}
-
-
-		$AudioChunkOffset = 0;
-		while (true) {
-			while (substr($MPEGstreamData, $AudioChunkOffset++, 4) !== GETID3_MPEG_AUDIO_START) {
-				if ($AudioChunkOffset >= $MPEGstreamDataLength) {
-					break 2;
-				}
-			}
-
-			$getid3_temp = new getID3();
-			$getid3_temp->openfile($this->getid3->filename);
-			$getid3_temp->info = $info;
-			$getid3_mp3 = new getid3_mp3($getid3_temp);
-			for ($i = 0; $i <= 7; $i++) {
-				// some files have the MPEG-audio header 8 bytes after the end of the $00 $00 $01 $C0 signature, some have it up to 13 bytes (or more?) after
-				// I have no idea why or what the difference is, so this is a stupid hack.
-				// If anybody has any better idea of what's going on, please let me know - info@getid3.org
-				fseek($getid3_temp->fp, ftell($this->getid3->fp), SEEK_SET);
-				$getid3_temp->info = $info; // only overwrite real data if valid header found
-				if ($getid3_mp3->decodeMPEGaudioHeader(($AudioChunkOffset + 3) + 8 + $i, $getid3_temp->info, false)) {
-					$info = $getid3_temp->info;
-					$info['audio']['bitrate_mode']    = 'cbr';
-					$info['audio']['lossless']        = false;
-					unset($getid3_temp, $getid3_mp3);
-					break 2;
-				}
-			}
-			unset($getid3_temp, $getid3_mp3);
-		}
-
-		// Temporary hack to account for interleaving overhead:
-		if (!empty($info['video']['bitrate']) && !empty($info['audio']['bitrate'])) {
-			$info['playtime_seconds'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / ($info['video']['bitrate'] + $info['audio']['bitrate']);
-
-			// Interleaved MPEG audio/video files have a certain amount of overhead that varies
-			// by both video and audio bitrates, and not in any sensible, linear/logarithmic patter
-			// Use interpolated lookup tables to approximately guess how much is overhead, because
-			// playtime is calculated as filesize / total-bitrate
-			$info['playtime_seconds'] *= $this->MPEGsystemNonOverheadPercentage($info['video']['bitrate'], $info['audio']['bitrate']);
-
-			//switch ($info['video']['bitrate']) {
-			//	case('5000000'):
-			//		$multiplier = 0.93292642112380355828048824319889;
-			//		break;
-			//	case('5500000'):
-			//		$multiplier = 0.93582895375200989965359777343219;
-			//		break;
-			//	case('6000000'):
-			//		$multiplier = 0.93796247714820932532911373859139;
-			//		break;
-			//	case('7000000'):
-			//		$multiplier = 0.9413264083635103463010117778776;
-			//		break;
-			//	default:
-			//		$multiplier = 1;
-			//		break;
-			//}
-			//$info['playtime_seconds'] *= $multiplier;
-			//$info['warning'][] = 'Interleaved MPEG audio/video playtime may be inaccurate. With current hack should be within a few seconds of accurate. Report to info@getid3.org if off by more than 10 seconds.';
-			if ($info['video']['bitrate'] < 50000) {
-				$info['warning'][] = 'Interleaved MPEG audio/video playtime may be slightly inaccurate for video bitrates below 100kbps. Except in extreme low-bitrate situations, error should be less than 1%. Report to info@getid3.org if greater than this.';
-			}
-		}
-
-		return true;
-	}
-
-
-	function MPEGsystemNonOverheadPercentage($VideoBitrate, $AudioBitrate) {
-		$OverheadPercentage = 0;
-
-		$AudioBitrate = max(min($AudioBitrate / 1000,   384), 32); // limit to range of 32kbps - 384kbps (should be only legal bitrates, but maybe VBR?)
-		$VideoBitrate = max(min($VideoBitrate / 1000, 10000), 10); // limit to range of 10kbps -  10Mbps (beyond that curves flatten anyways, no big loss)
-
-
-		//OMBB[audiobitrate]              = array(video-10kbps,       video-100kbps,      video-1000kbps,     video-10000kbps)
-		$OverheadMultiplierByBitrate[32]  = array(0, 0.9676287944368530, 0.9802276264360310, 0.9844916183244460, 0.9852821845179940);
-		$OverheadMultiplierByBitrate[48]  = array(0, 0.9779100089209830, 0.9787770035359320, 0.9846738664076130, 0.9852683013799960);
-		$OverheadMultiplierByBitrate[56]  = array(0, 0.9731249855367600, 0.9776624308938040, 0.9832606361852130, 0.9843922606633340);
-		$OverheadMultiplierByBitrate[64]  = array(0, 0.9755642683275760, 0.9795256705493390, 0.9836573009193170, 0.9851122539404470);
-		$OverheadMultiplierByBitrate[96]  = array(0, 0.9788025247497290, 0.9798553314148700, 0.9822956869792560, 0.9834815119124690);
-		$OverheadMultiplierByBitrate[128] = array(0, 0.9816940050925480, 0.9821675936072120, 0.9829756927470870, 0.9839763420152050);
-		$OverheadMultiplierByBitrate[160] = array(0, 0.9825894094561180, 0.9820913399073960, 0.9823907143253970, 0.9832821783651570);
-		$OverheadMultiplierByBitrate[192] = array(0, 0.9832038474336260, 0.9825731694317960, 0.9821028622712400, 0.9828262076447620);
-		$OverheadMultiplierByBitrate[224] = array(0, 0.9836516298538770, 0.9824718601823890, 0.9818302180625380, 0.9823735101626480);
-		$OverheadMultiplierByBitrate[256] = array(0, 0.9845863022094920, 0.9837229411967540, 0.9824521662210830, 0.9828645172100790);
-		$OverheadMultiplierByBitrate[320] = array(0, 0.9849565280263180, 0.9837683142805110, 0.9822885275960400, 0.9824424382727190);
-		$OverheadMultiplierByBitrate[384] = array(0, 0.9856094774357600, 0.9844573394432720, 0.9825970399837330, 0.9824673808303890);
-
-		$BitrateToUseMin = 32;
-		$BitrateToUseMax = 32;
-		$previousBitrate = 32;
-		foreach ($OverheadMultiplierByBitrate as $key => $value) {
-			if ($AudioBitrate >= $previousBitrate) {
-				$BitrateToUseMin = $previousBitrate;
-			}
-			if ($AudioBitrate < $key) {
-				$BitrateToUseMax = $key;
-				break;
-			}
-			$previousBitrate = $key;
-		}
-		$FactorA = ($BitrateToUseMax - $AudioBitrate) / ($BitrateToUseMax - $BitrateToUseMin);
-
-		$VideoBitrateLog10 = log10($VideoBitrate);
-		$VideoFactorMin1 = $OverheadMultiplierByBitrate[$BitrateToUseMin][floor($VideoBitrateLog10)];
-		$VideoFactorMin2 = $OverheadMultiplierByBitrate[$BitrateToUseMax][floor($VideoBitrateLog10)];
-		$VideoFactorMax1 = $OverheadMultiplierByBitrate[$BitrateToUseMin][ceil($VideoBitrateLog10)];
-		$VideoFactorMax2 = $OverheadMultiplierByBitrate[$BitrateToUseMax][ceil($VideoBitrateLog10)];
-		$FactorV = $VideoBitrateLog10 - floor($VideoBitrateLog10);
-
-		$OverheadPercentage  = $VideoFactorMin1 *      $FactorA  *      $FactorV;
-		$OverheadPercentage += $VideoFactorMin2 * (1 - $FactorA) *      $FactorV;
-		$OverheadPercentage += $VideoFactorMax1 *      $FactorA  * (1 - $FactorV);
-		$OverheadPercentage += $VideoFactorMax2 * (1 - $FactorA) * (1 - $FactorV);
-
-		return $OverheadPercentage;
-	}
-
-
-	function MPEGvideoFramerateLookup($rawframerate) {
-		$MPEGvideoFramerateLookup = array(0, 23.976, 24, 25, 29.97, 30, 50, 59.94, 60);
-		return (isset($MPEGvideoFramerateLookup[$rawframerate]) ? (float) $MPEGvideoFramerateLookup[$rawframerate] : (float) 0);
-	}
-
-	function MPEGvideoAspectRatioLookup($rawaspectratio) {
-		$MPEGvideoAspectRatioLookup = array(0, 1, 0.6735, 0.7031, 0.7615, 0.8055, 0.8437, 0.8935, 0.9157, 0.9815, 1.0255, 1.0695, 1.0950, 1.1575, 1.2015, 0);
-		return (isset($MPEGvideoAspectRatioLookup[$rawaspectratio]) ? (float) $MPEGvideoAspectRatioLookup[$rawaspectratio] : (float) 0);
-	}
-
-	function MPEGvideoAspectRatioTextLookup($rawaspectratio) {
-		$MPEGvideoAspectRatioTextLookup = array('forbidden', 'square pixels', '0.6735', '16:9, 625 line, PAL', '0.7615', '0.8055', '16:9, 525 line, NTSC', '0.8935', '4:3, 625 line, PAL, CCIR601', '0.9815', '1.0255', '1.0695', '4:3, 525 line, NTSC, CCIR601', '1.1575', '1.2015', 'reserved');
-		return (isset($MPEGvideoAspectRatioTextLookup[$rawaspectratio]) ? $MPEGvideoAspectRatioTextLookup[$rawaspectratio] : '');
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio-video.nsv.php b/lib/getid3/getid3/module.audio-video.nsv.php
deleted file mode 100644
index 5a587e672..000000000
--- a/lib/getid3/getid3/module.audio-video.nsv.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.nsv.php                                        //
-// module for analyzing Nullsoft NSV files                     //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_nsv extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$NSVheader = fread($this->getid3->fp, 4);
-
-		switch ($NSVheader) {
-			case 'NSVs':
-				if ($this->getNSVsHeaderFilepointer(0)) {
-					$info['fileformat']          = 'nsv';
-					$info['audio']['dataformat'] = 'nsv';
-					$info['video']['dataformat'] = 'nsv';
-					$info['audio']['lossless']   = false;
-					$info['video']['lossless']   = false;
-				}
-				break;
-
-			case 'NSVf':
-				if ($this->getNSVfHeaderFilepointer(0)) {
-					$info['fileformat']          = 'nsv';
-					$info['audio']['dataformat'] = 'nsv';
-					$info['video']['dataformat'] = 'nsv';
-					$info['audio']['lossless']   = false;
-					$info['video']['lossless']   = false;
-					$this->getNSVsHeaderFilepointer($info['nsv']['NSVf']['header_length']);
-				}
-				break;
-
-			default:
-				$info['error'][] = 'Expecting "NSVs" or "NSVf" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($NSVheader).'"';
-				return false;
-				break;
-		}
-
-		if (!isset($info['nsv']['NSVf'])) {
-			$info['warning'][] = 'NSVf header not present - cannot calculate playtime or bitrate';
-		}
-
-		return true;
-	}
-
-	function getNSVsHeaderFilepointer($fileoffset) {
-		$info = &$this->getid3->info;
-		fseek($this->getid3->fp, $fileoffset, SEEK_SET);
-		$NSVsheader = fread($this->getid3->fp, 28);
-		$offset = 0;
-
-		$info['nsv']['NSVs']['identifier']      =                  substr($NSVsheader, $offset, 4);
-		$offset += 4;
-
-		if ($info['nsv']['NSVs']['identifier'] != 'NSVs') {
-			$info['error'][] = 'expected "NSVs" at offset ('.$fileoffset.'), found "'.$info['nsv']['NSVs']['identifier'].'" instead';
-			unset($info['nsv']['NSVs']);
-			return false;
-		}
-
-		$info['nsv']['NSVs']['offset']          = $fileoffset;
-
-		$info['nsv']['NSVs']['video_codec']     =                              substr($NSVsheader, $offset, 4);
-		$offset += 4;
-		$info['nsv']['NSVs']['audio_codec']     =                              substr($NSVsheader, $offset, 4);
-		$offset += 4;
-		$info['nsv']['NSVs']['resolution_x']    = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 2));
-		$offset += 2;
-		$info['nsv']['NSVs']['resolution_y']    = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 2));
-		$offset += 2;
-
-		$info['nsv']['NSVs']['framerate_index'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
-		$offset += 1;
-		//$info['nsv']['NSVs']['unknown1b']       = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
-		$offset += 1;
-		//$info['nsv']['NSVs']['unknown1c']       = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
-		$offset += 1;
-		//$info['nsv']['NSVs']['unknown1d']       = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
-		$offset += 1;
-		//$info['nsv']['NSVs']['unknown2a']       = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
-		$offset += 1;
-		//$info['nsv']['NSVs']['unknown2b']       = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
-		$offset += 1;
-		//$info['nsv']['NSVs']['unknown2c']       = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
-		$offset += 1;
-		//$info['nsv']['NSVs']['unknown2d']       = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
-		$offset += 1;
-
-		switch ($info['nsv']['NSVs']['audio_codec']) {
-			case 'PCM ':
-				$info['nsv']['NSVs']['bits_channel'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
-				$offset += 1;
-				$info['nsv']['NSVs']['channels']     = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
-				$offset += 1;
-				$info['nsv']['NSVs']['sample_rate']  = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 2));
-				$offset += 2;
-
-				$info['audio']['sample_rate']        = $info['nsv']['NSVs']['sample_rate'];
-				break;
-
-			case 'MP3 ':
-			case 'NONE':
-			default:
-				//$info['nsv']['NSVs']['unknown3']     = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 4));
-				$offset += 4;
-				break;
-		}
-
-		$info['video']['resolution_x']       = $info['nsv']['NSVs']['resolution_x'];
-		$info['video']['resolution_y']       = $info['nsv']['NSVs']['resolution_y'];
-		$info['nsv']['NSVs']['frame_rate']   = $this->NSVframerateLookup($info['nsv']['NSVs']['framerate_index']);
-		$info['video']['frame_rate']         = $info['nsv']['NSVs']['frame_rate'];
-		$info['video']['bits_per_sample']    = 24;
-		$info['video']['pixel_aspect_ratio'] = (float) 1;
-
-		return true;
-	}
-
-	function getNSVfHeaderFilepointer($fileoffset, $getTOCoffsets=false) {
-		$info = &$this->getid3->info;
-		fseek($this->getid3->fp, $fileoffset, SEEK_SET);
-		$NSVfheader = fread($this->getid3->fp, 28);
-		$offset = 0;
-
-		$info['nsv']['NSVf']['identifier']    =                  substr($NSVfheader, $offset, 4);
-		$offset += 4;
-
-		if ($info['nsv']['NSVf']['identifier'] != 'NSVf') {
-			$info['error'][] = 'expected "NSVf" at offset ('.$fileoffset.'), found "'.$info['nsv']['NSVf']['identifier'].'" instead';
-			unset($info['nsv']['NSVf']);
-			return false;
-		}
-
-		$info['nsv']['NSVs']['offset']        = $fileoffset;
-
-		$info['nsv']['NSVf']['header_length'] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
-		$offset += 4;
-		$info['nsv']['NSVf']['file_size']     = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
-		$offset += 4;
-
-		if ($info['nsv']['NSVf']['file_size'] > $info['avdataend']) {
-			$info['warning'][] = 'truncated file - NSVf header indicates '.$info['nsv']['NSVf']['file_size'].' bytes, file actually '.$info['avdataend'].' bytes';
-		}
-
-		$info['nsv']['NSVf']['playtime_ms']   = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
-		$offset += 4;
-		$info['nsv']['NSVf']['meta_size']     = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
-		$offset += 4;
-		$info['nsv']['NSVf']['TOC_entries_1'] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
-		$offset += 4;
-		$info['nsv']['NSVf']['TOC_entries_2'] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
-		$offset += 4;
-
-		if ($info['nsv']['NSVf']['playtime_ms'] == 0) {
-			$info['error'][] = 'Corrupt NSV file: NSVf.playtime_ms == zero';
-			return false;
-		}
-
-		$NSVfheader .= fread($this->getid3->fp, $info['nsv']['NSVf']['meta_size'] + (4 * $info['nsv']['NSVf']['TOC_entries_1']) + (4 * $info['nsv']['NSVf']['TOC_entries_2']));
-		$NSVfheaderlength = strlen($NSVfheader);
-		$info['nsv']['NSVf']['metadata']      =                  substr($NSVfheader, $offset, $info['nsv']['NSVf']['meta_size']);
-		$offset += $info['nsv']['NSVf']['meta_size'];
-
-		if ($getTOCoffsets) {
-			$TOCcounter = 0;
-			while ($TOCcounter < $info['nsv']['NSVf']['TOC_entries_1']) {
-				if ($TOCcounter < $info['nsv']['NSVf']['TOC_entries_1']) {
-					$info['nsv']['NSVf']['TOC_1'][$TOCcounter] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
-					$offset += 4;
-					$TOCcounter++;
-				}
-			}
-		}
-
-		if (trim($info['nsv']['NSVf']['metadata']) != '') {
-			$info['nsv']['NSVf']['metadata'] = str_replace('`', "\x01", $info['nsv']['NSVf']['metadata']);
-			$CommentPairArray = explode("\x01".' ', $info['nsv']['NSVf']['metadata']);
-			foreach ($CommentPairArray as $CommentPair) {
-				if (strstr($CommentPair, '='."\x01")) {
-					list($key, $value) = explode('='."\x01", $CommentPair, 2);
-					$info['nsv']['comments'][strtolower($key)][] = trim(str_replace("\x01", '', $value));
-				}
-			}
-		}
-
-		$info['playtime_seconds'] = $info['nsv']['NSVf']['playtime_ms'] / 1000;
-		$info['bitrate']          = ($info['nsv']['NSVf']['file_size'] * 8) / $info['playtime_seconds'];
-
-		return true;
-	}
-
-
-	static function NSVframerateLookup($framerateindex) {
-		if ($framerateindex <= 127) {
-			return (float) $framerateindex;
-		}
-		static $NSVframerateLookup = array();
-		if (empty($NSVframerateLookup)) {
-			$NSVframerateLookup[129] = (float) 29.970;
-			$NSVframerateLookup[131] = (float) 23.976;
-			$NSVframerateLookup[133] = (float) 14.985;
-			$NSVframerateLookup[197] = (float) 59.940;
-			$NSVframerateLookup[199] = (float) 47.952;
-		}
-		return (isset($NSVframerateLookup[$framerateindex]) ? $NSVframerateLookup[$framerateindex] : false);
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio-video.quicktime.php b/lib/getid3/getid3/module.audio-video.quicktime.php
deleted file mode 100644
index 3e96ea1a0..000000000
--- a/lib/getid3/getid3/module.audio-video.quicktime.php
+++ /dev/null
@@ -1,2134 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio-video.quicktime.php                            //
-// module for analyzing Quicktime and MP3-in-MP4 files         //
-// dependencies: module.audio.mp3.php                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.mp3.php', __FILE__, true);
-
-class getid3_quicktime extends getid3_handler
-{
-
-	var $ReturnAtomData        = true;
-	var $ParseAllPossibleAtoms = false;
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat'] = 'quicktime';
-		$info['quicktime']['hinting']    = false;
-		$info['quicktime']['controller'] = 'standard'; // may be overridden if 'ctyp' atom is present
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-
-		$offset      = 0;
-		$atomcounter = 0;
-
-		while ($offset < $info['avdataend']) {
-			if (!getid3_lib::intValueSupported($offset)) {
-				$info['error'][] = 'Unable to parse atom at offset '.$offset.' because beyond '.round(PHP_INT_MAX / 1073741824).'GB limit of PHP filesystem functions';
-				break;
-			}
-			fseek($this->getid3->fp, $offset, SEEK_SET);
-			$AtomHeader = fread($this->getid3->fp, 8);
-
-			$atomsize = getid3_lib::BigEndian2Int(substr($AtomHeader, 0, 4));
-			$atomname = substr($AtomHeader, 4, 4);
-
-			// 64-bit MOV patch by jlegate�ktnc*com
-			if ($atomsize == 1) {
-				$atomsize = getid3_lib::BigEndian2Int(fread($this->getid3->fp, 8));
-			}
-
-			$info['quicktime'][$atomname]['name']   = $atomname;
-			$info['quicktime'][$atomname]['size']   = $atomsize;
-			$info['quicktime'][$atomname]['offset'] = $offset;
-
-			if (($offset + $atomsize) > $info['avdataend']) {
-				$info['error'][] = 'Atom at offset '.$offset.' claims to go beyond end-of-file (length: '.$atomsize.' bytes)';
-				return false;
-			}
-
-			if ($atomsize == 0) {
-				// Furthermore, for historical reasons the list of atoms is optionally
-				// terminated by a 32-bit integer set to 0. If you are writing a program
-				// to read user data atoms, you should allow for the terminating 0.
-				break;
-			}
-			switch ($atomname) {
-				case 'mdat': // Media DATa atom
-					// 'mdat' contains the actual data for the audio/video
-					if (($atomsize > 8) && (!isset($info['avdataend_tmp']) || ($info['quicktime'][$atomname]['size'] > ($info['avdataend_tmp'] - $info['avdataoffset'])))) {
-
-						$info['avdataoffset'] = $info['quicktime'][$atomname]['offset'] + 8;
-						$OldAVDataEnd         = $info['avdataend'];
-						$info['avdataend']    = $info['quicktime'][$atomname]['offset'] + $info['quicktime'][$atomname]['size'];
-
-						$getid3_temp = new getID3();
-						$getid3_temp->openfile($this->getid3->filename);
-						$getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
-						$getid3_temp->info['avdataend']    = $info['avdataend'];
-						$getid3_mp3 = new getid3_mp3($getid3_temp);
-						if ($getid3_mp3->MPEGaudioHeaderValid($getid3_mp3->MPEGaudioHeaderDecode(fread($this->getid3->fp, 4)))) {
-							$getid3_mp3->getOnlyMPEGaudioInfo($getid3_temp->info['avdataoffset'], false);
-							if (!empty($getid3_temp->info['warning'])) {
-								foreach ($getid3_temp->info['warning'] as $value) {
-									$info['warning'][] = $value;
-								}
-							}
-							if (!empty($getid3_temp->info['mpeg'])) {
-								$info['mpeg'] = $getid3_temp->info['mpeg'];
-								if (isset($info['mpeg']['audio'])) {
-									$info['audio']['dataformat']   = 'mp3';
-									$info['audio']['codec']        = (!empty($info['mpeg']['audio']['encoder']) ? $info['mpeg']['audio']['encoder'] : (!empty($info['mpeg']['audio']['codec']) ? $info['mpeg']['audio']['codec'] : (!empty($info['mpeg']['audio']['LAME']) ? 'LAME' :'mp3')));
-									$info['audio']['sample_rate']  = $info['mpeg']['audio']['sample_rate'];
-									$info['audio']['channels']     = $info['mpeg']['audio']['channels'];
-									$info['audio']['bitrate']      = $info['mpeg']['audio']['bitrate'];
-									$info['audio']['bitrate_mode'] = strtolower($info['mpeg']['audio']['bitrate_mode']);
-									$info['bitrate']               = $info['audio']['bitrate'];
-								}
-							}
-						}
-						unset($getid3_mp3, $getid3_temp);
-						$info['avdataend'] = $OldAVDataEnd;
-						unset($OldAVDataEnd);
-
-					}
-					break;
-
-				case 'free': // FREE space atom
-				case 'skip': // SKIP atom
-				case 'wide': // 64-bit expansion placeholder atom
-					// 'free', 'skip' and 'wide' are just padding, contains no useful data at all
-					break;
-
-				default:
-					$atomHierarchy = array();
-					$info['quicktime'][$atomname] = $this->QuicktimeParseAtom($atomname, $atomsize, fread($this->getid3->fp, $atomsize), $offset, $atomHierarchy, $this->ParseAllPossibleAtoms);
-					break;
-			}
-
-			$offset += $atomsize;
-			$atomcounter++;
-		}
-
-		if (!empty($info['avdataend_tmp'])) {
-			// this value is assigned to a temp value and then erased because
-			// otherwise any atoms beyond the 'mdat' atom would not get parsed
-			$info['avdataend'] = $info['avdataend_tmp'];
-			unset($info['avdataend_tmp']);
-		}
-
-		if (!isset($info['bitrate']) && isset($info['playtime_seconds'])) {
-			$info['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-		}
-		if (isset($info['bitrate']) && !isset($info['audio']['bitrate']) && !isset($info['quicktime']['video'])) {
-			$info['audio']['bitrate'] = $info['bitrate'];
-		}
-		if (!empty($info['playtime_seconds']) && !isset($info['video']['frame_rate']) && !empty($info['quicktime']['stts_framecount'])) {
-			foreach ($info['quicktime']['stts_framecount'] as $key => $samples_count) {
-				$samples_per_second = $samples_count / $info['playtime_seconds'];
-				if ($samples_per_second > 240) {
-					// has to be audio samples
-				} else {
-					$info['video']['frame_rate'] = $samples_per_second;
-					break;
-				}
-			}
-		}
-		if (($info['audio']['dataformat'] == 'mp4') && empty($info['video']['resolution_x'])) {
-			$info['fileformat'] = 'mp4';
-			$info['mime_type']  = 'audio/mp4';
-			unset($info['video']['dataformat']);
-		}
-
-		if (!$this->ReturnAtomData) {
-			unset($info['quicktime']['moov']);
-		}
-
-		if (empty($info['audio']['dataformat']) && !empty($info['quicktime']['audio'])) {
-			$info['audio']['dataformat'] = 'quicktime';
-		}
-		if (empty($info['video']['dataformat']) && !empty($info['quicktime']['video'])) {
-			$info['video']['dataformat'] = 'quicktime';
-		}
-
-		return true;
-	}
-
-	function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset, &$atomHierarchy, $ParseAllPossibleAtoms) {
-		// http://developer.apple.com/techpubs/quicktime/qtdevdocs/APIREF/INDEX/atomalphaindex.htm
-
-		$info = &$this->getid3->info;
-
-		$atom_parent = array_pop($atomHierarchy);
-		array_push($atomHierarchy, $atomname);
-		$atom_structure['hierarchy'] = implode(' ', $atomHierarchy);
-		$atom_structure['name']      = $atomname;
-		$atom_structure['size']      = $atomsize;
-		$atom_structure['offset']    = $baseoffset;
-//echo getid3_lib::PrintHexBytes(substr($atom_data, 0, 8)).'<br>';
-//echo getid3_lib::PrintHexBytes(substr($atom_data, 0, 8), false).'<br><br>';
-		switch ($atomname) {
-			case 'moov': // MOVie container atom
-			case 'trak': // TRAcK container atom
-			case 'clip': // CLIPping container atom
-			case 'matt': // track MATTe container atom
-			case 'edts': // EDiTS container atom
-			case 'tref': // Track REFerence container atom
-			case 'mdia': // MeDIA container atom
-			case 'minf': // Media INFormation container atom
-			case 'dinf': // Data INFormation container atom
-			case 'udta': // User DaTA container atom
-			case 'cmov': // Compressed MOVie container atom
-			case 'rmra': // Reference Movie Record Atom
-			case 'rmda': // Reference Movie Descriptor Atom
-			case 'gmhd': // Generic Media info HeaDer atom (seen on QTVR)
-				$atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
-				break;
-
-			case 'ilst': // Item LiST container atom
-				$atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
-
-				// some "ilst" atoms contain data atoms that have a numeric name, and the data is far more accessible if the returned array is compacted
-				$allnumericnames = true;
-				foreach ($atom_structure['subatoms'] as $subatomarray) {
-					if (!is_integer($subatomarray['name']) || (count($subatomarray['subatoms']) != 1)) {
-						$allnumericnames = false;
-						break;
-					}
-				}
-				if ($allnumericnames) {
-					$newData = array();
-					foreach ($atom_structure['subatoms'] as $subatomarray) {
-						foreach ($subatomarray['subatoms'] as $newData_subatomarray) {
-							unset($newData_subatomarray['hierarchy'], $newData_subatomarray['name']);
-							$newData[$subatomarray['name']] = $newData_subatomarray;
-							break;
-						}
-					}
-					$atom_structure['data'] = $newData;
-					unset($atom_structure['subatoms']);
-				}
-				break;
-
-			case "\x00\x00\x00\x01":
-			case "\x00\x00\x00\x02":
-			case "\x00\x00\x00\x03":
-			case "\x00\x00\x00\x04":
-			case "\x00\x00\x00\x05":
-				$atomname = getid3_lib::BigEndian2Int($atomname);
-				$atom_structure['name'] = $atomname;
-				$atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
-				break;
-
-			case 'stbl': // Sample TaBLe container atom
-				$atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
-				$isVideo = false;
-				$framerate  = 0;
-				$framecount = 0;
-				foreach ($atom_structure['subatoms'] as $key => $value_array) {
-					if (isset($value_array['sample_description_table'])) {
-						foreach ($value_array['sample_description_table'] as $key2 => $value_array2) {
-							if (isset($value_array2['data_format'])) {
-								switch ($value_array2['data_format']) {
-									case 'avc1':
-									case 'mp4v':
-										// video data
-										$isVideo = true;
-										break;
-									case 'mp4a':
-										// audio data
-										break;
-								}
-							}
-						}
-					} elseif (isset($value_array['time_to_sample_table'])) {
-						foreach ($value_array['time_to_sample_table'] as $key2 => $value_array2) {
-							if (isset($value_array2['sample_count']) && isset($value_array2['sample_duration']) && ($value_array2['sample_duration'] > 0)) {
-								$framerate  = round($info['quicktime']['time_scale'] / $value_array2['sample_duration'], 3);
-								$framecount = $value_array2['sample_count'];
-							}
-						}
-					}
-				}
-				if ($isVideo && $framerate) {
-					$info['quicktime']['video']['frame_rate'] = $framerate;
-					$info['video']['frame_rate'] = $info['quicktime']['video']['frame_rate'];
-				}
-				if ($isVideo && $framecount) {
-					$info['quicktime']['video']['frame_count'] = $framecount;
-				}
-				break;
-
-
-			case 'aART': // Album ARTist
-			case 'catg': // CaTeGory
-			case 'covr': // COVeR artwork
-			case 'cpil': // ComPILation
-			case 'cprt': // CoPyRighT
-			case 'desc': // DESCription
-			case 'disk': // DISK number
-			case 'egid': // Episode Global ID
-			case 'gnre': // GeNRE
-			case 'keyw': // KEYWord
-			case 'ldes':
-			case 'pcst': // PodCaST
-			case 'pgap': // GAPless Playback
-			case 'purd': // PURchase Date
-			case 'purl': // Podcast URL
-			case 'rati':
-			case 'rndu':
-			case 'rpdu':
-			case 'rtng': // RaTiNG
-			case 'stik':
-			case 'tmpo': // TeMPO (BPM)
-			case 'trkn': // TRacK Number
-			case 'tves': // TV EpiSode
-			case 'tvnn': // TV Network Name
-			case 'tvsh': // TV SHow Name
-			case 'tvsn': // TV SeasoN
-			case 'akID': // iTunes store account type
-			case 'apID':
-			case 'atID':
-			case 'cmID':
-			case 'cnID':
-			case 'geID':
-			case 'plID':
-			case 'sfID': // iTunes store country
-			case '�alb': // ALBum
-			case '�art': // ARTist
-			case '�ART':
-			case '�aut':
-			case '�cmt': // CoMmenT
-			case '�com': // COMposer
-			case '�cpy':
-			case '�day': // content created year
-			case '�dir':
-			case '�ed1':
-			case '�ed2':
-			case '�ed3':
-			case '�ed4':
-			case '�ed5':
-			case '�ed6':
-			case '�ed7':
-			case '�ed8':
-			case '�ed9':
-			case '�enc':
-			case '�fmt':
-			case '�gen': // GENre
-			case '�grp': // GRouPing
-			case '�hst':
-			case '�inf':
-			case '�lyr': // LYRics
-			case '�mak':
-			case '�mod':
-			case '�nam': // full NAMe
-			case '�ope':
-			case '�PRD':
-			case '�prd':
-			case '�prf':
-			case '�req':
-			case '�src':
-			case '�swr':
-			case '�too': // encoder
-			case '�trk': // TRacK
-			case '�url':
-			case '�wrn':
-			case '�wrt': // WRiTer
-			case '----': // itunes specific
-				if ($atom_parent == 'udta') {
-					// User data atom handler
-					$atom_structure['data_length'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 2));
-					$atom_structure['language_id'] = getid3_lib::BigEndian2Int(substr($atom_data, 2, 2));
-					$atom_structure['data']        =                           substr($atom_data, 4);
-
-					$atom_structure['language']    = $this->QuicktimeLanguageLookup($atom_structure['language_id']);
-					if (empty($info['comments']['language']) || (!in_array($atom_structure['language'], $info['comments']['language']))) {
-						$info['comments']['language'][] = $atom_structure['language'];
-					}
-				} else {
-					// Apple item list box atom handler
-					$atomoffset = 0;
-					if (substr($atom_data, 2, 2) == "\x10\xB5") {
-						// not sure what it means, but observed on iPhone4 data.
-						// Each $atom_data has 2 bytes of datasize, plus 0x10B5, then data
-						while ($atomoffset < strlen($atom_data)) {
-							$boxsmallsize = getid3_lib::BigEndian2Int(substr($atom_data, $atomoffset,     2));
-							$boxsmalltype =                           substr($atom_data, $atomoffset + 2, 2);
-							$boxsmalldata =                           substr($atom_data, $atomoffset + 4, $boxsmallsize);
-							switch ($boxsmalltype) {
-								case "\x10\xB5":
-									$atom_structure['data'] = $boxsmalldata;
-									break;
-								default:
-									$info['warning'][] = 'Unknown QuickTime smallbox type: "'.getid3_lib::PrintHexBytes($boxsmalltype).'" at offset '.$baseoffset;
-									$atom_structure['data'] = $atom_data;
-									break;
-							}
-							$atomoffset += (4 + $boxsmallsize);
-						}
-					} else {
-						while ($atomoffset < strlen($atom_data)) {
-							$boxsize = getid3_lib::BigEndian2Int(substr($atom_data, $atomoffset, 4));
-							$boxtype =                           substr($atom_data, $atomoffset + 4, 4);
-							$boxdata =                           substr($atom_data, $atomoffset + 8, $boxsize - 8);
-
-							switch ($boxtype) {
-								case 'mean':
-								case 'name':
-									$atom_structure[$boxtype] = substr($boxdata, 4);
-									break;
-
-								case 'data':
-									$atom_structure['version']   = getid3_lib::BigEndian2Int(substr($boxdata,  0, 1));
-									$atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($boxdata,  1, 3));
-									switch ($atom_structure['flags_raw']) {
-										case 0:  // data flag
-										case 21: // tmpo/cpil flag
-											switch ($atomname) {
-												case 'cpil':
-												case 'pcst':
-												case 'pgap':
-													$atom_structure['data'] = getid3_lib::BigEndian2Int(substr($boxdata, 8, 1));
-													break;
-
-												case 'tmpo':
-													$atom_structure['data'] = getid3_lib::BigEndian2Int(substr($boxdata, 8, 2));
-													break;
-
-												case 'disk':
-												case 'trkn':
-													$num       = getid3_lib::BigEndian2Int(substr($boxdata, 10, 2));
-													$num_total = getid3_lib::BigEndian2Int(substr($boxdata, 12, 2));
-													$atom_structure['data']  = empty($num) ? '' : $num;
-													$atom_structure['data'] .= empty($num_total) ? '' : '/'.$num_total;
-													break;
-
-												case 'gnre':
-													$GenreID = getid3_lib::BigEndian2Int(substr($boxdata, 8, 4));
-													$atom_structure['data']    = getid3_id3v1::LookupGenreName($GenreID - 1);
-													break;
-
-												case 'rtng':
-													$atom_structure[$atomname] = getid3_lib::BigEndian2Int(substr($boxdata, 8, 1));
-													$atom_structure['data']    = $this->QuicktimeContentRatingLookup($atom_structure[$atomname]);
-													break;
-
-												case 'stik':
-													$atom_structure[$atomname] = getid3_lib::BigEndian2Int(substr($boxdata, 8, 1));
-													$atom_structure['data']    = $this->QuicktimeSTIKLookup($atom_structure[$atomname]);
-													break;
-
-												case 'sfID':
-													$atom_structure[$atomname] = getid3_lib::BigEndian2Int(substr($boxdata, 8, 4));
-													$atom_structure['data']    = $this->QuicktimeStoreFrontCodeLookup($atom_structure[$atomname]);
-													break;
-
-												case 'egid':
-												case 'purl':
-													$atom_structure['data'] = substr($boxdata, 8);
-													break;
-
-												default:
-													$atom_structure['data'] = getid3_lib::BigEndian2Int(substr($boxdata, 8, 4));
-											}
-											break;
-
-										case 1:  // text flag
-										case 13: // image flag
-										default:
-											$atom_structure['data'] = substr($boxdata, 8);
-											break;
-
-									}
-									break;
-
-								default:
-									$info['warning'][] = 'Unknown QuickTime box type: "'.getid3_lib::PrintHexBytes($boxtype).'" at offset '.$baseoffset;
-									$atom_structure['data'] = $atom_data;
-
-							}
-							$atomoffset += $boxsize;
-						}
-					}
-				}
-				$this->CopyToAppropriateCommentsSection($atomname, $atom_structure['data'], $atom_structure['name']);
-				break;
-
-
-			case 'play': // auto-PLAY atom
-				$atom_structure['autoplay'] = (bool) getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-
-				$info['quicktime']['autoplay'] = $atom_structure['autoplay'];
-				break;
-
-
-			case 'WLOC': // Window LOCation atom
-				$atom_structure['location_x']  = getid3_lib::BigEndian2Int(substr($atom_data,  0, 2));
-				$atom_structure['location_y']  = getid3_lib::BigEndian2Int(substr($atom_data,  2, 2));
-				break;
-
-
-			case 'LOOP': // LOOPing atom
-			case 'SelO': // play SELection Only atom
-			case 'AllF': // play ALL Frames atom
-				$atom_structure['data'] = getid3_lib::BigEndian2Int($atom_data);
-				break;
-
-
-			case 'name': //
-			case 'MCPS': // Media Cleaner PRo
-			case '@PRM': // adobe PReMiere version
-			case '@PRQ': // adobe PRemiere Quicktime version
-				$atom_structure['data'] = $atom_data;
-				break;
-
-
-			case 'cmvd': // Compressed MooV Data atom
-				// Code by ubergeek�ubergeek*tv based on information from
-				// http://developer.apple.com/quicktime/icefloe/dispatch012.html
-				$atom_structure['unCompressedSize'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 4));
-
-				$CompressedFileData = substr($atom_data, 4);
-				if ($UncompressedHeader = @gzuncompress($CompressedFileData)) {
-					$atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($UncompressedHeader, 0, $atomHierarchy, $ParseAllPossibleAtoms);
-				} else {
-					$info['warning'][] = 'Error decompressing compressed MOV atom at offset '.$atom_structure['offset'];
-				}
-				break;
-
-
-			case 'dcom': // Data COMpression atom
-				$atom_structure['compression_id']   = $atom_data;
-				$atom_structure['compression_text'] = $this->QuicktimeDCOMLookup($atom_data);
-				break;
-
-
-			case 'rdrf': // Reference movie Data ReFerence atom
-				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3));
-				$atom_structure['flags']['internal_data'] = (bool) ($atom_structure['flags_raw'] & 0x000001);
-
-				$atom_structure['reference_type_name']    =                           substr($atom_data,  4, 4);
-				$atom_structure['reference_length']       = getid3_lib::BigEndian2Int(substr($atom_data,  8, 4));
-				switch ($atom_structure['reference_type_name']) {
-					case 'url ':
-						$atom_structure['url']            =       $this->NoNullString(substr($atom_data, 12));
-						break;
-
-					case 'alis':
-						$atom_structure['file_alias']     =                           substr($atom_data, 12);
-						break;
-
-					case 'rsrc':
-						$atom_structure['resource_alias'] =                           substr($atom_data, 12);
-						break;
-
-					default:
-						$atom_structure['data']           =                           substr($atom_data, 12);
-						break;
-				}
-				break;
-
-
-			case 'rmqu': // Reference Movie QUality atom
-				$atom_structure['movie_quality'] = getid3_lib::BigEndian2Int($atom_data);
-				break;
-
-
-			case 'rmcs': // Reference Movie Cpu Speed atom
-				$atom_structure['version']          = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']        = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['cpu_speed_rating'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2));
-				break;
-
-
-			case 'rmvc': // Reference Movie Version Check atom
-				$atom_structure['version']            = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']          = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['gestalt_selector']   =                           substr($atom_data,  4, 4);
-				$atom_structure['gestalt_value_mask'] = getid3_lib::BigEndian2Int(substr($atom_data,  8, 4));
-				$atom_structure['gestalt_value']      = getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
-				$atom_structure['gestalt_check_type'] = getid3_lib::BigEndian2Int(substr($atom_data, 14, 2));
-				break;
-
-
-			case 'rmcd': // Reference Movie Component check atom
-				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['component_type']         =                           substr($atom_data,  4, 4);
-				$atom_structure['component_subtype']      =                           substr($atom_data,  8, 4);
-				$atom_structure['component_manufacturer'] =                           substr($atom_data, 12, 4);
-				$atom_structure['component_flags_raw']    = getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
-				$atom_structure['component_flags_mask']   = getid3_lib::BigEndian2Int(substr($atom_data, 20, 4));
-				$atom_structure['component_min_version']  = getid3_lib::BigEndian2Int(substr($atom_data, 24, 4));
-				break;
-
-
-			case 'rmdr': // Reference Movie Data Rate atom
-				$atom_structure['version']       = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']     = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['data_rate']     = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-
-				$atom_structure['data_rate_bps'] = $atom_structure['data_rate'] * 10;
-				break;
-
-
-			case 'rmla': // Reference Movie Language Atom
-				$atom_structure['version']     = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']   = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['language_id'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2));
-
-				$atom_structure['language']    = $this->QuicktimeLanguageLookup($atom_structure['language_id']);
-				if (empty($info['comments']['language']) || (!in_array($atom_structure['language'], $info['comments']['language']))) {
-					$info['comments']['language'][] = $atom_structure['language'];
-				}
-				break;
-
-
-			case 'rmla': // Reference Movie Language Atom
-				$atom_structure['version']   = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['track_id']  = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2));
-				break;
-
-
-			case 'ptv ': // Print To Video - defines a movie's full screen mode
-				// http://developer.apple.com/documentation/QuickTime/APIREF/SOURCESIV/at_ptv-_pg.htm
-				$atom_structure['display_size_raw']  = getid3_lib::BigEndian2Int(substr($atom_data, 0, 2));
-				$atom_structure['reserved_1']        = getid3_lib::BigEndian2Int(substr($atom_data, 2, 2)); // hardcoded: 0x0000
-				$atom_structure['reserved_2']        = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2)); // hardcoded: 0x0000
-				$atom_structure['slide_show_flag']   = getid3_lib::BigEndian2Int(substr($atom_data, 6, 1));
-				$atom_structure['play_on_open_flag'] = getid3_lib::BigEndian2Int(substr($atom_data, 7, 1));
-
-				$atom_structure['flags']['play_on_open'] = (bool) $atom_structure['play_on_open_flag'];
-				$atom_structure['flags']['slide_show']   = (bool) $atom_structure['slide_show_flag'];
-
-				$ptv_lookup[0] = 'normal';
-				$ptv_lookup[1] = 'double';
-				$ptv_lookup[2] = 'half';
-				$ptv_lookup[3] = 'full';
-				$ptv_lookup[4] = 'current';
-				if (isset($ptv_lookup[$atom_structure['display_size_raw']])) {
-					$atom_structure['display_size'] = $ptv_lookup[$atom_structure['display_size_raw']];
-				} else {
-					$info['warning'][] = 'unknown "ptv " display constant ('.$atom_structure['display_size_raw'].')';
-				}
-				break;
-
-
-			case 'stsd': // Sample Table Sample Description atom
-				$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-				$stsdEntriesDataOffset = 8;
-				for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
-					$atom_structure['sample_description_table'][$i]['size']             = getid3_lib::BigEndian2Int(substr($atom_data, $stsdEntriesDataOffset, 4));
-					$stsdEntriesDataOffset += 4;
-					$atom_structure['sample_description_table'][$i]['data_format']      =                           substr($atom_data, $stsdEntriesDataOffset, 4);
-					$stsdEntriesDataOffset += 4;
-					$atom_structure['sample_description_table'][$i]['reserved']         = getid3_lib::BigEndian2Int(substr($atom_data, $stsdEntriesDataOffset, 6));
-					$stsdEntriesDataOffset += 6;
-					$atom_structure['sample_description_table'][$i]['reference_index']  = getid3_lib::BigEndian2Int(substr($atom_data, $stsdEntriesDataOffset, 2));
-					$stsdEntriesDataOffset += 2;
-					$atom_structure['sample_description_table'][$i]['data']             =                           substr($atom_data, $stsdEntriesDataOffset, ($atom_structure['sample_description_table'][$i]['size'] - 4 - 4 - 6 - 2));
-					$stsdEntriesDataOffset += ($atom_structure['sample_description_table'][$i]['size'] - 4 - 4 - 6 - 2);
-
-					$atom_structure['sample_description_table'][$i]['encoder_version']  = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'],  0, 2));
-					$atom_structure['sample_description_table'][$i]['encoder_revision'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'],  2, 2));
-					$atom_structure['sample_description_table'][$i]['encoder_vendor']   =                           substr($atom_structure['sample_description_table'][$i]['data'],  4, 4);
-
-					switch ($atom_structure['sample_description_table'][$i]['encoder_vendor']) {
-
-						case "\x00\x00\x00\x00":
-							// audio atom
-							$atom_structure['sample_description_table'][$i]['audio_channels']       =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'],  8,  2));
-							$atom_structure['sample_description_table'][$i]['audio_bit_depth']      =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 10,  2));
-							$atom_structure['sample_description_table'][$i]['audio_compression_id'] =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 12,  2));
-							$atom_structure['sample_description_table'][$i]['audio_packet_size']    =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 14,  2));
-							$atom_structure['sample_description_table'][$i]['audio_sample_rate']    = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 16,  4));
-
-							switch ($atom_structure['sample_description_table'][$i]['data_format']) {
-								case 'avc1':
-								case 'mp4v':
-									$info['fileformat'] = 'mp4';
-									$info['video']['fourcc'] = $atom_structure['sample_description_table'][$i]['data_format'];
-									//$info['warning'][] = 'This version of getID3() ['.$this->getid3->version().'] does not fully support MPEG-4 audio/video streams'; // 2011-02-18: why am I warning about this again? What's not supported?
-									break;
-
-								case 'qtvr':
-									$info['video']['dataformat'] = 'quicktimevr';
-									break;
-
-								case 'mp4a':
-								default:
-									$info['quicktime']['audio']['codec']       = $this->QuicktimeAudioCodecLookup($atom_structure['sample_description_table'][$i]['data_format']);
-									$info['quicktime']['audio']['sample_rate'] = $atom_structure['sample_description_table'][$i]['audio_sample_rate'];
-									$info['quicktime']['audio']['channels']    = $atom_structure['sample_description_table'][$i]['audio_channels'];
-									$info['quicktime']['audio']['bit_depth']   = $atom_structure['sample_description_table'][$i]['audio_bit_depth'];
-									$info['audio']['codec']                    = $info['quicktime']['audio']['codec'];
-									$info['audio']['sample_rate']              = $info['quicktime']['audio']['sample_rate'];
-									$info['audio']['channels']                 = $info['quicktime']['audio']['channels'];
-									$info['audio']['bits_per_sample']          = $info['quicktime']['audio']['bit_depth'];
-									switch ($atom_structure['sample_description_table'][$i]['data_format']) {
-										case 'raw ': // PCM
-										case 'alac': // Apple Lossless Audio Codec
-											$info['audio']['lossless'] = true;
-											break;
-										default:
-											$info['audio']['lossless'] = false;
-											break;
-									}
-									break;
-							}
-							break;
-
-						default:
-							switch ($atom_structure['sample_description_table'][$i]['data_format']) {
-								case 'mp4s':
-									$info['fileformat'] = 'mp4';
-									break;
-
-								default:
-									// video atom
-									$atom_structure['sample_description_table'][$i]['video_temporal_quality']  =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'],  8,  4));
-									$atom_structure['sample_description_table'][$i]['video_spatial_quality']   =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 12,  4));
-									$atom_structure['sample_description_table'][$i]['video_frame_width']       =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 16,  2));
-									$atom_structure['sample_description_table'][$i]['video_frame_height']      =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 18,  2));
-									$atom_structure['sample_description_table'][$i]['video_resolution_x']      = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 20,  4));
-									$atom_structure['sample_description_table'][$i]['video_resolution_y']      = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 24,  4));
-									$atom_structure['sample_description_table'][$i]['video_data_size']         =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 28,  4));
-									$atom_structure['sample_description_table'][$i]['video_frame_count']       =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 32,  2));
-									$atom_structure['sample_description_table'][$i]['video_encoder_name_len']  =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 34,  1));
-									$atom_structure['sample_description_table'][$i]['video_encoder_name']      =                             substr($atom_structure['sample_description_table'][$i]['data'], 35, $atom_structure['sample_description_table'][$i]['video_encoder_name_len']);
-									$atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 66,  2));
-									$atom_structure['sample_description_table'][$i]['video_color_table_id']    =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 68,  2));
-
-									$atom_structure['sample_description_table'][$i]['video_pixel_color_type']  = (($atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] > 32) ? 'grayscale' : 'color');
-									$atom_structure['sample_description_table'][$i]['video_pixel_color_name']  = $this->QuicktimeColorNameLookup($atom_structure['sample_description_table'][$i]['video_pixel_color_depth']);
-
-									if ($atom_structure['sample_description_table'][$i]['video_pixel_color_name'] != 'invalid') {
-										$info['quicktime']['video']['codec_fourcc']        = $atom_structure['sample_description_table'][$i]['data_format'];
-										$info['quicktime']['video']['codec_fourcc_lookup'] = $this->QuicktimeVideoCodecLookup($atom_structure['sample_description_table'][$i]['data_format']);
-										$info['quicktime']['video']['codec']               = (($atom_structure['sample_description_table'][$i]['video_encoder_name_len'] > 0) ? $atom_structure['sample_description_table'][$i]['video_encoder_name'] : $atom_structure['sample_description_table'][$i]['data_format']);
-										$info['quicktime']['video']['color_depth']         = $atom_structure['sample_description_table'][$i]['video_pixel_color_depth'];
-										$info['quicktime']['video']['color_depth_name']    = $atom_structure['sample_description_table'][$i]['video_pixel_color_name'];
-
-										$info['video']['codec']           = $info['quicktime']['video']['codec'];
-										$info['video']['bits_per_sample'] = $info['quicktime']['video']['color_depth'];
-									}
-									$info['video']['lossless']           = false;
-									$info['video']['pixel_aspect_ratio'] = (float) 1;
-									break;
-							}
-							break;
-					}
-					switch (strtolower($atom_structure['sample_description_table'][$i]['data_format'])) {
-						case 'mp4a':
-							$info['audio']['dataformat']         = 'mp4';
-							$info['quicktime']['audio']['codec'] = 'mp4';
-							break;
-
-						case '3ivx':
-						case '3iv1':
-						case '3iv2':
-							$info['video']['dataformat'] = '3ivx';
-							break;
-
-						case 'xvid':
-							$info['video']['dataformat'] = 'xvid';
-							break;
-
-						case 'mp4v':
-							$info['video']['dataformat'] = 'mpeg4';
-							break;
-
-						case 'divx':
-						case 'div1':
-						case 'div2':
-						case 'div3':
-						case 'div4':
-						case 'div5':
-						case 'div6':
-							$info['video']['dataformat'] = 'divx';
-							break;
-
-						default:
-							// do nothing
-							break;
-					}
-					unset($atom_structure['sample_description_table'][$i]['data']);
-				}
-				break;
-
-
-			case 'stts': // Sample Table Time-to-Sample atom
-				$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-				$sttsEntriesDataOffset = 8;
-				//$FrameRateCalculatorArray = array();
-				$frames_count = 0;
-				for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
-					$atom_structure['time_to_sample_table'][$i]['sample_count']    = getid3_lib::BigEndian2Int(substr($atom_data, $sttsEntriesDataOffset, 4));
-					$sttsEntriesDataOffset += 4;
-					$atom_structure['time_to_sample_table'][$i]['sample_duration'] = getid3_lib::BigEndian2Int(substr($atom_data, $sttsEntriesDataOffset, 4));
-					$sttsEntriesDataOffset += 4;
-
-					$frames_count += $atom_structure['time_to_sample_table'][$i]['sample_count'];
-
-					// THIS SECTION REPLACED WITH CODE IN "stbl" ATOM
-					//if (!empty($info['quicktime']['time_scale']) && ($atom_structure['time_to_sample_table'][$i]['sample_duration'] > 0)) {
-					//	$stts_new_framerate = $info['quicktime']['time_scale'] / $atom_structure['time_to_sample_table'][$i]['sample_duration'];
-					//	if ($stts_new_framerate <= 60) {
-					//		// some atoms have durations of "1" giving a very large framerate, which probably is not right
-					//		$info['video']['frame_rate'] = max($info['video']['frame_rate'], $stts_new_framerate);
-					//	}
-					//}
-					//
-					//$FrameRateCalculatorArray[($info['quicktime']['time_scale'] / $atom_structure['time_to_sample_table'][$i]['sample_duration'])] += $atom_structure['time_to_sample_table'][$i]['sample_count'];
-				}
-				$info['quicktime']['stts_framecount'][] = $frames_count;
-				//$sttsFramesTotal  = 0;
-				//$sttsSecondsTotal = 0;
-				//foreach ($FrameRateCalculatorArray as $frames_per_second => $frame_count) {
-				//	if (($frames_per_second > 60) || ($frames_per_second < 1)) {
-				//		// not video FPS information, probably audio information
-				//		$sttsFramesTotal  = 0;
-				//		$sttsSecondsTotal = 0;
-				//		break;
-				//	}
-				//	$sttsFramesTotal  += $frame_count;
-				//	$sttsSecondsTotal += $frame_count / $frames_per_second;
-				//}
-				//if (($sttsFramesTotal > 0) && ($sttsSecondsTotal > 0)) {
-				//	if (($sttsFramesTotal / $sttsSecondsTotal) > $info['video']['frame_rate']) {
-				//		$info['video']['frame_rate'] = $sttsFramesTotal / $sttsSecondsTotal;
-				//	}
-				//}
-				break;
-
-
-			case 'stss': // Sample Table Sync Sample (key frames) atom
-				if ($ParseAllPossibleAtoms) {
-					$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-					$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-					$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-					$stssEntriesDataOffset = 8;
-					for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
-						$atom_structure['time_to_sample_table'][$i] = getid3_lib::BigEndian2Int(substr($atom_data, $stssEntriesDataOffset, 4));
-						$stssEntriesDataOffset += 4;
-					}
-				}
-				break;
-
-
-			case 'stsc': // Sample Table Sample-to-Chunk atom
-				if ($ParseAllPossibleAtoms) {
-					$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-					$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-					$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-					$stscEntriesDataOffset = 8;
-					for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
-						$atom_structure['sample_to_chunk_table'][$i]['first_chunk']        = getid3_lib::BigEndian2Int(substr($atom_data, $stscEntriesDataOffset, 4));
-						$stscEntriesDataOffset += 4;
-						$atom_structure['sample_to_chunk_table'][$i]['samples_per_chunk']  = getid3_lib::BigEndian2Int(substr($atom_data, $stscEntriesDataOffset, 4));
-						$stscEntriesDataOffset += 4;
-						$atom_structure['sample_to_chunk_table'][$i]['sample_description'] = getid3_lib::BigEndian2Int(substr($atom_data, $stscEntriesDataOffset, 4));
-						$stscEntriesDataOffset += 4;
-					}
-				}
-				break;
-
-
-			case 'stsz': // Sample Table SiZe atom
-				if ($ParseAllPossibleAtoms) {
-					$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-					$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-					$atom_structure['sample_size']    = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-					$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  8, 4));
-					$stszEntriesDataOffset = 12;
-					if ($atom_structure['sample_size'] == 0) {
-						for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
-							$atom_structure['sample_size_table'][$i] = getid3_lib::BigEndian2Int(substr($atom_data, $stszEntriesDataOffset, 4));
-							$stszEntriesDataOffset += 4;
-						}
-					}
-				}
-				break;
-
-
-			case 'stco': // Sample Table Chunk Offset atom
-				if ($ParseAllPossibleAtoms) {
-					$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-					$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-					$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-					$stcoEntriesDataOffset = 8;
-					for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
-						$atom_structure['chunk_offset_table'][$i] = getid3_lib::BigEndian2Int(substr($atom_data, $stcoEntriesDataOffset, 4));
-						$stcoEntriesDataOffset += 4;
-					}
-				}
-				break;
-
-
-			case 'co64': // Chunk Offset 64-bit (version of "stco" that supports > 2GB files)
-				if ($ParseAllPossibleAtoms) {
-					$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-					$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-					$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-					$stcoEntriesDataOffset = 8;
-					for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
-						$atom_structure['chunk_offset_table'][$i] = getid3_lib::BigEndian2Int(substr($atom_data, $stcoEntriesDataOffset, 8));
-						$stcoEntriesDataOffset += 8;
-					}
-				}
-				break;
-
-
-			case 'dref': // Data REFerence atom
-				$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-				$drefDataOffset = 8;
-				for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
-					$atom_structure['data_references'][$i]['size']                    = getid3_lib::BigEndian2Int(substr($atom_data, $drefDataOffset, 4));
-					$drefDataOffset += 4;
-					$atom_structure['data_references'][$i]['type']                    =               substr($atom_data, $drefDataOffset, 4);
-					$drefDataOffset += 4;
-					$atom_structure['data_references'][$i]['version']                 = getid3_lib::BigEndian2Int(substr($atom_data,  $drefDataOffset, 1));
-					$drefDataOffset += 1;
-					$atom_structure['data_references'][$i]['flags_raw']               = getid3_lib::BigEndian2Int(substr($atom_data,  $drefDataOffset, 3)); // hardcoded: 0x0000
-					$drefDataOffset += 3;
-					$atom_structure['data_references'][$i]['data']                    =               substr($atom_data, $drefDataOffset, ($atom_structure['data_references'][$i]['size'] - 4 - 4 - 1 - 3));
-					$drefDataOffset += ($atom_structure['data_references'][$i]['size'] - 4 - 4 - 1 - 3);
-
-					$atom_structure['data_references'][$i]['flags']['self_reference'] = (bool) ($atom_structure['data_references'][$i]['flags_raw'] & 0x001);
-				}
-				break;
-
-
-			case 'gmin': // base Media INformation atom
-				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['graphics_mode']          = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2));
-				$atom_structure['opcolor_red']            = getid3_lib::BigEndian2Int(substr($atom_data,  6, 2));
-				$atom_structure['opcolor_green']          = getid3_lib::BigEndian2Int(substr($atom_data,  8, 2));
-				$atom_structure['opcolor_blue']           = getid3_lib::BigEndian2Int(substr($atom_data, 10, 2));
-				$atom_structure['balance']                = getid3_lib::BigEndian2Int(substr($atom_data, 12, 2));
-				$atom_structure['reserved']               = getid3_lib::BigEndian2Int(substr($atom_data, 14, 2));
-				break;
-
-
-			case 'smhd': // Sound Media information HeaDer atom
-				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['balance']                = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2));
-				$atom_structure['reserved']               = getid3_lib::BigEndian2Int(substr($atom_data,  6, 2));
-				break;
-
-
-			case 'vmhd': // Video Media information HeaDer atom
-				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3));
-				$atom_structure['graphics_mode']          = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2));
-				$atom_structure['opcolor_red']            = getid3_lib::BigEndian2Int(substr($atom_data,  6, 2));
-				$atom_structure['opcolor_green']          = getid3_lib::BigEndian2Int(substr($atom_data,  8, 2));
-				$atom_structure['opcolor_blue']           = getid3_lib::BigEndian2Int(substr($atom_data, 10, 2));
-
-				$atom_structure['flags']['no_lean_ahead'] = (bool) ($atom_structure['flags_raw'] & 0x001);
-				break;
-
-
-			case 'hdlr': // HanDLeR reference atom
-				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['component_type']         =                           substr($atom_data,  4, 4);
-				$atom_structure['component_subtype']      =                           substr($atom_data,  8, 4);
-				$atom_structure['component_manufacturer'] =                           substr($atom_data, 12, 4);
-				$atom_structure['component_flags_raw']    = getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
-				$atom_structure['component_flags_mask']   = getid3_lib::BigEndian2Int(substr($atom_data, 20, 4));
-				$atom_structure['component_name']         =      $this->Pascal2String(substr($atom_data, 24));
-
-				if (($atom_structure['component_subtype'] == 'STpn') && ($atom_structure['component_manufacturer'] == 'zzzz')) {
-					$info['video']['dataformat'] = 'quicktimevr';
-				}
-				break;
-
-
-			case 'mdhd': // MeDia HeaDer atom
-				$atom_structure['version']               = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']             = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['creation_time']         = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-				$atom_structure['modify_time']           = getid3_lib::BigEndian2Int(substr($atom_data,  8, 4));
-				$atom_structure['time_scale']            = getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
-				$atom_structure['duration']              = getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
-				$atom_structure['language_id']           = getid3_lib::BigEndian2Int(substr($atom_data, 20, 2));
-				$atom_structure['quality']               = getid3_lib::BigEndian2Int(substr($atom_data, 22, 2));
-
-				if ($atom_structure['time_scale'] == 0) {
-					$info['error'][] = 'Corrupt Quicktime file: mdhd.time_scale == zero';
-					return false;
-				}
-				$info['quicktime']['time_scale'] = (isset($info['quicktime']['time_scale']) ? max($info['quicktime']['time_scale'], $atom_structure['time_scale']) : $atom_structure['time_scale']);
-
-				$atom_structure['creation_time_unix']    = getid3_lib::DateMac2Unix($atom_structure['creation_time']);
-				$atom_structure['modify_time_unix']      = getid3_lib::DateMac2Unix($atom_structure['modify_time']);
-				$atom_structure['playtime_seconds']      = $atom_structure['duration'] / $atom_structure['time_scale'];
-				$atom_structure['language']              = $this->QuicktimeLanguageLookup($atom_structure['language_id']);
-				if (empty($info['comments']['language']) || (!in_array($atom_structure['language'], $info['comments']['language']))) {
-					$info['comments']['language'][] = $atom_structure['language'];
-				}
-				break;
-
-
-			case 'pnot': // Preview atom
-				$atom_structure['modification_date']      = getid3_lib::BigEndian2Int(substr($atom_data,  0, 4)); // "standard Macintosh format"
-				$atom_structure['version_number']         = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2)); // hardcoded: 0x00
-				$atom_structure['atom_type']              =               substr($atom_data,  6, 4);        // usually: 'PICT'
-				$atom_structure['atom_index']             = getid3_lib::BigEndian2Int(substr($atom_data, 10, 2)); // usually: 0x01
-
-				$atom_structure['modification_date_unix'] = getid3_lib::DateMac2Unix($atom_structure['modification_date']);
-				break;
-
-
-			case 'crgn': // Clipping ReGioN atom
-				$atom_structure['region_size']   = getid3_lib::BigEndian2Int(substr($atom_data,  0, 2)); // The Region size, Region boundary box,
-				$atom_structure['boundary_box']  = getid3_lib::BigEndian2Int(substr($atom_data,  2, 8)); // and Clipping region data fields
-				$atom_structure['clipping_data'] =               substr($atom_data, 10);           // constitute a QuickDraw region.
-				break;
-
-
-			case 'load': // track LOAD settings atom
-				$atom_structure['preload_start_time'] = getid3_lib::BigEndian2Int(substr($atom_data,  0, 4));
-				$atom_structure['preload_duration']   = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-				$atom_structure['preload_flags_raw']  = getid3_lib::BigEndian2Int(substr($atom_data,  8, 4));
-				$atom_structure['default_hints_raw']  = getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
-
-				$atom_structure['default_hints']['double_buffer'] = (bool) ($atom_structure['default_hints_raw'] & 0x0020);
-				$atom_structure['default_hints']['high_quality']  = (bool) ($atom_structure['default_hints_raw'] & 0x0100);
-				break;
-
-
-			case 'tmcd': // TiMe CoDe atom
-			case 'chap': // CHAPter list atom
-			case 'sync': // SYNChronization atom
-			case 'scpt': // tranSCriPT atom
-			case 'ssrc': // non-primary SouRCe atom
-				for ($i = 0; $i < (strlen($atom_data) % 4); $i++) {
-					$atom_structure['track_id'][$i] = getid3_lib::BigEndian2Int(substr($atom_data, $i * 4, 4));
-				}
-				break;
-
-
-			case 'elst': // Edit LiST atom
-				$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-				for ($i = 0; $i < $atom_structure['number_entries']; $i++ ) {
-					$atom_structure['edit_list'][$i]['track_duration'] =   getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($i * 12) + 0, 4));
-					$atom_structure['edit_list'][$i]['media_time']     =   getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($i * 12) + 4, 4));
-					$atom_structure['edit_list'][$i]['media_rate']     = getid3_lib::FixedPoint16_16(substr($atom_data, 8 + ($i * 12) + 8, 4));
-				}
-				break;
-
-
-			case 'kmat': // compressed MATte atom
-				$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['matte_data_raw'] =               substr($atom_data,  4);
-				break;
-
-
-			case 'ctab': // Color TABle atom
-				$atom_structure['color_table_seed']   = getid3_lib::BigEndian2Int(substr($atom_data,  0, 4)); // hardcoded: 0x00000000
-				$atom_structure['color_table_flags']  = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2)); // hardcoded: 0x8000
-				$atom_structure['color_table_size']   = getid3_lib::BigEndian2Int(substr($atom_data,  6, 2)) + 1;
-				for ($colortableentry = 0; $colortableentry < $atom_structure['color_table_size']; $colortableentry++) {
-					$atom_structure['color_table'][$colortableentry]['alpha'] = getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($colortableentry * 8) + 0, 2));
-					$atom_structure['color_table'][$colortableentry]['red']   = getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($colortableentry * 8) + 2, 2));
-					$atom_structure['color_table'][$colortableentry]['green'] = getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($colortableentry * 8) + 4, 2));
-					$atom_structure['color_table'][$colortableentry]['blue']  = getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($colortableentry * 8) + 6, 2));
-				}
-				break;
-
-
-			case 'mvhd': // MoVie HeaDer atom
-				$atom_structure['version']            =   getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']          =   getid3_lib::BigEndian2Int(substr($atom_data,  1, 3));
-				$atom_structure['creation_time']      =   getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-				$atom_structure['modify_time']        =   getid3_lib::BigEndian2Int(substr($atom_data,  8, 4));
-				$atom_structure['time_scale']         =   getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
-				$atom_structure['duration']           =   getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
-				$atom_structure['preferred_rate']     = getid3_lib::FixedPoint16_16(substr($atom_data, 20, 4));
-				$atom_structure['preferred_volume']   =   getid3_lib::FixedPoint8_8(substr($atom_data, 24, 2));
-				$atom_structure['reserved']           =                             substr($atom_data, 26, 10);
-				$atom_structure['matrix_a']           = getid3_lib::FixedPoint16_16(substr($atom_data, 36, 4));
-				$atom_structure['matrix_b']           = getid3_lib::FixedPoint16_16(substr($atom_data, 40, 4));
-				$atom_structure['matrix_u']           =  getid3_lib::FixedPoint2_30(substr($atom_data, 44, 4));
-				$atom_structure['matrix_c']           = getid3_lib::FixedPoint16_16(substr($atom_data, 48, 4));
-				$atom_structure['matrix_d']           = getid3_lib::FixedPoint16_16(substr($atom_data, 52, 4));
-				$atom_structure['matrix_v']           =  getid3_lib::FixedPoint2_30(substr($atom_data, 56, 4));
-				$atom_structure['matrix_x']           = getid3_lib::FixedPoint16_16(substr($atom_data, 60, 4));
-				$atom_structure['matrix_y']           = getid3_lib::FixedPoint16_16(substr($atom_data, 64, 4));
-				$atom_structure['matrix_w']           =  getid3_lib::FixedPoint2_30(substr($atom_data, 68, 4));
-				$atom_structure['preview_time']       =   getid3_lib::BigEndian2Int(substr($atom_data, 72, 4));
-				$atom_structure['preview_duration']   =   getid3_lib::BigEndian2Int(substr($atom_data, 76, 4));
-				$atom_structure['poster_time']        =   getid3_lib::BigEndian2Int(substr($atom_data, 80, 4));
-				$atom_structure['selection_time']     =   getid3_lib::BigEndian2Int(substr($atom_data, 84, 4));
-				$atom_structure['selection_duration'] =   getid3_lib::BigEndian2Int(substr($atom_data, 88, 4));
-				$atom_structure['current_time']       =   getid3_lib::BigEndian2Int(substr($atom_data, 92, 4));
-				$atom_structure['next_track_id']      =   getid3_lib::BigEndian2Int(substr($atom_data, 96, 4));
-
-				if ($atom_structure['time_scale'] == 0) {
-					$info['error'][] = 'Corrupt Quicktime file: mvhd.time_scale == zero';
-					return false;
-				}
-				$atom_structure['creation_time_unix']        = getid3_lib::DateMac2Unix($atom_structure['creation_time']);
-				$atom_structure['modify_time_unix']          = getid3_lib::DateMac2Unix($atom_structure['modify_time']);
-				$info['quicktime']['time_scale']    = (isset($info['quicktime']['time_scale']) ? max($info['quicktime']['time_scale'], $atom_structure['time_scale']) : $atom_structure['time_scale']);
-				$info['quicktime']['display_scale'] = $atom_structure['matrix_a'];
-				$info['playtime_seconds']           = $atom_structure['duration'] / $atom_structure['time_scale'];
-				break;
-
-
-			case 'tkhd': // TracK HeaDer atom
-				$atom_structure['version']             =   getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']           =   getid3_lib::BigEndian2Int(substr($atom_data,  1, 3));
-				$atom_structure['creation_time']       =   getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-				$atom_structure['modify_time']         =   getid3_lib::BigEndian2Int(substr($atom_data,  8, 4));
-				$atom_structure['trackid']             =   getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
-				$atom_structure['reserved1']           =   getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
-				$atom_structure['duration']            =   getid3_lib::BigEndian2Int(substr($atom_data, 20, 4));
-				$atom_structure['reserved2']           =   getid3_lib::BigEndian2Int(substr($atom_data, 24, 8));
-				$atom_structure['layer']               =   getid3_lib::BigEndian2Int(substr($atom_data, 32, 2));
-				$atom_structure['alternate_group']     =   getid3_lib::BigEndian2Int(substr($atom_data, 34, 2));
-				$atom_structure['volume']              =   getid3_lib::FixedPoint8_8(substr($atom_data, 36, 2));
-				$atom_structure['reserved3']           =   getid3_lib::BigEndian2Int(substr($atom_data, 38, 2));
-				$atom_structure['matrix_a']            = getid3_lib::FixedPoint16_16(substr($atom_data, 40, 4));
-				$atom_structure['matrix_b']            = getid3_lib::FixedPoint16_16(substr($atom_data, 44, 4));
-				$atom_structure['matrix_u']            = getid3_lib::FixedPoint16_16(substr($atom_data, 48, 4));
-				$atom_structure['matrix_c']            = getid3_lib::FixedPoint16_16(substr($atom_data, 52, 4));
-				$atom_structure['matrix_d']            = getid3_lib::FixedPoint16_16(substr($atom_data, 56, 4));
-				$atom_structure['matrix_v']            = getid3_lib::FixedPoint16_16(substr($atom_data, 60, 4));
-				$atom_structure['matrix_x']            =  getid3_lib::FixedPoint2_30(substr($atom_data, 64, 4));
-				$atom_structure['matrix_y']            =  getid3_lib::FixedPoint2_30(substr($atom_data, 68, 4));
-				$atom_structure['matrix_w']            =  getid3_lib::FixedPoint2_30(substr($atom_data, 72, 4));
-				$atom_structure['width']               = getid3_lib::FixedPoint16_16(substr($atom_data, 76, 4));
-				$atom_structure['height']              = getid3_lib::FixedPoint16_16(substr($atom_data, 80, 4));
-
-				$atom_structure['flags']['enabled']    = (bool) ($atom_structure['flags_raw'] & 0x0001);
-				$atom_structure['flags']['in_movie']   = (bool) ($atom_structure['flags_raw'] & 0x0002);
-				$atom_structure['flags']['in_preview'] = (bool) ($atom_structure['flags_raw'] & 0x0004);
-				$atom_structure['flags']['in_poster']  = (bool) ($atom_structure['flags_raw'] & 0x0008);
-				$atom_structure['creation_time_unix']  = getid3_lib::DateMac2Unix($atom_structure['creation_time']);
-				$atom_structure['modify_time_unix']    = getid3_lib::DateMac2Unix($atom_structure['modify_time']);
-
-				if ($atom_structure['flags']['enabled'] == 1) {
-					if (!isset($info['video']['resolution_x']) || !isset($info['video']['resolution_y'])) {
-						$info['video']['resolution_x'] = $atom_structure['width'];
-						$info['video']['resolution_y'] = $atom_structure['height'];
-					}
-					$info['video']['resolution_x'] = max($info['video']['resolution_x'], $atom_structure['width']);
-					$info['video']['resolution_y'] = max($info['video']['resolution_y'], $atom_structure['height']);
-					$info['quicktime']['video']['resolution_x'] = $info['video']['resolution_x'];
-					$info['quicktime']['video']['resolution_y'] = $info['video']['resolution_y'];
-				} else {
-					if (isset($info['video']['resolution_x'])) { unset($info['video']['resolution_x']); }
-					if (isset($info['video']['resolution_y'])) { unset($info['video']['resolution_y']); }
-					if (isset($info['quicktime']['video']))    { unset($info['quicktime']['video']);    }
-				}
-				break;
-
-
-			case 'iods': // Initial Object DeScriptor atom
-				// http://www.koders.com/c/fid1FAB3E762903DC482D8A246D4A4BF9F28E049594.aspx?s=windows.h
-				// http://libquicktime.sourcearchive.com/documentation/1.0.2plus-pdebian/iods_8c-source.html
-				$offset = 0;
-				$atom_structure['version']                =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
-				$offset += 1;
-				$atom_structure['flags_raw']              =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 3));
-				$offset += 3;
-				$atom_structure['mp4_iod_tag']            =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
-				$offset += 1;
-				$atom_structure['length']                 = $this->quicktime_read_mp4_descr_length($atom_data, $offset);
-				//$offset already adjusted by quicktime_read_mp4_descr_length()
-				$atom_structure['object_descriptor_id']   =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2));
-				$offset += 2;
-				$atom_structure['od_profile_level']       =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
-				$offset += 1;
-				$atom_structure['scene_profile_level']    =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
-				$offset += 1;
-				$atom_structure['audio_profile_id']       =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
-				$offset += 1;
-				$atom_structure['video_profile_id']       =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
-				$offset += 1;
-				$atom_structure['graphics_profile_level'] =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
-				$offset += 1;
-
-				$atom_structure['num_iods_tracks'] = ($atom_structure['length'] - 7) / 6; // 6 bytes would only be right if all tracks use 1-byte length fields
-				for ($i = 0; $i < $atom_structure['num_iods_tracks']; $i++) {
-					$atom_structure['track'][$i]['ES_ID_IncTag'] =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
-					$offset += 1;
-					$atom_structure['track'][$i]['length']       = $this->quicktime_read_mp4_descr_length($atom_data, $offset);
-					//$offset already adjusted by quicktime_read_mp4_descr_length()
-					$atom_structure['track'][$i]['track_id']     =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 4));
-					$offset += 4;
-				}
-
-				$atom_structure['audio_profile_name'] = $this->QuicktimeIODSaudioProfileName($atom_structure['audio_profile_id']);
-				$atom_structure['video_profile_name'] = $this->QuicktimeIODSvideoProfileName($atom_structure['video_profile_id']);
-				break;
-
-			case 'ftyp': // FileTYPe (?) atom (for MP4 it seems)
-				$atom_structure['signature'] =                           substr($atom_data,  0, 4);
-				$atom_structure['unknown_1'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-				$atom_structure['fourcc']    =                           substr($atom_data,  8, 4);
-				break;
-
-			case 'mdat': // Media DATa atom
-			case 'free': // FREE space atom
-			case 'skip': // SKIP atom
-			case 'wide': // 64-bit expansion placeholder atom
-				// 'mdat' data is too big to deal with, contains no useful metadata
-				// 'free', 'skip' and 'wide' are just padding, contains no useful data at all
-
-				// When writing QuickTime files, it is sometimes necessary to update an atom's size.
-				// It is impossible to update a 32-bit atom to a 64-bit atom since the 32-bit atom
-				// is only 8 bytes in size, and the 64-bit atom requires 16 bytes. Therefore, QuickTime
-				// puts an 8-byte placeholder atom before any atoms it may have to update the size of.
-				// In this way, if the atom needs to be converted from a 32-bit to a 64-bit atom, the
-				// placeholder atom can be overwritten to obtain the necessary 8 extra bytes.
-				// The placeholder atom has a type of kWideAtomPlaceholderType ( 'wide' ).
-				break;
-
-
-			case 'nsav': // NoSAVe atom
-				// http://developer.apple.com/technotes/tn/tn2038.html
-				$atom_structure['data'] = getid3_lib::BigEndian2Int(substr($atom_data,  0, 4));
-				break;
-
-			case 'ctyp': // Controller TYPe atom (seen on QTVR)
-				// http://homepages.slingshot.co.nz/~helmboy/quicktime/formats/qtm-layout.txt
-				// some controller names are:
-				//   0x00 + 'std' for linear movie
-				//   'none' for no controls
-				$atom_structure['ctyp'] = substr($atom_data, 0, 4);
-				$info['quicktime']['controller'] = $atom_structure['ctyp'];
-				switch ($atom_structure['ctyp']) {
-					case 'qtvr':
-						$info['video']['dataformat'] = 'quicktimevr';
-						break;
-				}
-				break;
-
-			case 'pano': // PANOrama track (seen on QTVR)
-				$atom_structure['pano'] = getid3_lib::BigEndian2Int(substr($atom_data,  0, 4));
-				break;
-
-			case 'hint': // HINT track
-			case 'hinf': //
-			case 'hinv': //
-			case 'hnti': //
-				$info['quicktime']['hinting'] = true;
-				break;
-
-			case 'imgt': // IMaGe Track reference (kQTVRImageTrackRefType) (seen on QTVR)
-				for ($i = 0; $i < ($atom_structure['size'] - 8); $i += 4) {
-					$atom_structure['imgt'][] = getid3_lib::BigEndian2Int(substr($atom_data, $i, 4));
-				}
-				break;
-
-
-			// Observed-but-not-handled atom types are just listed here to prevent warnings being generated
-			case 'FXTC': // Something to do with Adobe After Effects (?)
-			case 'PrmA':
-			case 'code':
-			case 'FIEL': // this is NOT "fiel" (Field Ordering) as describe here: http://developer.apple.com/documentation/QuickTime/QTFF/QTFFChap3/chapter_4_section_2.html
-			case 'tapt': // TrackApertureModeDimensionsAID - http://developer.apple.com/documentation/QuickTime/Reference/QT7-1_Update_Reference/Constants/Constants.html
-						// tapt seems to be used to compute the video size [http://www.getid3.org/phpBB3/viewtopic.php?t=838]
-						// * http://lists.apple.com/archives/quicktime-api/2006/Aug/msg00014.html
-						// * http://handbrake.fr/irclogs/handbrake-dev/handbrake-dev20080128_pg2.html
-			case 'ctts'://  STCompositionOffsetAID             - http://developer.apple.com/documentation/QuickTime/Reference/QTRef_Constants/Reference/reference.html
-			case 'cslg'://  STCompositionShiftLeastGreatestAID - http://developer.apple.com/documentation/QuickTime/Reference/QTRef_Constants/Reference/reference.html
-			case 'sdtp'://  STSampleDependencyAID              - http://developer.apple.com/documentation/QuickTime/Reference/QTRef_Constants/Reference/reference.html
-			case 'stps'://  STPartialSyncSampleAID             - http://developer.apple.com/documentation/QuickTime/Reference/QTRef_Constants/Reference/reference.html
-				//$atom_structure['data'] = $atom_data;
-				break;
-
-			case '�xyz':  // GPS latitude+longitude+altitude
-				$atom_structure['data'] = $atom_data;
-				if (preg_match('#([\\+\\-][0-9\\.]+)([\\+\\-][0-9\\.]+)([\\+\\-][0-9\\.]+)?/$#i', $atom_data, $matches)) {
-					@list($all, $latitude, $longitude, $altitude) = $matches;
-					$info['quicktime']['comments']['gps_latitude'][]  = floatval($latitude);
-					$info['quicktime']['comments']['gps_longitude'][] = floatval($longitude);
-					if (!empty($altitude)) {
-						$info['quicktime']['comments']['gps_altitude'][] = floatval($altitude);
-					}
-				} else {
-					$info['warning'][] = 'QuickTime atom "�xyz" data does not match expected data pattern at offset '.$baseoffset.'. Please report as getID3() bug.';
-				}
-				break;
-
-			case 'NCDT':
-				// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
-				// Nikon-specific QuickTime tags found in the NCDT atom of MOV videos from some Nikon cameras such as the Coolpix S8000 and D5100
-				$atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 4, $atomHierarchy, $ParseAllPossibleAtoms);
-				break;
-			case 'NCTH': // Nikon Camera THumbnail image
-			case 'NCVW': // Nikon Camera preVieW image
-				// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
-				if (preg_match('/^\xFF\xD8\xFF/', $atom_data)) {
-					$atom_structure['data'] = $atom_data;
-					$atom_structure['image_mime'] = 'image/jpeg';
-					$atom_structure['description'] = (($atomname == 'NCTH') ? 'Nikon Camera Thumbnail Image' : (($atomname == 'NCVW') ? 'Nikon Camera Preview Image' : 'Nikon preview image'));
-					$info['quicktime']['comments']['picture'][] = array('image_mime'=>$atom_structure['image_mime'], 'data'=>$atom_data, 'description'=>$atom_structure['description']);
-				}
-				break;
-			case 'NCHD': // MakerNoteVersion
-				// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
-				$atom_structure['data'] = $atom_data;
-				break;
-			case 'NCTG': // NikonTags
-				// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#NCTG
-				$atom_structure['data'] = $this->QuicktimeParseNikonNCTG($atom_data);
-				break;
-			case 'NCDB': // NikonTags
-				// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
-				$atom_structure['data'] = $atom_data;
-				break;
-
-			case "\x00\x00\x00\x00":
-			case 'meta': // METAdata atom
-				// some kind of metacontainer, may contain a big data dump such as:
-				// mdta keys  mdtacom.apple.quicktime.make (mdtacom.apple.quicktime.creationdate ,mdtacom.apple.quicktime.location.ISO6709 $mdtacom.apple.quicktime.software !mdtacom.apple.quicktime.model ilst  
 data 
DEApple 0  (data 
DE2011-05-11T17:54:04+0200 2  *data 
DE+52.4936+013.3897+040.247/   data 
DE4.3.1  data 
DEiPhone 4
-				// http://www.geocities.com/xhelmboyx/quicktime/formats/qti-layout.txt
-
-	            $atom_structure['version']   =          getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
-	            $atom_structure['flags_raw'] =          getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
-	            $atom_structure['subatoms']  = $this->QuicktimeParseContainerAtom(substr($atom_data, 4), $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
-				//$atom_structure['subatoms']  = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
-				break;
-
-			case 'data': // metaDATA atom
-				// seems to be 2 bytes language code (ASCII), 2 bytes unknown (set to 0x10B5 in sample I have), remainder is useful data
-				$atom_structure['language'] =                           substr($atom_data, 4 + 0, 2);
-				$atom_structure['unknown']  = getid3_lib::BigEndian2Int(substr($atom_data, 4 + 2, 2));
-				$atom_structure['data']     =                           substr($atom_data, 4 + 4);
-				break;
-
-			default:
-				$info['warning'][] = 'Unknown QuickTime atom type: "'.getid3_lib::PrintHexBytes($atomname).'" at offset '.$baseoffset;
-				$atom_structure['data'] = $atom_data;
-				break;
-		}
-		array_pop($atomHierarchy);
-		return $atom_structure;
-	}
-
-	function QuicktimeParseContainerAtom($atom_data, $baseoffset, &$atomHierarchy, $ParseAllPossibleAtoms) {
-//echo 'QuicktimeParseContainerAtom('.substr($atom_data, 4, 4).') @ '.$baseoffset.'<br><br>';
-		$atom_structure  = false;
-		$subatomoffset  = 0;
-		$subatomcounter = 0;
-		if ((strlen($atom_data) == 4) && (getid3_lib::BigEndian2Int($atom_data) == 0x00000000)) {
-			return false;
-		}
-		while ($subatomoffset < strlen($atom_data)) {
-			$subatomsize = getid3_lib::BigEndian2Int(substr($atom_data, $subatomoffset + 0, 4));
-			$subatomname =                           substr($atom_data, $subatomoffset + 4, 4);
-			$subatomdata =                           substr($atom_data, $subatomoffset + 8, $subatomsize - 8);
-			if ($subatomsize == 0) {
-				// Furthermore, for historical reasons the list of atoms is optionally
-				// terminated by a 32-bit integer set to 0. If you are writing a program
-				// to read user data atoms, you should allow for the terminating 0.
-				return $atom_structure;
-			}
-
-			$atom_structure[$subatomcounter] = $this->QuicktimeParseAtom($subatomname, $subatomsize, $subatomdata, $baseoffset + $subatomoffset, $atomHierarchy, $ParseAllPossibleAtoms);
-
-			$subatomoffset += $subatomsize;
-			$subatomcounter++;
-		}
-		return $atom_structure;
-	}
-
-
-	function quicktime_read_mp4_descr_length($data, &$offset) {
-		// http://libquicktime.sourcearchive.com/documentation/2:1.0.2plus-pdebian-2build1/esds_8c-source.html
-		$num_bytes = 0;
-		$length    = 0;
-		do {
-			$b = ord(substr($data, $offset++, 1));
-			$length = ($length << 7) | ($b & 0x7F);
-		} while (($b & 0x80) && ($num_bytes++ < 4));
-		return $length;
-	}
-
-
-	function QuicktimeLanguageLookup($languageid) {
-		static $QuicktimeLanguageLookup = array();
-		if (empty($QuicktimeLanguageLookup)) {
-			$QuicktimeLanguageLookup[0]   = 'English';
-			$QuicktimeLanguageLookup[1]   = 'French';
-			$QuicktimeLanguageLookup[2]   = 'German';
-			$QuicktimeLanguageLookup[3]   = 'Italian';
-			$QuicktimeLanguageLookup[4]   = 'Dutch';
-			$QuicktimeLanguageLookup[5]   = 'Swedish';
-			$QuicktimeLanguageLookup[6]   = 'Spanish';
-			$QuicktimeLanguageLookup[7]   = 'Danish';
-			$QuicktimeLanguageLookup[8]   = 'Portuguese';
-			$QuicktimeLanguageLookup[9]   = 'Norwegian';
-			$QuicktimeLanguageLookup[10]  = 'Hebrew';
-			$QuicktimeLanguageLookup[11]  = 'Japanese';
-			$QuicktimeLanguageLookup[12]  = 'Arabic';
-			$QuicktimeLanguageLookup[13]  = 'Finnish';
-			$QuicktimeLanguageLookup[14]  = 'Greek';
-			$QuicktimeLanguageLookup[15]  = 'Icelandic';
-			$QuicktimeLanguageLookup[16]  = 'Maltese';
-			$QuicktimeLanguageLookup[17]  = 'Turkish';
-			$QuicktimeLanguageLookup[18]  = 'Croatian';
-			$QuicktimeLanguageLookup[19]  = 'Chinese (Traditional)';
-			$QuicktimeLanguageLookup[20]  = 'Urdu';
-			$QuicktimeLanguageLookup[21]  = 'Hindi';
-			$QuicktimeLanguageLookup[22]  = 'Thai';
-			$QuicktimeLanguageLookup[23]  = 'Korean';
-			$QuicktimeLanguageLookup[24]  = 'Lithuanian';
-			$QuicktimeLanguageLookup[25]  = 'Polish';
-			$QuicktimeLanguageLookup[26]  = 'Hungarian';
-			$QuicktimeLanguageLookup[27]  = 'Estonian';
-			$QuicktimeLanguageLookup[28]  = 'Lettish';
-			$QuicktimeLanguageLookup[28]  = 'Latvian';
-			$QuicktimeLanguageLookup[29]  = 'Saamisk';
-			$QuicktimeLanguageLookup[29]  = 'Lappish';
-			$QuicktimeLanguageLookup[30]  = 'Faeroese';
-			$QuicktimeLanguageLookup[31]  = 'Farsi';
-			$QuicktimeLanguageLookup[31]  = 'Persian';
-			$QuicktimeLanguageLookup[32]  = 'Russian';
-			$QuicktimeLanguageLookup[33]  = 'Chinese (Simplified)';
-			$QuicktimeLanguageLookup[34]  = 'Flemish';
-			$QuicktimeLanguageLookup[35]  = 'Irish';
-			$QuicktimeLanguageLookup[36]  = 'Albanian';
-			$QuicktimeLanguageLookup[37]  = 'Romanian';
-			$QuicktimeLanguageLookup[38]  = 'Czech';
-			$QuicktimeLanguageLookup[39]  = 'Slovak';
-			$QuicktimeLanguageLookup[40]  = 'Slovenian';
-			$QuicktimeLanguageLookup[41]  = 'Yiddish';
-			$QuicktimeLanguageLookup[42]  = 'Serbian';
-			$QuicktimeLanguageLookup[43]  = 'Macedonian';
-			$QuicktimeLanguageLookup[44]  = 'Bulgarian';
-			$QuicktimeLanguageLookup[45]  = 'Ukrainian';
-			$QuicktimeLanguageLookup[46]  = 'Byelorussian';
-			$QuicktimeLanguageLookup[47]  = 'Uzbek';
-			$QuicktimeLanguageLookup[48]  = 'Kazakh';
-			$QuicktimeLanguageLookup[49]  = 'Azerbaijani';
-			$QuicktimeLanguageLookup[50]  = 'AzerbaijanAr';
-			$QuicktimeLanguageLookup[51]  = 'Armenian';
-			$QuicktimeLanguageLookup[52]  = 'Georgian';
-			$QuicktimeLanguageLookup[53]  = 'Moldavian';
-			$QuicktimeLanguageLookup[54]  = 'Kirghiz';
-			$QuicktimeLanguageLookup[55]  = 'Tajiki';
-			$QuicktimeLanguageLookup[56]  = 'Turkmen';
-			$QuicktimeLanguageLookup[57]  = 'Mongolian';
-			$QuicktimeLanguageLookup[58]  = 'MongolianCyr';
-			$QuicktimeLanguageLookup[59]  = 'Pashto';
-			$QuicktimeLanguageLookup[60]  = 'Kurdish';
-			$QuicktimeLanguageLookup[61]  = 'Kashmiri';
-			$QuicktimeLanguageLookup[62]  = 'Sindhi';
-			$QuicktimeLanguageLookup[63]  = 'Tibetan';
-			$QuicktimeLanguageLookup[64]  = 'Nepali';
-			$QuicktimeLanguageLookup[65]  = 'Sanskrit';
-			$QuicktimeLanguageLookup[66]  = 'Marathi';
-			$QuicktimeLanguageLookup[67]  = 'Bengali';
-			$QuicktimeLanguageLookup[68]  = 'Assamese';
-			$QuicktimeLanguageLookup[69]  = 'Gujarati';
-			$QuicktimeLanguageLookup[70]  = 'Punjabi';
-			$QuicktimeLanguageLookup[71]  = 'Oriya';
-			$QuicktimeLanguageLookup[72]  = 'Malayalam';
-			$QuicktimeLanguageLookup[73]  = 'Kannada';
-			$QuicktimeLanguageLookup[74]  = 'Tamil';
-			$QuicktimeLanguageLookup[75]  = 'Telugu';
-			$QuicktimeLanguageLookup[76]  = 'Sinhalese';
-			$QuicktimeLanguageLookup[77]  = 'Burmese';
-			$QuicktimeLanguageLookup[78]  = 'Khmer';
-			$QuicktimeLanguageLookup[79]  = 'Lao';
-			$QuicktimeLanguageLookup[80]  = 'Vietnamese';
-			$QuicktimeLanguageLookup[81]  = 'Indonesian';
-			$QuicktimeLanguageLookup[82]  = 'Tagalog';
-			$QuicktimeLanguageLookup[83]  = 'MalayRoman';
-			$QuicktimeLanguageLookup[84]  = 'MalayArabic';
-			$QuicktimeLanguageLookup[85]  = 'Amharic';
-			$QuicktimeLanguageLookup[86]  = 'Tigrinya';
-			$QuicktimeLanguageLookup[87]  = 'Galla';
-			$QuicktimeLanguageLookup[87]  = 'Oromo';
-			$QuicktimeLanguageLookup[88]  = 'Somali';
-			$QuicktimeLanguageLookup[89]  = 'Swahili';
-			$QuicktimeLanguageLookup[90]  = 'Ruanda';
-			$QuicktimeLanguageLookup[91]  = 'Rundi';
-			$QuicktimeLanguageLookup[92]  = 'Chewa';
-			$QuicktimeLanguageLookup[93]  = 'Malagasy';
-			$QuicktimeLanguageLookup[94]  = 'Esperanto';
-			$QuicktimeLanguageLookup[128] = 'Welsh';
-			$QuicktimeLanguageLookup[129] = 'Basque';
-			$QuicktimeLanguageLookup[130] = 'Catalan';
-			$QuicktimeLanguageLookup[131] = 'Latin';
-			$QuicktimeLanguageLookup[132] = 'Quechua';
-			$QuicktimeLanguageLookup[133] = 'Guarani';
-			$QuicktimeLanguageLookup[134] = 'Aymara';
-			$QuicktimeLanguageLookup[135] = 'Tatar';
-			$QuicktimeLanguageLookup[136] = 'Uighur';
-			$QuicktimeLanguageLookup[137] = 'Dzongkha';
-			$QuicktimeLanguageLookup[138] = 'JavaneseRom';
-		}
-		return (isset($QuicktimeLanguageLookup[$languageid]) ? $QuicktimeLanguageLookup[$languageid] : 'invalid');
-	}
-
-	function QuicktimeVideoCodecLookup($codecid) {
-		static $QuicktimeVideoCodecLookup = array();
-		if (empty($QuicktimeVideoCodecLookup)) {
-			$QuicktimeVideoCodecLookup['.SGI'] = 'SGI';
-			$QuicktimeVideoCodecLookup['3IV1'] = '3ivx MPEG-4 v1';
-			$QuicktimeVideoCodecLookup['3IV2'] = '3ivx MPEG-4 v2';
-			$QuicktimeVideoCodecLookup['3IVX'] = '3ivx MPEG-4';
-			$QuicktimeVideoCodecLookup['8BPS'] = 'Planar RGB';
-			$QuicktimeVideoCodecLookup['avc1'] = 'H.264/MPEG-4 AVC';
-			$QuicktimeVideoCodecLookup['avr '] = 'AVR-JPEG';
-			$QuicktimeVideoCodecLookup['b16g'] = '16Gray';
-			$QuicktimeVideoCodecLookup['b32a'] = '32AlphaGray';
-			$QuicktimeVideoCodecLookup['b48r'] = '48RGB';
-			$QuicktimeVideoCodecLookup['b64a'] = '64ARGB';
-			$QuicktimeVideoCodecLookup['base'] = 'Base';
-			$QuicktimeVideoCodecLookup['clou'] = 'Cloud';
-			$QuicktimeVideoCodecLookup['cmyk'] = 'CMYK';
-			$QuicktimeVideoCodecLookup['cvid'] = 'Cinepak';
-			$QuicktimeVideoCodecLookup['dmb1'] = 'OpenDML JPEG';
-			$QuicktimeVideoCodecLookup['dvc '] = 'DVC-NTSC';
-			$QuicktimeVideoCodecLookup['dvcp'] = 'DVC-PAL';
-			$QuicktimeVideoCodecLookup['dvpn'] = 'DVCPro-NTSC';
-			$QuicktimeVideoCodecLookup['dvpp'] = 'DVCPro-PAL';
-			$QuicktimeVideoCodecLookup['fire'] = 'Fire';
-			$QuicktimeVideoCodecLookup['flic'] = 'FLC';
-			$QuicktimeVideoCodecLookup['gif '] = 'GIF';
-			$QuicktimeVideoCodecLookup['h261'] = 'H261';
-			$QuicktimeVideoCodecLookup['h263'] = 'H263';
-			$QuicktimeVideoCodecLookup['IV41'] = 'Indeo4';
-			$QuicktimeVideoCodecLookup['jpeg'] = 'JPEG';
-			$QuicktimeVideoCodecLookup['kpcd'] = 'PhotoCD';
-			$QuicktimeVideoCodecLookup['mjpa'] = 'Motion JPEG-A';
-			$QuicktimeVideoCodecLookup['mjpb'] = 'Motion JPEG-B';
-			$QuicktimeVideoCodecLookup['msvc'] = 'Microsoft Video1';
-			$QuicktimeVideoCodecLookup['myuv'] = 'MPEG YUV420';
-			$QuicktimeVideoCodecLookup['path'] = 'Vector';
-			$QuicktimeVideoCodecLookup['png '] = 'PNG';
-			$QuicktimeVideoCodecLookup['PNTG'] = 'MacPaint';
-			$QuicktimeVideoCodecLookup['qdgx'] = 'QuickDrawGX';
-			$QuicktimeVideoCodecLookup['qdrw'] = 'QuickDraw';
-			$QuicktimeVideoCodecLookup['raw '] = 'RAW';
-			$QuicktimeVideoCodecLookup['ripl'] = 'WaterRipple';
-			$QuicktimeVideoCodecLookup['rpza'] = 'Video';
-			$QuicktimeVideoCodecLookup['smc '] = 'Graphics';
-			$QuicktimeVideoCodecLookup['SVQ1'] = 'Sorenson Video 1';
-			$QuicktimeVideoCodecLookup['SVQ1'] = 'Sorenson Video 3';
-			$QuicktimeVideoCodecLookup['syv9'] = 'Sorenson YUV9';
-			$QuicktimeVideoCodecLookup['tga '] = 'Targa';
-			$QuicktimeVideoCodecLookup['tiff'] = 'TIFF';
-			$QuicktimeVideoCodecLookup['WRAW'] = 'Windows RAW';
-			$QuicktimeVideoCodecLookup['WRLE'] = 'BMP';
-			$QuicktimeVideoCodecLookup['y420'] = 'YUV420';
-			$QuicktimeVideoCodecLookup['yuv2'] = 'ComponentVideo';
-			$QuicktimeVideoCodecLookup['yuvs'] = 'ComponentVideoUnsigned';
-			$QuicktimeVideoCodecLookup['yuvu'] = 'ComponentVideoSigned';
-		}
-		return (isset($QuicktimeVideoCodecLookup[$codecid]) ? $QuicktimeVideoCodecLookup[$codecid] : '');
-	}
-
-	function QuicktimeAudioCodecLookup($codecid) {
-		static $QuicktimeAudioCodecLookup = array();
-		if (empty($QuicktimeAudioCodecLookup)) {
-			$QuicktimeAudioCodecLookup['.mp3']          = 'Fraunhofer MPEG Layer-III alias';
-			$QuicktimeAudioCodecLookup['aac ']          = 'ISO/IEC 14496-3 AAC';
-			$QuicktimeAudioCodecLookup['agsm']          = 'Apple GSM 10:1';
-			$QuicktimeAudioCodecLookup['alac']          = 'Apple Lossless Audio Codec';
-			$QuicktimeAudioCodecLookup['alaw']          = 'A-law 2:1';
-			$QuicktimeAudioCodecLookup['conv']          = 'Sample Format';
-			$QuicktimeAudioCodecLookup['dvca']          = 'DV';
-			$QuicktimeAudioCodecLookup['dvi ']          = 'DV 4:1';
-			$QuicktimeAudioCodecLookup['eqal']          = 'Frequency Equalizer';
-			$QuicktimeAudioCodecLookup['fl32']          = '32-bit Floating Point';
-			$QuicktimeAudioCodecLookup['fl64']          = '64-bit Floating Point';
-			$QuicktimeAudioCodecLookup['ima4']          = 'Interactive Multimedia Association 4:1';
-			$QuicktimeAudioCodecLookup['in24']          = '24-bit Integer';
-			$QuicktimeAudioCodecLookup['in32']          = '32-bit Integer';
-			$QuicktimeAudioCodecLookup['lpc ']          = 'LPC 23:1';
-			$QuicktimeAudioCodecLookup['MAC3']          = 'Macintosh Audio Compression/Expansion (MACE) 3:1';
-			$QuicktimeAudioCodecLookup['MAC6']          = 'Macintosh Audio Compression/Expansion (MACE) 6:1';
-			$QuicktimeAudioCodecLookup['mixb']          = '8-bit Mixer';
-			$QuicktimeAudioCodecLookup['mixw']          = '16-bit Mixer';
-			$QuicktimeAudioCodecLookup['mp4a']          = 'ISO/IEC 14496-3 AAC';
-			$QuicktimeAudioCodecLookup['MS'."\x00\x02"] = 'Microsoft ADPCM';
-			$QuicktimeAudioCodecLookup['MS'."\x00\x11"] = 'DV IMA';
-			$QuicktimeAudioCodecLookup['MS'."\x00\x55"] = 'Fraunhofer MPEG Layer III';
-			$QuicktimeAudioCodecLookup['NONE']          = 'No Encoding';
-			$QuicktimeAudioCodecLookup['Qclp']          = 'Qualcomm PureVoice';
-			$QuicktimeAudioCodecLookup['QDM2']          = 'QDesign Music 2';
-			$QuicktimeAudioCodecLookup['QDMC']          = 'QDesign Music 1';
-			$QuicktimeAudioCodecLookup['ratb']          = '8-bit Rate';
-			$QuicktimeAudioCodecLookup['ratw']          = '16-bit Rate';
-			$QuicktimeAudioCodecLookup['raw ']          = 'raw PCM';
-			$QuicktimeAudioCodecLookup['sour']          = 'Sound Source';
-			$QuicktimeAudioCodecLookup['sowt']          = 'signed/two\'s complement (Little Endian)';
-			$QuicktimeAudioCodecLookup['str1']          = 'Iomega MPEG layer II';
-			$QuicktimeAudioCodecLookup['str2']          = 'Iomega MPEG *layer II';
-			$QuicktimeAudioCodecLookup['str3']          = 'Iomega MPEG **layer II';
-			$QuicktimeAudioCodecLookup['str4']          = 'Iomega MPEG ***layer II';
-			$QuicktimeAudioCodecLookup['twos']          = 'signed/two\'s complement (Big Endian)';
-			$QuicktimeAudioCodecLookup['ulaw']          = 'mu-law 2:1';
-		}
-		return (isset($QuicktimeAudioCodecLookup[$codecid]) ? $QuicktimeAudioCodecLookup[$codecid] : '');
-	}
-
-	function QuicktimeDCOMLookup($compressionid) {
-		static $QuicktimeDCOMLookup = array();
-		if (empty($QuicktimeDCOMLookup)) {
-			$QuicktimeDCOMLookup['zlib'] = 'ZLib Deflate';
-			$QuicktimeDCOMLookup['adec'] = 'Apple Compression';
-		}
-		return (isset($QuicktimeDCOMLookup[$compressionid]) ? $QuicktimeDCOMLookup[$compressionid] : '');
-	}
-
-	function QuicktimeColorNameLookup($colordepthid) {
-		static $QuicktimeColorNameLookup = array();
-		if (empty($QuicktimeColorNameLookup)) {
-			$QuicktimeColorNameLookup[1]  = '2-color (monochrome)';
-			$QuicktimeColorNameLookup[2]  = '4-color';
-			$QuicktimeColorNameLookup[4]  = '16-color';
-			$QuicktimeColorNameLookup[8]  = '256-color';
-			$QuicktimeColorNameLookup[16] = 'thousands (16-bit color)';
-			$QuicktimeColorNameLookup[24] = 'millions (24-bit color)';
-			$QuicktimeColorNameLookup[32] = 'millions+ (32-bit color)';
-			$QuicktimeColorNameLookup[33] = 'black & white';
-			$QuicktimeColorNameLookup[34] = '4-gray';
-			$QuicktimeColorNameLookup[36] = '16-gray';
-			$QuicktimeColorNameLookup[40] = '256-gray';
-		}
-		return (isset($QuicktimeColorNameLookup[$colordepthid]) ? $QuicktimeColorNameLookup[$colordepthid] : 'invalid');
-	}
-
-	function QuicktimeSTIKLookup($stik) {
-		static $QuicktimeSTIKLookup = array();
-		if (empty($QuicktimeSTIKLookup)) {
-			$QuicktimeSTIKLookup[0]  = 'Movie';
-			$QuicktimeSTIKLookup[1]  = 'Normal';
-			$QuicktimeSTIKLookup[2]  = 'Audiobook';
-			$QuicktimeSTIKLookup[5]  = 'Whacked Bookmark';
-			$QuicktimeSTIKLookup[6]  = 'Music Video';
-			$QuicktimeSTIKLookup[9]  = 'Short Film';
-			$QuicktimeSTIKLookup[10] = 'TV Show';
-			$QuicktimeSTIKLookup[11] = 'Booklet';
-			$QuicktimeSTIKLookup[14] = 'Ringtone';
-			$QuicktimeSTIKLookup[21] = 'Podcast';
-		}
-		return (isset($QuicktimeSTIKLookup[$stik]) ? $QuicktimeSTIKLookup[$stik] : 'invalid');
-	}
-
-	function QuicktimeIODSaudioProfileName($audio_profile_id) {
-		static $QuicktimeIODSaudioProfileNameLookup = array();
-		if (empty($QuicktimeIODSaudioProfileNameLookup)) {
-			$QuicktimeIODSaudioProfileNameLookup = array(
-			    0x00 => 'ISO Reserved (0x00)',
-			    0x01 => 'Main Audio Profile @ Level 1',
-			    0x02 => 'Main Audio Profile @ Level 2',
-			    0x03 => 'Main Audio Profile @ Level 3',
-			    0x04 => 'Main Audio Profile @ Level 4',
-			    0x05 => 'Scalable Audio Profile @ Level 1',
-			    0x06 => 'Scalable Audio Profile @ Level 2',
-			    0x07 => 'Scalable Audio Profile @ Level 3',
-			    0x08 => 'Scalable Audio Profile @ Level 4',
-			    0x09 => 'Speech Audio Profile @ Level 1',
-			    0x0A => 'Speech Audio Profile @ Level 2',
-			    0x0B => 'Synthetic Audio Profile @ Level 1',
-			    0x0C => 'Synthetic Audio Profile @ Level 2',
-			    0x0D => 'Synthetic Audio Profile @ Level 3',
-			    0x0E => 'High Quality Audio Profile @ Level 1',
-			    0x0F => 'High Quality Audio Profile @ Level 2',
-			    0x10 => 'High Quality Audio Profile @ Level 3',
-			    0x11 => 'High Quality Audio Profile @ Level 4',
-			    0x12 => 'High Quality Audio Profile @ Level 5',
-			    0x13 => 'High Quality Audio Profile @ Level 6',
-			    0x14 => 'High Quality Audio Profile @ Level 7',
-			    0x15 => 'High Quality Audio Profile @ Level 8',
-			    0x16 => 'Low Delay Audio Profile @ Level 1',
-			    0x17 => 'Low Delay Audio Profile @ Level 2',
-			    0x18 => 'Low Delay Audio Profile @ Level 3',
-			    0x19 => 'Low Delay Audio Profile @ Level 4',
-			    0x1A => 'Low Delay Audio Profile @ Level 5',
-			    0x1B => 'Low Delay Audio Profile @ Level 6',
-			    0x1C => 'Low Delay Audio Profile @ Level 7',
-			    0x1D => 'Low Delay Audio Profile @ Level 8',
-			    0x1E => 'Natural Audio Profile @ Level 1',
-			    0x1F => 'Natural Audio Profile @ Level 2',
-			    0x20 => 'Natural Audio Profile @ Level 3',
-			    0x21 => 'Natural Audio Profile @ Level 4',
-			    0x22 => 'Mobile Audio Internetworking Profile @ Level 1',
-			    0x23 => 'Mobile Audio Internetworking Profile @ Level 2',
-			    0x24 => 'Mobile Audio Internetworking Profile @ Level 3',
-			    0x25 => 'Mobile Audio Internetworking Profile @ Level 4',
-			    0x26 => 'Mobile Audio Internetworking Profile @ Level 5',
-			    0x27 => 'Mobile Audio Internetworking Profile @ Level 6',
-			    0x28 => 'AAC Profile @ Level 1',
-			    0x29 => 'AAC Profile @ Level 2',
-			    0x2A => 'AAC Profile @ Level 4',
-			    0x2B => 'AAC Profile @ Level 5',
-			    0x2C => 'High Efficiency AAC Profile @ Level 2',
-			    0x2D => 'High Efficiency AAC Profile @ Level 3',
-			    0x2E => 'High Efficiency AAC Profile @ Level 4',
-			    0x2F => 'High Efficiency AAC Profile @ Level 5',
-			    0xFE => 'Not part of MPEG-4 audio profiles',
-			    0xFF => 'No audio capability required',
-			);
-		}
-		return (isset($QuicktimeIODSaudioProfileNameLookup[$audio_profile_id]) ? $QuicktimeIODSaudioProfileNameLookup[$audio_profile_id] : 'ISO Reserved / User Private');
-	}
-
-
-	function QuicktimeIODSvideoProfileName($video_profile_id) {
-		static $QuicktimeIODSvideoProfileNameLookup = array();
-		if (empty($QuicktimeIODSvideoProfileNameLookup)) {
-			$QuicktimeIODSvideoProfileNameLookup = array(
-				0x00 => 'Reserved (0x00) Profile',
-				0x01 => 'Simple Profile @ Level 1',
-				0x02 => 'Simple Profile @ Level 2',
-				0x03 => 'Simple Profile @ Level 3',
-				0x08 => 'Simple Profile @ Level 0',
-				0x10 => 'Simple Scalable Profile @ Level 0',
-				0x11 => 'Simple Scalable Profile @ Level 1',
-				0x12 => 'Simple Scalable Profile @ Level 2',
-				0x15 => 'AVC/H264 Profile',
-				0x21 => 'Core Profile @ Level 1',
-				0x22 => 'Core Profile @ Level 2',
-				0x32 => 'Main Profile @ Level 2',
-				0x33 => 'Main Profile @ Level 3',
-				0x34 => 'Main Profile @ Level 4',
-				0x42 => 'N-bit Profile @ Level 2',
-				0x51 => 'Scalable Texture Profile @ Level 1',
-				0x61 => 'Simple Face Animation Profile @ Level 1',
-				0x62 => 'Simple Face Animation Profile @ Level 2',
-				0x63 => 'Simple FBA Profile @ Level 1',
-				0x64 => 'Simple FBA Profile @ Level 2',
-				0x71 => 'Basic Animated Texture Profile @ Level 1',
-				0x72 => 'Basic Animated Texture Profile @ Level 2',
-				0x81 => 'Hybrid Profile @ Level 1',
-				0x82 => 'Hybrid Profile @ Level 2',
-				0x91 => 'Advanced Real Time Simple Profile @ Level 1',
-				0x92 => 'Advanced Real Time Simple Profile @ Level 2',
-				0x93 => 'Advanced Real Time Simple Profile @ Level 3',
-				0x94 => 'Advanced Real Time Simple Profile @ Level 4',
-				0xA1 => 'Core Scalable Profile @ Level1',
-				0xA2 => 'Core Scalable Profile @ Level2',
-				0xA3 => 'Core Scalable Profile @ Level3',
-				0xB1 => 'Advanced Coding Efficiency Profile @ Level 1',
-				0xB2 => 'Advanced Coding Efficiency Profile @ Level 2',
-				0xB3 => 'Advanced Coding Efficiency Profile @ Level 3',
-				0xB4 => 'Advanced Coding Efficiency Profile @ Level 4',
-				0xC1 => 'Advanced Core Profile @ Level 1',
-				0xC2 => 'Advanced Core Profile @ Level 2',
-				0xD1 => 'Advanced Scalable Texture @ Level1',
-				0xD2 => 'Advanced Scalable Texture @ Level2',
-				0xE1 => 'Simple Studio Profile @ Level 1',
-				0xE2 => 'Simple Studio Profile @ Level 2',
-				0xE3 => 'Simple Studio Profile @ Level 3',
-				0xE4 => 'Simple Studio Profile @ Level 4',
-				0xE5 => 'Core Studio Profile @ Level 1',
-				0xE6 => 'Core Studio Profile @ Level 2',
-				0xE7 => 'Core Studio Profile @ Level 3',
-				0xE8 => 'Core Studio Profile @ Level 4',
-				0xF0 => 'Advanced Simple Profile @ Level 0',
-				0xF1 => 'Advanced Simple Profile @ Level 1',
-				0xF2 => 'Advanced Simple Profile @ Level 2',
-				0xF3 => 'Advanced Simple Profile @ Level 3',
-				0xF4 => 'Advanced Simple Profile @ Level 4',
-				0xF5 => 'Advanced Simple Profile @ Level 5',
-				0xF7 => 'Advanced Simple Profile @ Level 3b',
-				0xF8 => 'Fine Granularity Scalable Profile @ Level 0',
-				0xF9 => 'Fine Granularity Scalable Profile @ Level 1',
-				0xFA => 'Fine Granularity Scalable Profile @ Level 2',
-				0xFB => 'Fine Granularity Scalable Profile @ Level 3',
-				0xFC => 'Fine Granularity Scalable Profile @ Level 4',
-				0xFD => 'Fine Granularity Scalable Profile @ Level 5',
-				0xFE => 'Not part of MPEG-4 Visual profiles',
-				0xFF => 'No visual capability required',
-			);
-		}
-		return (isset($QuicktimeIODSvideoProfileNameLookup[$video_profile_id]) ? $QuicktimeIODSvideoProfileNameLookup[$video_profile_id] : 'ISO Reserved Profile');
-	}
-
-
-	function QuicktimeContentRatingLookup($rtng) {
-		static $QuicktimeContentRatingLookup = array();
-		if (empty($QuicktimeContentRatingLookup)) {
-			$QuicktimeContentRatingLookup[0]  = 'None';
-			$QuicktimeContentRatingLookup[2]  = 'Clean';
-			$QuicktimeContentRatingLookup[4]  = 'Explicit';
-		}
-		return (isset($QuicktimeContentRatingLookup[$rtng]) ? $QuicktimeContentRatingLookup[$rtng] : 'invalid');
-	}
-
-	function QuicktimeStoreAccountTypeLookup($akid) {
-		static $QuicktimeStoreAccountTypeLookup = array();
-		if (empty($QuicktimeStoreAccountTypeLookup)) {
-			$QuicktimeStoreAccountTypeLookup[0] = 'iTunes';
-			$QuicktimeStoreAccountTypeLookup[1] = 'AOL';
-		}
-		return (isset($QuicktimeStoreAccountTypeLookup[$akid]) ? $QuicktimeStoreAccountTypeLookup[$akid] : 'invalid');
-	}
-
-	function QuicktimeStoreFrontCodeLookup($sfid) {
-		static $QuicktimeStoreFrontCodeLookup = array();
-		if (empty($QuicktimeStoreFrontCodeLookup)) {
-			$QuicktimeStoreFrontCodeLookup[143460] = 'Australia';
-			$QuicktimeStoreFrontCodeLookup[143445] = 'Austria';
-			$QuicktimeStoreFrontCodeLookup[143446] = 'Belgium';
-			$QuicktimeStoreFrontCodeLookup[143455] = 'Canada';
-			$QuicktimeStoreFrontCodeLookup[143458] = 'Denmark';
-			$QuicktimeStoreFrontCodeLookup[143447] = 'Finland';
-			$QuicktimeStoreFrontCodeLookup[143442] = 'France';
-			$QuicktimeStoreFrontCodeLookup[143443] = 'Germany';
-			$QuicktimeStoreFrontCodeLookup[143448] = 'Greece';
-			$QuicktimeStoreFrontCodeLookup[143449] = 'Ireland';
-			$QuicktimeStoreFrontCodeLookup[143450] = 'Italy';
-			$QuicktimeStoreFrontCodeLookup[143462] = 'Japan';
-			$QuicktimeStoreFrontCodeLookup[143451] = 'Luxembourg';
-			$QuicktimeStoreFrontCodeLookup[143452] = 'Netherlands';
-			$QuicktimeStoreFrontCodeLookup[143461] = 'New Zealand';
-			$QuicktimeStoreFrontCodeLookup[143457] = 'Norway';
-			$QuicktimeStoreFrontCodeLookup[143453] = 'Portugal';
-			$QuicktimeStoreFrontCodeLookup[143454] = 'Spain';
-			$QuicktimeStoreFrontCodeLookup[143456] = 'Sweden';
-			$QuicktimeStoreFrontCodeLookup[143459] = 'Switzerland';
-			$QuicktimeStoreFrontCodeLookup[143444] = 'United Kingdom';
-			$QuicktimeStoreFrontCodeLookup[143441] = 'United States';
-		}
-		return (isset($QuicktimeStoreFrontCodeLookup[$sfid]) ? $QuicktimeStoreFrontCodeLookup[$sfid] : 'invalid');
-	}
-
-	function QuicktimeParseNikonNCTG($atom_data) {
-		// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#NCTG
-		// Nikon-specific QuickTime tags found in the NCDT atom of MOV videos from some Nikon cameras such as the Coolpix S8000 and D5100
-		// Data is stored as records of:
-		// * 4 bytes record type
-		// * 2 bytes size of data field type:
-		//     0x0001 = flag   (size field *= 1-byte)
-		//     0x0002 = char   (size field *= 1-byte)
-		//     0x0003 = DWORD+ (size field *= 2-byte), values are stored CDAB
-		//     0x0004 = QWORD+ (size field *= 4-byte), values are stored EFGHABCD
-		//     0x0005 = float  (size field *= 8-byte), values are stored aaaabbbb where value is aaaa/bbbb; possibly multiple sets of values appended together
-		//     0x0007 = bytes  (size field *= 1-byte), values are stored as ??????
-		//     0x0008 = ?????  (size field *= 2-byte), values are stored as ??????
-		// * 2 bytes data size field
-		// * ? bytes data (string data may be null-padded; datestamp fields are in the format "2011:05:25 20:24:15")
-		// all integers are stored BigEndian
-
-		$NCTGtagName = array(
-			0x00000001 => 'Make',
-			0x00000002 => 'Model',
-			0x00000003 => 'Software',
-			0x00000011 => 'CreateDate',
-			0x00000012 => 'DateTimeOriginal',
-			0x00000013 => 'FrameCount',
-			0x00000016 => 'FrameRate',
-			0x00000022 => 'FrameWidth',
-			0x00000023 => 'FrameHeight',
-			0x00000032 => 'AudioChannels',
-			0x00000033 => 'AudioBitsPerSample',
-			0x00000034 => 'AudioSampleRate',
-			0x02000001 => 'MakerNoteVersion',
-			0x02000005 => 'WhiteBalance',
-			0x0200000b => 'WhiteBalanceFineTune',
-			0x0200001e => 'ColorSpace',
-			0x02000023 => 'PictureControlData',
-			0x02000024 => 'WorldTime',
-			0x02000032 => 'UnknownInfo',
-			0x02000083 => 'LensType',
-			0x02000084 => 'Lens',
-		);
-
-		$offset = 0;
-		$datalength = strlen($atom_data);
-		$parsed = array();
-		while ($offset < $datalength) {
-//echo getid3_lib::PrintHexBytes(substr($atom_data, $offset, 4)).'<br>';
-			$record_type       = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 4));  $offset += 4;
-			$data_size_type    = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2));  $offset += 2;
-			$data_size         = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2));  $offset += 2;
-			switch ($data_size_type) {
-				case 0x0001: // 0x0001 = flag   (size field *= 1-byte)
-					$data = getid3_lib::BigEndian2Int(substr($atom_data, $offset, $data_size * 1));
-					$offset += ($data_size * 1);
-					break;
-				case 0x0002: // 0x0002 = char   (size field *= 1-byte)
-					$data = substr($atom_data, $offset, $data_size * 1);
-					$offset += ($data_size * 1);
-					$data = rtrim($data, "\x00");
-					break;
-				case 0x0003: // 0x0003 = DWORD+ (size field *= 2-byte), values are stored CDAB
-					$data = '';
-					for ($i = $data_size - 1; $i >= 0; $i--) {
-						$data .= substr($atom_data, $offset + ($i * 2), 2);
-					}
-					$data = getid3_lib::BigEndian2Int($data);
-					$offset += ($data_size * 2);
-					break;
-				case 0x0004: // 0x0004 = QWORD+ (size field *= 4-byte), values are stored EFGHABCD
-					$data = '';
-					for ($i = $data_size - 1; $i >= 0; $i--) {
-						$data .= substr($atom_data, $offset + ($i * 4), 4);
-					}
-					$data = getid3_lib::BigEndian2Int($data);
-					$offset += ($data_size * 4);
-					break;
-				case 0x0005: // 0x0005 = float  (size field *= 8-byte), values are stored aaaabbbb where value is aaaa/bbbb; possibly multiple sets of values appended together
-					$data = array();
-					for ($i = 0; $i < $data_size; $i++) {
-						$numerator    = getid3_lib::BigEndian2Int(substr($atom_data, $offset + ($i * 8) + 0, 4));
-						$denomninator = getid3_lib::BigEndian2Int(substr($atom_data, $offset + ($i * 8) + 4, 4));
-						if ($denomninator == 0) {
-							$data[$i] = false;
-						} else {
-							$data[$i] = (double) $numerator / $denomninator;
-						}
-					}
-					$offset += (8 * $data_size);
-					if (count($data) == 1) {
-						$data = $data[0];
-					}
-					break;
-				case 0x0007: // 0x0007 = bytes  (size field *= 1-byte), values are stored as ??????
-					$data = substr($atom_data, $offset, $data_size * 1);
-					$offset += ($data_size * 1);
-					break;
-				case 0x0008: // 0x0008 = ?????  (size field *= 2-byte), values are stored as ??????
-					$data = substr($atom_data, $offset, $data_size * 2);
-					$offset += ($data_size * 2);
-					break;
-				default:
-echo 'QuicktimeParseNikonNCTG()::unknown $data_size_type: '.$data_size_type.'<br>';
-					break 2;
-			}
-
-			switch ($record_type) {
-				case 0x00000011: // CreateDate
-				case 0x00000012: // DateTimeOriginal
-					$data = strtotime($data);
-					break;
-				case 0x0200001e: // ColorSpace
-					switch ($data) {
-						case 1:
-							$data = 'sRGB';
-							break;
-						case 2:
-							$data = 'Adobe RGB';
-							break;
-					}
-					break;
-				case 0x02000023: // PictureControlData
-					$PictureControlAdjust = array(0=>'default', 1=>'quick', 2=>'full');
-					$FilterEffect = array(0x80=>'off', 0x81=>'yellow', 0x82=>'orange',    0x83=>'red', 0x84=>'green',  0xff=>'n/a');
-					$ToningEffect = array(0x80=>'b&w', 0x81=>'sepia',  0x82=>'cyanotype', 0x83=>'red', 0x84=>'yellow', 0x85=>'green', 0x86=>'blue-green', 0x87=>'blue', 0x88=>'purple-blue', 0x89=>'red-purple', 0xff=>'n/a');
-					$data = array(
-						'PictureControlVersion'     =>                           substr($data,  0,  4),
-						'PictureControlName'        =>                     rtrim(substr($data,  4, 20), "\x00"),
-						'PictureControlBase'        =>                     rtrim(substr($data, 24, 20), "\x00"),
-						//'?'                       =>                           substr($data, 44,  4),
-						'PictureControlAdjust'      => $PictureControlAdjust[ord(substr($data, 48,  1))],
-						'PictureControlQuickAdjust' =>                       ord(substr($data, 49,  1)),
-						'Sharpness'                 =>                       ord(substr($data, 50,  1)),
-						'Contrast'                  =>                       ord(substr($data, 51,  1)),
-						'Brightness'                =>                       ord(substr($data, 52,  1)),
-						'Saturation'                =>                       ord(substr($data, 53,  1)),
-						'HueAdjustment'             =>                       ord(substr($data, 54,  1)),
-						'FilterEffect'              =>         $FilterEffect[ord(substr($data, 55,  1))],
-						'ToningEffect'              =>         $ToningEffect[ord(substr($data, 56,  1))],
-						'ToningSaturation'          =>                       ord(substr($data, 57,  1)),
-					);
-					break;
-				case 0x02000024: // WorldTime
-					// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#WorldTime
-					// timezone is stored as offset from GMT in minutes
-					$timezone = getid3_lib::BigEndian2Int(substr($data, 0, 2));
-					if ($timezone & 0x8000) {
-						$timezone = 0 - (0x10000 - $timezone);
-					}
-					$timezone /= 60;
-
-					$dst = (bool) getid3_lib::BigEndian2Int(substr($data, 2, 1));
-					switch (getid3_lib::BigEndian2Int(substr($data, 3, 1))) {
-						case 2:
-							$datedisplayformat = 'D/M/Y'; break;
-						case 1:
-							$datedisplayformat = 'M/D/Y'; break;
-						case 0:
-						default:
-							$datedisplayformat = 'Y/M/D'; break;
-					}
-
-					$data = array('timezone'=>floatval($timezone), 'dst'=>$dst, 'display'=>$datedisplayformat);
-					break;
-				case 0x02000083: // LensType
-					$data = array(
-						//'_'  => $data,
-						'mf' => (bool) ($data & 0x01),
-						'd'  => (bool) ($data & 0x02),
-						'g'  => (bool) ($data & 0x04),
-						'vr' => (bool) ($data & 0x08),
-					);
-					break;
-			}
-			$tag_name = (isset($NCTGtagName[$record_type]) ? $NCTGtagName[$record_type] : '0x'.str_pad(dechex($record_type), 8, '0', STR_PAD_LEFT));
-			$parsed[$tag_name] = $data;
-		}
-		return $parsed;
-	}
-
-
-	function CopyToAppropriateCommentsSection($keyname, $data, $boxname='') {
-		static $handyatomtranslatorarray = array();
-		if (empty($handyatomtranslatorarray)) {
-			$handyatomtranslatorarray['�cpy'] = 'copyright';
-			$handyatomtranslatorarray['�day'] = 'creation_date';    // iTunes 4.0
-			$handyatomtranslatorarray['�dir'] = 'director';
-			$handyatomtranslatorarray['�ed1'] = 'edit1';
-			$handyatomtranslatorarray['�ed2'] = 'edit2';
-			$handyatomtranslatorarray['�ed3'] = 'edit3';
-			$handyatomtranslatorarray['�ed4'] = 'edit4';
-			$handyatomtranslatorarray['�ed5'] = 'edit5';
-			$handyatomtranslatorarray['�ed6'] = 'edit6';
-			$handyatomtranslatorarray['�ed7'] = 'edit7';
-			$handyatomtranslatorarray['�ed8'] = 'edit8';
-			$handyatomtranslatorarray['�ed9'] = 'edit9';
-			$handyatomtranslatorarray['�fmt'] = 'format';
-			$handyatomtranslatorarray['�inf'] = 'information';
-			$handyatomtranslatorarray['�prd'] = 'producer';
-			$handyatomtranslatorarray['�prf'] = 'performers';
-			$handyatomtranslatorarray['�req'] = 'system_requirements';
-			$handyatomtranslatorarray['�src'] = 'source_credit';
-			$handyatomtranslatorarray['�wrt'] = 'writer';
-
-			// http://www.geocities.com/xhelmboyx/quicktime/formats/qtm-layout.txt
-			$handyatomtranslatorarray['�nam'] = 'title';           // iTunes 4.0
-			$handyatomtranslatorarray['�cmt'] = 'comment';         // iTunes 4.0
-			$handyatomtranslatorarray['�wrn'] = 'warning';
-			$handyatomtranslatorarray['�hst'] = 'host_computer';
-			$handyatomtranslatorarray['�mak'] = 'make';
-			$handyatomtranslatorarray['�mod'] = 'model';
-			$handyatomtranslatorarray['�PRD'] = 'product';
-			$handyatomtranslatorarray['�swr'] = 'software';
-			$handyatomtranslatorarray['�aut'] = 'author';
-			$handyatomtranslatorarray['�ART'] = 'artist';
-			$handyatomtranslatorarray['�trk'] = 'track';
-			$handyatomtranslatorarray['�alb'] = 'album';           // iTunes 4.0
-			$handyatomtranslatorarray['�com'] = 'comment';
-			$handyatomtranslatorarray['�gen'] = 'genre';           // iTunes 4.0
-			$handyatomtranslatorarray['�ope'] = 'composer';
-			$handyatomtranslatorarray['�url'] = 'url';
-			$handyatomtranslatorarray['�enc'] = 'encoder';
-
-			// http://atomicparsley.sourceforge.net/mpeg-4files.html
-			$handyatomtranslatorarray['�art'] = 'artist';           // iTunes 4.0
-			$handyatomtranslatorarray['aART'] = 'album_artist';
-			$handyatomtranslatorarray['trkn'] = 'track_number';     // iTunes 4.0
-			$handyatomtranslatorarray['disk'] = 'disc_number';      // iTunes 4.0
-			$handyatomtranslatorarray['gnre'] = 'genre';            // iTunes 4.0
-			$handyatomtranslatorarray['�too'] = 'encoder';          // iTunes 4.0
-			$handyatomtranslatorarray['tmpo'] = 'bpm';              // iTunes 4.0
-			$handyatomtranslatorarray['cprt'] = 'copyright';        // iTunes 4.0?
-			$handyatomtranslatorarray['cpil'] = 'compilation';      // iTunes 4.0
-			$handyatomtranslatorarray['covr'] = 'picture';          // iTunes 4.0
-			$handyatomtranslatorarray['rtng'] = 'rating';           // iTunes 4.0
-			$handyatomtranslatorarray['�grp'] = 'grouping';         // iTunes 4.2
-			$handyatomtranslatorarray['stik'] = 'stik';             // iTunes 4.9
-			$handyatomtranslatorarray['pcst'] = 'podcast';          // iTunes 4.9
-			$handyatomtranslatorarray['catg'] = 'category';         // iTunes 4.9
-			$handyatomtranslatorarray['keyw'] = 'keyword';          // iTunes 4.9
-			$handyatomtranslatorarray['purl'] = 'podcast_url';      // iTunes 4.9
-			$handyatomtranslatorarray['egid'] = 'episode_guid';     // iTunes 4.9
-			$handyatomtranslatorarray['desc'] = 'description';      // iTunes 5.0
-			$handyatomtranslatorarray['�lyr'] = 'lyrics';           // iTunes 5.0
-			$handyatomtranslatorarray['tvnn'] = 'tv_network_name';  // iTunes 6.0
-			$handyatomtranslatorarray['tvsh'] = 'tv_show_name';     // iTunes 6.0
-			$handyatomtranslatorarray['tvsn'] = 'tv_season';        // iTunes 6.0
-			$handyatomtranslatorarray['tves'] = 'tv_episode';       // iTunes 6.0
-			$handyatomtranslatorarray['purd'] = 'purchase_date';    // iTunes 6.0.2
-			$handyatomtranslatorarray['pgap'] = 'gapless_playback'; // iTunes 7.0
-
-			// http://www.geocities.com/xhelmboyx/quicktime/formats/mp4-layout.txt
-
-
-
-			// boxnames:
-			$handyatomtranslatorarray['iTunSMPB']                    = 'iTunSMPB';
-			$handyatomtranslatorarray['iTunNORM']                    = 'iTunNORM';
-			$handyatomtranslatorarray['Encoding Params']             = 'Encoding Params';
-			$handyatomtranslatorarray['replaygain_track_gain']       = 'replaygain_track_gain';
-			$handyatomtranslatorarray['replaygain_track_peak']       = 'replaygain_track_peak';
-			$handyatomtranslatorarray['replaygain_track_minmax']     = 'replaygain_track_minmax';
-			$handyatomtranslatorarray['MusicIP PUID']                = 'MusicIP PUID';
-			$handyatomtranslatorarray['MusicBrainz Artist Id']       = 'MusicBrainz Artist Id';
-			$handyatomtranslatorarray['MusicBrainz Album Id']        = 'MusicBrainz Album Id';
-			$handyatomtranslatorarray['MusicBrainz Album Artist Id'] = 'MusicBrainz Album Artist Id';
-			$handyatomtranslatorarray['MusicBrainz Track Id']        = 'MusicBrainz Track Id';
-			$handyatomtranslatorarray['MusicBrainz Disc Id']         = 'MusicBrainz Disc Id';
-		}
-		$info = &$this->getid3->info;
-		$comment_key = '';
-		if ($boxname && ($boxname != $keyname) && isset($handyatomtranslatorarray[$boxname])) {
-			$comment_key = $handyatomtranslatorarray[$boxname];
-		} elseif (isset($handyatomtranslatorarray[$keyname])) {
-			$comment_key = $handyatomtranslatorarray[$keyname];
-		}
-		if ($comment_key) {
-			if ($comment_key == 'picture') {
-				if (!is_array($data)) {
-					$image_mime = '';
-					if (preg_match('#^\x89\x50\x4E\x47\x0D\x0A\x1A\x0A#', $data)) {
-						$image_mime = 'image/png';
-					} elseif (preg_match('#^\xFF\xD8\xFF#', $data)) {
-						$image_mime = 'image/jpeg';
-					} elseif (preg_match('#^GIF#', $data)) {
-						$image_mime = 'image/gif';
-					} elseif (preg_match('#^BM#', $data)) {
-						$image_mime = 'image/bmp';
-					}
-					$data = array('data'=>$data, 'image_mime'=>$image_mime);
-				}
-			}
-			$info['quicktime']['comments'][$comment_key][] = $data;
-		}
-		return true;
-	}
-
-	function NoNullString($nullterminatedstring) {
-		// remove the single null terminator on null terminated strings
-		if (substr($nullterminatedstring, strlen($nullterminatedstring) - 1, 1) === "\x00") {
-			return substr($nullterminatedstring, 0, strlen($nullterminatedstring) - 1);
-		}
-		return $nullterminatedstring;
-	}
-
-	function Pascal2String($pascalstring) {
-		// Pascal strings have 1 unsigned byte at the beginning saying how many chars (1-255) are in the string
-		return substr($pascalstring, 1);
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio-video.real.php b/lib/getid3/getid3/module.audio-video.real.php
deleted file mode 100644
index d716e7da3..000000000
--- a/lib/getid3/getid3/module.audio-video.real.php
+++ /dev/null
@@ -1,530 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio-video.real.php                                 //
-// module for analyzing Real Audio/Video files                 //
-// dependencies: module.audio-video.riff.php                   //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
-
-class getid3_real extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat']       = 'real';
-		$info['bitrate']          = 0;
-		$info['playtime_seconds'] = 0;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$ChunkCounter = 0;
-		while (ftell($this->getid3->fp) < $info['avdataend']) {
-			$ChunkData  = fread($this->getid3->fp, 8);
-			$ChunkName  =                           substr($ChunkData, 0, 4);
-			$ChunkSize  = getid3_lib::BigEndian2Int(substr($ChunkData, 4, 4));
-
-			if ($ChunkName == '.ra'."\xFD") {
-				$ChunkData .= fread($this->getid3->fp, $ChunkSize - 8);
-				if ($this->ParseOldRAheader(substr($ChunkData, 0, 128), $info['real']['old_ra_header'])) {
-					$info['audio']['dataformat']      = 'real';
-					$info['audio']['lossless']        = false;
-					$info['audio']['sample_rate']     = $info['real']['old_ra_header']['sample_rate'];
-					$info['audio']['bits_per_sample'] = $info['real']['old_ra_header']['bits_per_sample'];
-					$info['audio']['channels']        = $info['real']['old_ra_header']['channels'];
-
-					$info['playtime_seconds']         = 60 * ($info['real']['old_ra_header']['audio_bytes'] / $info['real']['old_ra_header']['bytes_per_minute']);
-					$info['audio']['bitrate']         =  8 * ($info['real']['old_ra_header']['audio_bytes'] / $info['playtime_seconds']);
-					$info['audio']['codec']           = $this->RealAudioCodecFourCClookup($info['real']['old_ra_header']['fourcc'], $info['audio']['bitrate']);
-
-					foreach ($info['real']['old_ra_header']['comments'] as $key => $valuearray) {
-						if (strlen(trim($valuearray[0])) > 0) {
-							$info['real']['comments'][$key][] = trim($valuearray[0]);
-						}
-					}
-					return true;
-				}
-				$info['error'][] = 'There was a problem parsing this RealAudio file. Please submit it for analysis to info@getid3.org';
-				unset($info['bitrate']);
-				unset($info['playtime_seconds']);
-				return false;
-			}
-
-			// shortcut
-			$info['real']['chunks'][$ChunkCounter] = array();
-			$thisfile_real_chunks_currentchunk = &$info['real']['chunks'][$ChunkCounter];
-
-			$thisfile_real_chunks_currentchunk['name']   = $ChunkName;
-			$thisfile_real_chunks_currentchunk['offset'] = ftell($this->getid3->fp) - 8;
-			$thisfile_real_chunks_currentchunk['length'] = $ChunkSize;
-			if (($thisfile_real_chunks_currentchunk['offset'] + $thisfile_real_chunks_currentchunk['length']) > $info['avdataend']) {
-				$info['warning'][] = 'Chunk "'.$thisfile_real_chunks_currentchunk['name'].'" at offset '.$thisfile_real_chunks_currentchunk['offset'].' claims to be '.$thisfile_real_chunks_currentchunk['length'].' bytes long, which is beyond end of file';
-				return false;
-			}
-
-			if ($ChunkSize > ($this->getid3->fread_buffer_size() + 8)) {
-
-				$ChunkData .= fread($this->getid3->fp, $this->getid3->fread_buffer_size() - 8);
-				fseek($this->getid3->fp, $thisfile_real_chunks_currentchunk['offset'] + $ChunkSize, SEEK_SET);
-
-			} elseif(($ChunkSize - 8) > 0) {
-
-				$ChunkData .= fread($this->getid3->fp, $ChunkSize - 8);
-
-			}
-			$offset = 8;
-
-			switch ($ChunkName) {
-
-				case '.RMF': // RealMedia File Header
-					$thisfile_real_chunks_currentchunk['object_version'] = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 2));
-					$offset += 2;
-					switch ($thisfile_real_chunks_currentchunk['object_version']) {
-
-						case 0:
-							$thisfile_real_chunks_currentchunk['file_version']  = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-							$offset += 4;
-							$thisfile_real_chunks_currentchunk['headers_count'] = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-							$offset += 4;
-							break;
-
-						default:
-							//$info['warning'][] = 'Expected .RMF-object_version to be "0", actual value is "'.$thisfile_real_chunks_currentchunk['object_version'].'" (should not be a problem)';
-							break;
-
-					}
-					break;
-
-
-				case 'PROP': // Properties Header
-					$thisfile_real_chunks_currentchunk['object_version']      = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 2));
-					$offset += 2;
-					if ($thisfile_real_chunks_currentchunk['object_version'] == 0) {
-						$thisfile_real_chunks_currentchunk['max_bit_rate']    = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['avg_bit_rate']    = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['max_packet_size'] = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['avg_packet_size'] = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['num_packets']     = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['duration']        = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['preroll']         = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['index_offset']    = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['data_offset']     = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['num_streams']     = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 2));
-						$offset += 2;
-						$thisfile_real_chunks_currentchunk['flags_raw']       = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 2));
-						$offset += 2;
-						$info['playtime_seconds'] = $thisfile_real_chunks_currentchunk['duration'] / 1000;
-						if ($thisfile_real_chunks_currentchunk['duration'] > 0) {
-							$info['bitrate'] += $thisfile_real_chunks_currentchunk['avg_bit_rate'];
-						}
-						$thisfile_real_chunks_currentchunk['flags']['save_enabled']   = (bool) ($thisfile_real_chunks_currentchunk['flags_raw'] & 0x0001);
-						$thisfile_real_chunks_currentchunk['flags']['perfect_play']   = (bool) ($thisfile_real_chunks_currentchunk['flags_raw'] & 0x0002);
-						$thisfile_real_chunks_currentchunk['flags']['live_broadcast'] = (bool) ($thisfile_real_chunks_currentchunk['flags_raw'] & 0x0004);
-					}
-					break;
-
-				case 'MDPR': // Media Properties Header
-					$thisfile_real_chunks_currentchunk['object_version']         = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 2));
-					$offset += 2;
-					if ($thisfile_real_chunks_currentchunk['object_version'] == 0) {
-						$thisfile_real_chunks_currentchunk['stream_number']      = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 2));
-						$offset += 2;
-						$thisfile_real_chunks_currentchunk['max_bit_rate']       = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['avg_bit_rate']       = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['max_packet_size']    = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['avg_packet_size']    = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['start_time']         = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['preroll']            = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['duration']           = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['stream_name_size']   = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 1));
-						$offset += 1;
-						$thisfile_real_chunks_currentchunk['stream_name']        = substr($ChunkData, $offset, $thisfile_real_chunks_currentchunk['stream_name_size']);
-						$offset += $thisfile_real_chunks_currentchunk['stream_name_size'];
-						$thisfile_real_chunks_currentchunk['mime_type_size']     = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 1));
-						$offset += 1;
-						$thisfile_real_chunks_currentchunk['mime_type']          = substr($ChunkData, $offset, $thisfile_real_chunks_currentchunk['mime_type_size']);
-						$offset += $thisfile_real_chunks_currentchunk['mime_type_size'];
-						$thisfile_real_chunks_currentchunk['type_specific_len']  = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['type_specific_data'] = substr($ChunkData, $offset, $thisfile_real_chunks_currentchunk['type_specific_len']);
-						$offset += $thisfile_real_chunks_currentchunk['type_specific_len'];
-
-						// shortcut
-						$thisfile_real_chunks_currentchunk_typespecificdata = &$thisfile_real_chunks_currentchunk['type_specific_data'];
-
-						switch ($thisfile_real_chunks_currentchunk['mime_type']) {
-							case 'video/x-pn-realvideo':
-							case 'video/x-pn-multirate-realvideo':
-								// http://www.freelists.org/archives/matroska-devel/07-2003/msg00010.html
-
-								// shortcut
-								$thisfile_real_chunks_currentchunk['video_info'] = array();
-								$thisfile_real_chunks_currentchunk_videoinfo     = &$thisfile_real_chunks_currentchunk['video_info'];
-
-								$thisfile_real_chunks_currentchunk_videoinfo['dwSize']            = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata,  0, 4));
-								$thisfile_real_chunks_currentchunk_videoinfo['fourcc1']           =                           substr($thisfile_real_chunks_currentchunk_typespecificdata,  4, 4);
-								$thisfile_real_chunks_currentchunk_videoinfo['fourcc2']           =                           substr($thisfile_real_chunks_currentchunk_typespecificdata,  8, 4);
-								$thisfile_real_chunks_currentchunk_videoinfo['width']             = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 12, 2));
-								$thisfile_real_chunks_currentchunk_videoinfo['height']            = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 14, 2));
-								$thisfile_real_chunks_currentchunk_videoinfo['bits_per_sample']   = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 16, 2));
-								//$thisfile_real_chunks_currentchunk_videoinfo['unknown1']          = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 18, 2));
-								//$thisfile_real_chunks_currentchunk_videoinfo['unknown2']          = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 20, 2));
-								$thisfile_real_chunks_currentchunk_videoinfo['frames_per_second'] = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 22, 2));
-								//$thisfile_real_chunks_currentchunk_videoinfo['unknown3']          = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 24, 2));
-								//$thisfile_real_chunks_currentchunk_videoinfo['unknown4']          = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 26, 2));
-								//$thisfile_real_chunks_currentchunk_videoinfo['unknown5']          = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 28, 2));
-								//$thisfile_real_chunks_currentchunk_videoinfo['unknown6']          = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 30, 2));
-								//$thisfile_real_chunks_currentchunk_videoinfo['unknown7']          = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 32, 2));
-								//$thisfile_real_chunks_currentchunk_videoinfo['unknown8']          = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 34, 2));
-								//$thisfile_real_chunks_currentchunk_videoinfo['unknown9']          = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 36, 2));
-
-								$thisfile_real_chunks_currentchunk_videoinfo['codec'] = getid3_riff::RIFFfourccLookup($thisfile_real_chunks_currentchunk_videoinfo['fourcc2']);
-
-								$info['video']['resolution_x']    =         $thisfile_real_chunks_currentchunk_videoinfo['width'];
-								$info['video']['resolution_y']    =         $thisfile_real_chunks_currentchunk_videoinfo['height'];
-								$info['video']['frame_rate']      = (float) $thisfile_real_chunks_currentchunk_videoinfo['frames_per_second'];
-								$info['video']['codec']           =         $thisfile_real_chunks_currentchunk_videoinfo['codec'];
-								$info['video']['bits_per_sample'] =         $thisfile_real_chunks_currentchunk_videoinfo['bits_per_sample'];
-								break;
-
-							case 'audio/x-pn-realaudio':
-							case 'audio/x-pn-multirate-realaudio':
-								$this->ParseOldRAheader($thisfile_real_chunks_currentchunk_typespecificdata, $thisfile_real_chunks_currentchunk['parsed_audio_data']);
-
-								$info['audio']['sample_rate']     = $thisfile_real_chunks_currentchunk['parsed_audio_data']['sample_rate'];
-								$info['audio']['bits_per_sample'] = $thisfile_real_chunks_currentchunk['parsed_audio_data']['bits_per_sample'];
-								$info['audio']['channels']        = $thisfile_real_chunks_currentchunk['parsed_audio_data']['channels'];
-								if (!empty($info['audio']['dataformat'])) {
-									foreach ($info['audio'] as $key => $value) {
-										if ($key != 'streams') {
-											$info['audio']['streams'][$thisfile_real_chunks_currentchunk['stream_number']][$key] = $value;
-										}
-									}
-								}
-								break;
-
-							case 'logical-fileinfo':
-								// shortcut
-								$thisfile_real_chunks_currentchunk['logical_fileinfo'] = array();
-								$thisfile_real_chunks_currentchunk_logicalfileinfo     = &$thisfile_real_chunks_currentchunk['logical_fileinfo'];
-
-								$thisfile_real_chunks_currentchunk_logicalfileinfo_offset = 0;
-								$thisfile_real_chunks_currentchunk_logicalfileinfo['logical_fileinfo_length'] = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, $thisfile_real_chunks_currentchunk_logicalfileinfo_offset, 4));
-								$thisfile_real_chunks_currentchunk_logicalfileinfo_offset += 4;
-
-								//$thisfile_real_chunks_currentchunk_logicalfileinfo['unknown1']                = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, $thisfile_real_chunks_currentchunk_logicalfileinfo_offset, 4));
-								$thisfile_real_chunks_currentchunk_logicalfileinfo_offset += 4;
-
-								$thisfile_real_chunks_currentchunk_logicalfileinfo['num_tags']                = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, $thisfile_real_chunks_currentchunk_logicalfileinfo_offset, 4));
-								$thisfile_real_chunks_currentchunk_logicalfileinfo_offset += 4;
-
-								//$thisfile_real_chunks_currentchunk_logicalfileinfo['unknown2']                = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, $thisfile_real_chunks_currentchunk_logicalfileinfo_offset, 4));
-								$thisfile_real_chunks_currentchunk_logicalfileinfo_offset += 4;
-
-								//$thisfile_real_chunks_currentchunk_logicalfileinfo['d']                       = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, $thisfile_real_chunks_currentchunk_logicalfileinfo_offset, 1));
-
-								//$thisfile_real_chunks_currentchunk_logicalfileinfo['one_type'] = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata,     $thisfile_real_chunks_currentchunk_logicalfileinfo_offset, 4));
-								//$thisfile_real_chunks_currentchunk_logicalfileinfo_thislength  = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 4 + $thisfile_real_chunks_currentchunk_logicalfileinfo_offset, 2));
-								//$thisfile_real_chunks_currentchunk_logicalfileinfo['one']      =                           substr($thisfile_real_chunks_currentchunk_typespecificdata, 6 + $thisfile_real_chunks_currentchunk_logicalfileinfo_offset, $thisfile_real_chunks_currentchunk_logicalfileinfo_thislength);
-								//$thisfile_real_chunks_currentchunk_logicalfileinfo_offset += (6 + $thisfile_real_chunks_currentchunk_logicalfileinfo_thislength);
-
-								break;
-
-						}
-
-
-						if (empty($info['playtime_seconds'])) {
-							$info['playtime_seconds'] = max($info['playtime_seconds'], ($thisfile_real_chunks_currentchunk['duration'] + $thisfile_real_chunks_currentchunk['start_time']) / 1000);
-						}
-						if ($thisfile_real_chunks_currentchunk['duration'] > 0) {
-							switch ($thisfile_real_chunks_currentchunk['mime_type']) {
-								case 'audio/x-pn-realaudio':
-								case 'audio/x-pn-multirate-realaudio':
-									$info['audio']['bitrate']    = (isset($info['audio']['bitrate']) ? $info['audio']['bitrate'] : 0) + $thisfile_real_chunks_currentchunk['avg_bit_rate'];
-									$info['audio']['codec']      = $this->RealAudioCodecFourCClookup($thisfile_real_chunks_currentchunk['parsed_audio_data']['fourcc'], $info['audio']['bitrate']);
-									$info['audio']['dataformat'] = 'real';
-									$info['audio']['lossless']   = false;
-									break;
-
-								case 'video/x-pn-realvideo':
-								case 'video/x-pn-multirate-realvideo':
-									$info['video']['bitrate']            = (isset($info['video']['bitrate']) ? $info['video']['bitrate'] : 0) + $thisfile_real_chunks_currentchunk['avg_bit_rate'];
-									$info['video']['bitrate_mode']       = 'cbr';
-									$info['video']['dataformat']         = 'real';
-									$info['video']['lossless']           = false;
-									$info['video']['pixel_aspect_ratio'] = (float) 1;
-									break;
-
-								case 'audio/x-ralf-mpeg4-generic':
-									$info['audio']['bitrate']    = (isset($info['audio']['bitrate']) ? $info['audio']['bitrate'] : 0) + $thisfile_real_chunks_currentchunk['avg_bit_rate'];
-									$info['audio']['codec']      = 'RealAudio Lossless';
-									$info['audio']['dataformat'] = 'real';
-									$info['audio']['lossless']   = true;
-									break;
-							}
-							$info['bitrate'] = (isset($info['video']['bitrate']) ? $info['video']['bitrate'] : 0) + (isset($info['audio']['bitrate']) ? $info['audio']['bitrate'] : 0);
-						}
-					}
-					break;
-
-				case 'CONT': // Content Description Header (text comments)
-					$thisfile_real_chunks_currentchunk['object_version'] = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 2));
-					$offset += 2;
-					if ($thisfile_real_chunks_currentchunk['object_version'] == 0) {
-						$thisfile_real_chunks_currentchunk['title_len'] = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 2));
-						$offset += 2;
-						$thisfile_real_chunks_currentchunk['title'] = (string) substr($ChunkData, $offset, $thisfile_real_chunks_currentchunk['title_len']);
-						$offset += $thisfile_real_chunks_currentchunk['title_len'];
-
-						$thisfile_real_chunks_currentchunk['artist_len'] = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 2));
-						$offset += 2;
-						$thisfile_real_chunks_currentchunk['artist'] = (string) substr($ChunkData, $offset, $thisfile_real_chunks_currentchunk['artist_len']);
-						$offset += $thisfile_real_chunks_currentchunk['artist_len'];
-
-						$thisfile_real_chunks_currentchunk['copyright_len'] = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 2));
-						$offset += 2;
-						$thisfile_real_chunks_currentchunk['copyright'] = (string) substr($ChunkData, $offset, $thisfile_real_chunks_currentchunk['copyright_len']);
-						$offset += $thisfile_real_chunks_currentchunk['copyright_len'];
-
-						$thisfile_real_chunks_currentchunk['comment_len'] = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 2));
-						$offset += 2;
-						$thisfile_real_chunks_currentchunk['comment'] = (string) substr($ChunkData, $offset, $thisfile_real_chunks_currentchunk['comment_len']);
-						$offset += $thisfile_real_chunks_currentchunk['comment_len'];
-
-
-						$commentkeystocopy = array('title'=>'title', 'artist'=>'artist', 'copyright'=>'copyright', 'comment'=>'comment');
-						foreach ($commentkeystocopy as $key => $val) {
-							if ($thisfile_real_chunks_currentchunk[$key]) {
-								$info['real']['comments'][$val][] = trim($thisfile_real_chunks_currentchunk[$key]);
-							}
-						}
-
-					}
-					break;
-
-
-				case 'DATA': // Data Chunk Header
-					// do nothing
-					break;
-
-				case 'INDX': // Index Section Header
-					$thisfile_real_chunks_currentchunk['object_version']        = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 2));
-					$offset += 2;
-					if ($thisfile_real_chunks_currentchunk['object_version'] == 0) {
-						$thisfile_real_chunks_currentchunk['num_indices']       = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-						$thisfile_real_chunks_currentchunk['stream_number']     = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 2));
-						$offset += 2;
-						$thisfile_real_chunks_currentchunk['next_index_header'] = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 4));
-						$offset += 4;
-
-						if ($thisfile_real_chunks_currentchunk['next_index_header'] == 0) {
-							// last index chunk found, ignore rest of file
-							break 2;
-						} else {
-							// non-last index chunk, seek to next index chunk (skipping actual index data)
-							fseek($this->getid3->fp, $thisfile_real_chunks_currentchunk['next_index_header'], SEEK_SET);
-						}
-					}
-					break;
-
-				default:
-					$info['warning'][] = 'Unhandled RealMedia chunk "'.$ChunkName.'" at offset '.$thisfile_real_chunks_currentchunk['offset'];
-					break;
-			}
-			$ChunkCounter++;
-		}
-
-		if (!empty($info['audio']['streams'])) {
-			$info['audio']['bitrate'] = 0;
-			foreach ($info['audio']['streams'] as $key => $valuearray) {
-				$info['audio']['bitrate'] += $valuearray['bitrate'];
-			}
-		}
-
-		return true;
-	}
-
-
-	function ParseOldRAheader($OldRAheaderData, &$ParsedArray) {
-		// http://www.freelists.org/archives/matroska-devel/07-2003/msg00010.html
-
-		$ParsedArray = array();
-		$ParsedArray['magic'] = substr($OldRAheaderData, 0, 4);
-		if ($ParsedArray['magic'] != '.ra'."\xFD") {
-			return false;
-		}
-		$ParsedArray['version1']         = getid3_lib::BigEndian2Int(substr($OldRAheaderData,  4, 2));
-
-		if ($ParsedArray['version1'] < 3) {
-
-			return false;
-
-		} elseif ($ParsedArray['version1'] == 3) {
-
-			$ParsedArray['fourcc1']          = '.ra3';
-			$ParsedArray['bits_per_sample']  = 16;   // hard-coded for old versions?
-			$ParsedArray['sample_rate']      = 8000; // hard-coded for old versions?
-
-			$ParsedArray['header_size']      = getid3_lib::BigEndian2Int(substr($OldRAheaderData,  6, 2));
-			$ParsedArray['channels']         = getid3_lib::BigEndian2Int(substr($OldRAheaderData,  8, 2)); // always 1 (?)
-			//$ParsedArray['unknown1']         = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 10, 2));
-			//$ParsedArray['unknown2']         = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 12, 2));
-			//$ParsedArray['unknown3']         = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 14, 2));
-			$ParsedArray['bytes_per_minute'] = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 16, 2));
-			$ParsedArray['audio_bytes']      = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 18, 4));
-			$ParsedArray['comments_raw']     =                           substr($OldRAheaderData, 22, $ParsedArray['header_size'] - 22 + 1); // not including null terminator
-
-			$commentoffset = 0;
-			$commentlength = getid3_lib::BigEndian2Int(substr($ParsedArray['comments_raw'], $commentoffset++, 1));
-			$ParsedArray['comments']['title'][]     = substr($ParsedArray['comments_raw'], $commentoffset, $commentlength);
-			$commentoffset += $commentlength;
-
-			$commentlength = getid3_lib::BigEndian2Int(substr($ParsedArray['comments_raw'], $commentoffset++, 1));
-			$ParsedArray['comments']['artist'][]    = substr($ParsedArray['comments_raw'], $commentoffset, $commentlength);
-			$commentoffset += $commentlength;
-
-			$commentlength = getid3_lib::BigEndian2Int(substr($ParsedArray['comments_raw'], $commentoffset++, 1));
-			$ParsedArray['comments']['copyright'][] = substr($ParsedArray['comments_raw'], $commentoffset, $commentlength);
-			$commentoffset += $commentlength;
-
-			$commentoffset++; // final null terminator (?)
-			$commentoffset++; // fourcc length (?) should be 4
-			$ParsedArray['fourcc']           =                           substr($OldRAheaderData, 23 + $commentoffset, 4);
-
-		} elseif ($ParsedArray['version1'] <= 5) {
-
-			//$ParsedArray['unknown1']         = getid3_lib::BigEndian2Int(substr($OldRAheaderData,  6, 2));
-			$ParsedArray['fourcc1']          =                           substr($OldRAheaderData,  8, 4);
-			$ParsedArray['file_size']        = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 12, 4));
-			$ParsedArray['version2']         = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 16, 2));
-			$ParsedArray['header_size']      = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 18, 4));
-			$ParsedArray['codec_flavor_id']  = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 22, 2));
-			$ParsedArray['coded_frame_size'] = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 24, 4));
-			$ParsedArray['audio_bytes']      = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 28, 4));
-			$ParsedArray['bytes_per_minute'] = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 32, 4));
-			//$ParsedArray['unknown5']         = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 36, 4));
-			$ParsedArray['sub_packet_h']     = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 40, 2));
-			$ParsedArray['frame_size']       = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 42, 2));
-			$ParsedArray['sub_packet_size']  = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 44, 2));
-			//$ParsedArray['unknown6']         = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 46, 2));
-
-			switch ($ParsedArray['version1']) {
-
-				case 4:
-					$ParsedArray['sample_rate']      = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 48, 2));
-					//$ParsedArray['unknown8']         = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 50, 2));
-					$ParsedArray['bits_per_sample']  = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 52, 2));
-					$ParsedArray['channels']         = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 54, 2));
-					$ParsedArray['length_fourcc2']   = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 56, 1));
-					$ParsedArray['fourcc2']          =                           substr($OldRAheaderData, 57, 4);
-					$ParsedArray['length_fourcc3']   = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 61, 1));
-					$ParsedArray['fourcc3']          =                           substr($OldRAheaderData, 62, 4);
-					//$ParsedArray['unknown9']         = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 66, 1));
-					//$ParsedArray['unknown10']        = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 67, 2));
-					$ParsedArray['comments_raw']     =                           substr($OldRAheaderData, 69, $ParsedArray['header_size'] - 69 + 16);
-
-					$commentoffset = 0;
-					$commentlength = getid3_lib::BigEndian2Int(substr($ParsedArray['comments_raw'], $commentoffset++, 1));
-					$ParsedArray['comments']['title'][]     = substr($ParsedArray['comments_raw'], $commentoffset, $commentlength);
-					$commentoffset += $commentlength;
-
-					$commentlength = getid3_lib::BigEndian2Int(substr($ParsedArray['comments_raw'], $commentoffset++, 1));
-					$ParsedArray['comments']['artist'][]    = substr($ParsedArray['comments_raw'], $commentoffset, $commentlength);
-					$commentoffset += $commentlength;
-
-					$commentlength = getid3_lib::BigEndian2Int(substr($ParsedArray['comments_raw'], $commentoffset++, 1));
-					$ParsedArray['comments']['copyright'][] = substr($ParsedArray['comments_raw'], $commentoffset, $commentlength);
-					$commentoffset += $commentlength;
-					break;
-
-				case 5:
-					$ParsedArray['sample_rate']      = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 48, 4));
-					$ParsedArray['sample_rate2']     = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 52, 4));
-					$ParsedArray['bits_per_sample']  = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 56, 4));
-					$ParsedArray['channels']         = getid3_lib::BigEndian2Int(substr($OldRAheaderData, 60, 2));
-					$ParsedArray['genr']             =                           substr($OldRAheaderData, 62, 4);
-					$ParsedArray['fourcc3']          =                           substr($OldRAheaderData, 66, 4);
-					$ParsedArray['comments']         = array();
-					break;
-			}
-			$ParsedArray['fourcc'] = $ParsedArray['fourcc3'];
-
-		}
-		foreach ($ParsedArray['comments'] as $key => $value) {
-			if ($ParsedArray['comments'][$key][0] === false) {
-				$ParsedArray['comments'][$key][0] = '';
-			}
-		}
-
-		return true;
-	}
-
-	function RealAudioCodecFourCClookup($fourcc, $bitrate) {
-		static $RealAudioCodecFourCClookup = array();
-		if (empty($RealAudioCodecFourCClookup)) {
-			// http://www.its.msstate.edu/net/real/reports/config/tags.stats
-			// http://www.freelists.org/archives/matroska-devel/06-2003/fullthread18.html
-
-			$RealAudioCodecFourCClookup['14_4'][8000]  = 'RealAudio v2 (14.4kbps)';
-			$RealAudioCodecFourCClookup['14.4'][8000]  = 'RealAudio v2 (14.4kbps)';
-			$RealAudioCodecFourCClookup['lpcJ'][8000]  = 'RealAudio v2 (14.4kbps)';
-			$RealAudioCodecFourCClookup['28_8'][15200] = 'RealAudio v2 (28.8kbps)';
-			$RealAudioCodecFourCClookup['28.8'][15200] = 'RealAudio v2 (28.8kbps)';
-			$RealAudioCodecFourCClookup['sipr'][4933]  = 'RealAudio v4 (5kbps Voice)';
-			$RealAudioCodecFourCClookup['sipr'][6444]  = 'RealAudio v4 (6.5kbps Voice)';
-			$RealAudioCodecFourCClookup['sipr'][8444]  = 'RealAudio v4 (8.5kbps Voice)';
-			$RealAudioCodecFourCClookup['sipr'][16000] = 'RealAudio v4 (16kbps Wideband)';
-			$RealAudioCodecFourCClookup['dnet'][8000]  = 'RealAudio v3 (8kbps Music)';
-			$RealAudioCodecFourCClookup['dnet'][16000] = 'RealAudio v3 (16kbps Music Low Response)';
-			$RealAudioCodecFourCClookup['dnet'][15963] = 'RealAudio v3 (16kbps Music Mid/High Response)';
-			$RealAudioCodecFourCClookup['dnet'][20000] = 'RealAudio v3 (20kbps Music Stereo)';
-			$RealAudioCodecFourCClookup['dnet'][32000] = 'RealAudio v3 (32kbps Music Mono)';
-			$RealAudioCodecFourCClookup['dnet'][31951] = 'RealAudio v3 (32kbps Music Stereo)';
-			$RealAudioCodecFourCClookup['dnet'][39965] = 'RealAudio v3 (40kbps Music Mono)';
-			$RealAudioCodecFourCClookup['dnet'][40000] = 'RealAudio v3 (40kbps Music Stereo)';
-			$RealAudioCodecFourCClookup['dnet'][79947] = 'RealAudio v3 (80kbps Music Mono)';
-			$RealAudioCodecFourCClookup['dnet'][80000] = 'RealAudio v3 (80kbps Music Stereo)';
-
-			$RealAudioCodecFourCClookup['dnet'][0] = 'RealAudio v3';
-			$RealAudioCodecFourCClookup['sipr'][0] = 'RealAudio v4';
-			$RealAudioCodecFourCClookup['cook'][0] = 'RealAudio G2';
-			$RealAudioCodecFourCClookup['atrc'][0] = 'RealAudio 8';
-		}
-		$roundbitrate = intval(round($bitrate));
-		if (isset($RealAudioCodecFourCClookup[$fourcc][$roundbitrate])) {
-			return $RealAudioCodecFourCClookup[$fourcc][$roundbitrate];
-		} elseif (isset($RealAudioCodecFourCClookup[$fourcc][0])) {
-			return $RealAudioCodecFourCClookup[$fourcc][0];
-		}
-		return $fourcc;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio-video.riff.php b/lib/getid3/getid3/module.audio-video.riff.php
deleted file mode 100644
index 8e8f53a40..000000000
--- a/lib/getid3/getid3/module.audio-video.riff.php
+++ /dev/null
@@ -1,2409 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio-video.riff.php                                 //
-// module for analyzing RIFF files                             //
-// multiple formats supported by this module:                  //
-//    Wave, AVI, AIFF/AIFC, (MP3,AC3)/RIFF, Wavpack v3, 8SVX   //
-// dependencies: module.audio.mp3.php                          //
-//               module.audio.ac3.php (optional)               //
-//               module.audio.dts.php (optional)               //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.mp3.php', __FILE__, true);
-
-class getid3_riff extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		// initialize these values to an empty array, otherwise they default to NULL
-		// and you can't append array values to a NULL value
-		$info['riff'] = array('raw'=>array());
-
-		// Shortcuts
-		$thisfile_riff             = &$info['riff'];
-		$thisfile_riff_raw         = &$thisfile_riff['raw'];
-		$thisfile_audio            = &$info['audio'];
-		$thisfile_video            = &$info['video'];
-		$thisfile_audio_dataformat = &$thisfile_audio['dataformat'];
-		$thisfile_riff_audio       = &$thisfile_riff['audio'];
-		$thisfile_riff_video       = &$thisfile_riff['video'];
-
-
-		$Original['avdataoffset'] = $info['avdataoffset'];
-		$Original['avdataend']    = $info['avdataend'];
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$RIFFheader = fread($this->getid3->fp, 12);
-		$RIFFsubtype = substr($RIFFheader, 8, 4);
-		switch (substr($RIFFheader, 0, 4)) {
-			case 'FORM':
-				$info['fileformat']   = 'aiff';
-				$thisfile_riff['header_size'] = $this->EitherEndian2Int(substr($RIFFheader, 4, 4));
-				$thisfile_riff[$RIFFsubtype]  = $this->ParseRIFF($info['avdataoffset'] + 12, $info['avdataoffset'] + $thisfile_riff['header_size']);
-				break;
-
-			case 'RIFF':  // AVI, WAV, etc
-			case 'SDSS':  // SDSS is identical to RIFF, just renamed. Used by SmartSound QuickTracks (www.smartsound.com)
-			case 'RMP3':  // RMP3 is identical to RIFF, just renamed. Used by [unknown program] when creating RIFF-MP3s
-				$info['fileformat']   = 'riff';
-				$thisfile_riff['header_size'] = $this->EitherEndian2Int(substr($RIFFheader, 4, 4));
-				if ($RIFFsubtype == 'RMP3') {
-					// RMP3 is identical to WAVE, just renamed. Used by [unknown program] when creating RIFF-MP3s
-					$RIFFsubtype = 'WAVE';
-				}
-				$thisfile_riff[$RIFFsubtype]  = $this->ParseRIFF($info['avdataoffset'] + 12, $info['avdataoffset'] + $thisfile_riff['header_size']);
-				if (($info['avdataend'] - $info['filesize']) == 1) {
-					// LiteWave appears to incorrectly *not* pad actual output file
-					// to nearest WORD boundary so may appear to be short by one
-					// byte, in which case - skip warning
-					$info['avdataend'] = $info['filesize'];
-				}
-
-				$nextRIFFoffset = $Original['avdataoffset'] + 8 + $thisfile_riff['header_size']; // 8 = "RIFF" + 32-bit offset
-				while ($nextRIFFoffset < min($info['filesize'], $info['avdataend'])) {
-					if (!getid3_lib::intValueSupported($nextRIFFoffset + 1024)) {
-						$info['error'][]   = 'AVI extends beyond '.round(PHP_INT_MAX / 1073741824).'GB and PHP filesystem functions cannot read that far, playtime is probably wrong';
-						$info['warning'][] = '[avdataend] value may be incorrect, multiple AVIX chunks may be present';
-						break;
-					} else {
-						fseek($this->getid3->fp, $nextRIFFoffset, SEEK_SET);
-						$nextRIFFheader = fread($this->getid3->fp, 12);
-						if ($nextRIFFoffset == ($info['avdataend'] - 1)) {
-							if (substr($nextRIFFheader, 0, 1) == "\x00") {
-								// RIFF padded to WORD boundary, we're actually already at the end
-								break;
-							}
-						}
-						$nextRIFFheaderID =                         substr($nextRIFFheader, 0, 4);
-						$nextRIFFsize     = $this->EitherEndian2Int(substr($nextRIFFheader, 4, 4));
-						$nextRIFFtype     =                         substr($nextRIFFheader, 8, 4);
-						$chunkdata = array();
-						$chunkdata['offset'] = $nextRIFFoffset + 8;
-						$chunkdata['size']   = $nextRIFFsize;
-						$nextRIFFoffset = $chunkdata['offset'] + $chunkdata['size'];
-						switch ($nextRIFFheaderID) {
-							case 'RIFF':
-								$info['avdataend'] = $nextRIFFoffset;
-								if (!getid3_lib::intValueSupported($info['avdataend'])) {
-									$info['error'][]   = 'AVI extends beyond '.round(PHP_INT_MAX / 1073741824).'GB and PHP filesystem functions cannot read that far, playtime is probably wrong';
-									$info['warning'][] = '[avdataend] value may be incorrect, multiple AVIX chunks may be present';
-								}
-								$chunkdata['chunks'] = $this->ParseRIFF($chunkdata['offset'] + 4, $chunkdata['offset'] + $chunkdata['size']);
-
-								if (!isset($thisfile_riff[$nextRIFFtype])) {
-									$thisfile_riff[$nextRIFFtype] = array();
-								}
-								$thisfile_riff[$nextRIFFtype][] = $chunkdata;
-								break;
-							case 'JUNK':
-								// ignore
-								$thisfile_riff[$nextRIFFheaderID][] = $chunkdata;
-								break;
-							default:
-								if ($info['filesize'] == ($chunkdata['offset'] - 8 + 128)) {
-									$DIVXTAG = $nextRIFFheader.fread($this->getid3->fp, 128 - 12);
-									if (substr($DIVXTAG, -7) == 'DIVXTAG') {
-										// DIVXTAG is supposed to be inside an IDVX chunk in a LIST chunk, but some bad encoders just slap it on the end of a file
-										$info['warning'][] = 'Found wrongly-structured DIVXTAG at offset '.(ftell($this->getid3->fp) - 128 + 12).', parsing anyway';
-										$thisfile_riff['DIVXTAG'] = $this->ParseDIVXTAG($DIVXTAG);
-										foreach ($thisfile_riff['DIVXTAG'] as $key => $value) {
-											if ($value && !preg_match('#_id$#', $key)) {
-												$thisfile_riff['comments'][$key][] = $value;
-											}
-										}
-										break 2;
-									}
-								}
-								$info['warning'][] = 'expecting "RIFF" or "JUNK" at '.$nextRIFFoffset.', found '.getid3_lib::PrintHexBytes(substr($nextRIFFheader, 0, 4)).' - skipping rest of file';
-								break 2;
-						}
-					}
-				}
-				if ($RIFFsubtype == 'WAVE') {
-					$thisfile_riff_WAVE = &$thisfile_riff['WAVE'];
-				}
-				break;
-
-			default:
-				$info['error'][] = 'Cannot parse RIFF (this is maybe not a RIFF / WAV / AVI file?) - expecting "FORM|RIFF|SDSS|RMP3" found "'.$RIFFsubtype.'" instead';
-				unset($info['fileformat']);
-				return false;
-				break;
-		}
-
-		$streamindex = 0;
-		switch ($RIFFsubtype) {
-			case 'WAVE':
-				if (empty($thisfile_audio['bitrate_mode'])) {
-					$thisfile_audio['bitrate_mode'] = 'cbr';
-				}
-				if (empty($thisfile_audio_dataformat)) {
-					$thisfile_audio_dataformat = 'wav';
-				}
-
-				if (isset($thisfile_riff_WAVE['data'][0]['offset'])) {
-					$info['avdataoffset'] = $thisfile_riff_WAVE['data'][0]['offset'] + 8;
-					$info['avdataend']    = $info['avdataoffset'] + $thisfile_riff_WAVE['data'][0]['size'];
-				}
-				if (isset($thisfile_riff_WAVE['fmt '][0]['data'])) {
-
-					$thisfile_riff_audio[$streamindex] = getid3_riff::RIFFparseWAVEFORMATex($thisfile_riff_WAVE['fmt '][0]['data']);
-					$thisfile_audio['wformattag'] = $thisfile_riff_audio[$streamindex]['raw']['wFormatTag'];
-					if (!isset($thisfile_riff_audio[$streamindex]['bitrate']) || ($thisfile_riff_audio[$streamindex]['bitrate'] == 0)) {
-						$info['error'][] = 'Corrupt RIFF file: bitrate_audio == zero';
-						return false;
-					}
-					$thisfile_riff_raw['fmt '] = $thisfile_riff_audio[$streamindex]['raw'];
-					unset($thisfile_riff_audio[$streamindex]['raw']);
-					$thisfile_audio['streams'][$streamindex] = $thisfile_riff_audio[$streamindex];
-
-					$thisfile_audio = getid3_lib::array_merge_noclobber($thisfile_audio, $thisfile_riff_audio[$streamindex]);
-					if (substr($thisfile_audio['codec'], 0, strlen('unknown: 0x')) == 'unknown: 0x') {
-						$info['warning'][] = 'Audio codec = '.$thisfile_audio['codec'];
-					}
-					$thisfile_audio['bitrate'] = $thisfile_riff_audio[$streamindex]['bitrate'];
-
-					$info['playtime_seconds'] = (float) ((($info['avdataend'] - $info['avdataoffset']) * 8) / $thisfile_audio['bitrate']);
-
-					$thisfile_audio['lossless'] = false;
-					if (isset($thisfile_riff_WAVE['data'][0]['offset']) && isset($thisfile_riff_raw['fmt ']['wFormatTag'])) {
-						switch ($thisfile_riff_raw['fmt ']['wFormatTag']) {
-
-							case 0x0001:  // PCM
-								$thisfile_audio['lossless'] = true;
-								break;
-
-							case 0x2000:  // AC-3
-								$thisfile_audio_dataformat = 'ac3';
-								break;
-
-							default:
-								// do nothing
-								break;
-
-						}
-					}
-					$thisfile_audio['streams'][$streamindex]['wformattag']   = $thisfile_audio['wformattag'];
-					$thisfile_audio['streams'][$streamindex]['bitrate_mode'] = $thisfile_audio['bitrate_mode'];
-					$thisfile_audio['streams'][$streamindex]['lossless']     = $thisfile_audio['lossless'];
-					$thisfile_audio['streams'][$streamindex]['dataformat']   = $thisfile_audio_dataformat;
-				}
-
-				if (isset($thisfile_riff_WAVE['rgad'][0]['data'])) {
-
-					// shortcuts
-					$rgadData = &$thisfile_riff_WAVE['rgad'][0]['data'];
-					$thisfile_riff_raw['rgad']    = array('track'=>array(), 'album'=>array());
-					$thisfile_riff_raw_rgad       = &$thisfile_riff_raw['rgad'];
-					$thisfile_riff_raw_rgad_track = &$thisfile_riff_raw_rgad['track'];
-					$thisfile_riff_raw_rgad_album = &$thisfile_riff_raw_rgad['album'];
-
-					$thisfile_riff_raw_rgad['fPeakAmplitude']      = getid3_lib::LittleEndian2Float(substr($rgadData, 0, 4));
-					$thisfile_riff_raw_rgad['nRadioRgAdjust']      =        $this->EitherEndian2Int(substr($rgadData, 4, 2));
-					$thisfile_riff_raw_rgad['nAudiophileRgAdjust'] =        $this->EitherEndian2Int(substr($rgadData, 6, 2));
-
-					$nRadioRgAdjustBitstring      = str_pad(getid3_lib::Dec2Bin($thisfile_riff_raw_rgad['nRadioRgAdjust']), 16, '0', STR_PAD_LEFT);
-					$nAudiophileRgAdjustBitstring = str_pad(getid3_lib::Dec2Bin($thisfile_riff_raw_rgad['nAudiophileRgAdjust']), 16, '0', STR_PAD_LEFT);
-					$thisfile_riff_raw_rgad_track['name']       = getid3_lib::Bin2Dec(substr($nRadioRgAdjustBitstring, 0, 3));
-					$thisfile_riff_raw_rgad_track['originator'] = getid3_lib::Bin2Dec(substr($nRadioRgAdjustBitstring, 3, 3));
-					$thisfile_riff_raw_rgad_track['signbit']    = getid3_lib::Bin2Dec(substr($nRadioRgAdjustBitstring, 6, 1));
-					$thisfile_riff_raw_rgad_track['adjustment'] = getid3_lib::Bin2Dec(substr($nRadioRgAdjustBitstring, 7, 9));
-					$thisfile_riff_raw_rgad_album['name']       = getid3_lib::Bin2Dec(substr($nAudiophileRgAdjustBitstring, 0, 3));
-					$thisfile_riff_raw_rgad_album['originator'] = getid3_lib::Bin2Dec(substr($nAudiophileRgAdjustBitstring, 3, 3));
-					$thisfile_riff_raw_rgad_album['signbit']    = getid3_lib::Bin2Dec(substr($nAudiophileRgAdjustBitstring, 6, 1));
-					$thisfile_riff_raw_rgad_album['adjustment'] = getid3_lib::Bin2Dec(substr($nAudiophileRgAdjustBitstring, 7, 9));
-
-					$thisfile_riff['rgad']['peakamplitude'] = $thisfile_riff_raw_rgad['fPeakAmplitude'];
-					if (($thisfile_riff_raw_rgad_track['name'] != 0) && ($thisfile_riff_raw_rgad_track['originator'] != 0)) {
-						$thisfile_riff['rgad']['track']['name']            = getid3_lib::RGADnameLookup($thisfile_riff_raw_rgad_track['name']);
-						$thisfile_riff['rgad']['track']['originator']      = getid3_lib::RGADoriginatorLookup($thisfile_riff_raw_rgad_track['originator']);
-						$thisfile_riff['rgad']['track']['adjustment']      = getid3_lib::RGADadjustmentLookup($thisfile_riff_raw_rgad_track['adjustment'], $thisfile_riff_raw_rgad_track['signbit']);
-					}
-					if (($thisfile_riff_raw_rgad_album['name'] != 0) && ($thisfile_riff_raw_rgad_album['originator'] != 0)) {
-						$thisfile_riff['rgad']['album']['name']       = getid3_lib::RGADnameLookup($thisfile_riff_raw_rgad_album['name']);
-						$thisfile_riff['rgad']['album']['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_riff_raw_rgad_album['originator']);
-						$thisfile_riff['rgad']['album']['adjustment'] = getid3_lib::RGADadjustmentLookup($thisfile_riff_raw_rgad_album['adjustment'], $thisfile_riff_raw_rgad_album['signbit']);
-					}
-				}
-
-				if (isset($thisfile_riff_WAVE['fact'][0]['data'])) {
-					$thisfile_riff_raw['fact']['NumberOfSamples'] = $this->EitherEndian2Int(substr($thisfile_riff_WAVE['fact'][0]['data'], 0, 4));
-
-					// This should be a good way of calculating exact playtime,
-					// but some sample files have had incorrect number of samples,
-					// so cannot use this method
-
-					// if (!empty($thisfile_riff_raw['fmt ']['nSamplesPerSec'])) {
-					//     $info['playtime_seconds'] = (float) $thisfile_riff_raw['fact']['NumberOfSamples'] / $thisfile_riff_raw['fmt ']['nSamplesPerSec'];
-					// }
-				}
-				if (!empty($thisfile_riff_raw['fmt ']['nAvgBytesPerSec'])) {
-					$thisfile_audio['bitrate'] = getid3_lib::CastAsInt($thisfile_riff_raw['fmt ']['nAvgBytesPerSec'] * 8);
-				}
-
-				if (isset($thisfile_riff_WAVE['bext'][0]['data'])) {
-					// shortcut
-					$thisfile_riff_WAVE_bext_0 = &$thisfile_riff_WAVE['bext'][0];
-
-					$thisfile_riff_WAVE_bext_0['title']          =                         trim(substr($thisfile_riff_WAVE_bext_0['data'],   0, 256));
-					$thisfile_riff_WAVE_bext_0['author']         =                         trim(substr($thisfile_riff_WAVE_bext_0['data'], 256,  32));
-					$thisfile_riff_WAVE_bext_0['reference']      =                         trim(substr($thisfile_riff_WAVE_bext_0['data'], 288,  32));
-					$thisfile_riff_WAVE_bext_0['origin_date']    =                              substr($thisfile_riff_WAVE_bext_0['data'], 320,  10);
-					$thisfile_riff_WAVE_bext_0['origin_time']    =                              substr($thisfile_riff_WAVE_bext_0['data'], 330,   8);
-					$thisfile_riff_WAVE_bext_0['time_reference'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_bext_0['data'], 338,   8));
-					$thisfile_riff_WAVE_bext_0['bwf_version']    = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_bext_0['data'], 346,   1));
-					$thisfile_riff_WAVE_bext_0['reserved']       =                              substr($thisfile_riff_WAVE_bext_0['data'], 347, 254);
-					$thisfile_riff_WAVE_bext_0['coding_history'] =         explode("\r\n", trim(substr($thisfile_riff_WAVE_bext_0['data'], 601)));
-					if (preg_match('#^([0-9]{4}).([0-9]{2}).([0-9]{2})$#', $thisfile_riff_WAVE_bext_0['origin_date'], $matches_bext_date)) {
-						if (preg_match('#^([0-9]{2}).([0-9]{2}).([0-9]{2})$#', $thisfile_riff_WAVE_bext_0['origin_time'], $matches_bext_time)) {
-							list($dummy, $bext_timestamp['year'], $bext_timestamp['month'],  $bext_timestamp['day'])    = $matches_bext_date;
-							list($dummy, $bext_timestamp['hour'], $bext_timestamp['minute'], $bext_timestamp['second']) = $matches_bext_time;
-							$thisfile_riff_WAVE_bext_0['origin_date_unix'] = gmmktime($bext_timestamp['hour'], $bext_timestamp['minute'], $bext_timestamp['second'], $bext_timestamp['month'], $bext_timestamp['day'], $bext_timestamp['year']);
-						} else {
-							$info['warning'][] = 'RIFF.WAVE.BEXT.origin_time is invalid';
-						}
-					} else {
-						$info['warning'][] = 'RIFF.WAVE.BEXT.origin_date is invalid';
-					}
-					$thisfile_riff['comments']['author'][] = $thisfile_riff_WAVE_bext_0['author'];
-					$thisfile_riff['comments']['title'][]  = $thisfile_riff_WAVE_bext_0['title'];
-				}
-
-				if (isset($thisfile_riff_WAVE['MEXT'][0]['data'])) {
-					// shortcut
-					$thisfile_riff_WAVE_MEXT_0 = &$thisfile_riff_WAVE['MEXT'][0];
-
-					$thisfile_riff_WAVE_MEXT_0['raw']['sound_information']      = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_MEXT_0['data'], 0, 2));
-					$thisfile_riff_WAVE_MEXT_0['flags']['homogenous']           = (bool) ($thisfile_riff_WAVE_MEXT_0['raw']['sound_information'] & 0x0001);
-					if ($thisfile_riff_WAVE_MEXT_0['flags']['homogenous']) {
-						$thisfile_riff_WAVE_MEXT_0['flags']['padding']          = ($thisfile_riff_WAVE_MEXT_0['raw']['sound_information'] & 0x0002) ? false : true;
-						$thisfile_riff_WAVE_MEXT_0['flags']['22_or_44']         =        (bool) ($thisfile_riff_WAVE_MEXT_0['raw']['sound_information'] & 0x0004);
-						$thisfile_riff_WAVE_MEXT_0['flags']['free_format']      =        (bool) ($thisfile_riff_WAVE_MEXT_0['raw']['sound_information'] & 0x0008);
-
-						$thisfile_riff_WAVE_MEXT_0['nominal_frame_size']        = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_MEXT_0['data'], 2, 2));
-					}
-					$thisfile_riff_WAVE_MEXT_0['anciliary_data_length']         = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_MEXT_0['data'], 6, 2));
-					$thisfile_riff_WAVE_MEXT_0['raw']['anciliary_data_def']     = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_MEXT_0['data'], 8, 2));
-					$thisfile_riff_WAVE_MEXT_0['flags']['anciliary_data_left']  = (bool) ($thisfile_riff_WAVE_MEXT_0['raw']['anciliary_data_def'] & 0x0001);
-					$thisfile_riff_WAVE_MEXT_0['flags']['anciliary_data_free']  = (bool) ($thisfile_riff_WAVE_MEXT_0['raw']['anciliary_data_def'] & 0x0002);
-					$thisfile_riff_WAVE_MEXT_0['flags']['anciliary_data_right'] = (bool) ($thisfile_riff_WAVE_MEXT_0['raw']['anciliary_data_def'] & 0x0004);
-				}
-
-				if (isset($thisfile_riff_WAVE['cart'][0]['data'])) {
-					// shortcut
-					$thisfile_riff_WAVE_cart_0 = &$thisfile_riff_WAVE['cart'][0];
-
-					$thisfile_riff_WAVE_cart_0['version']              =                  substr($thisfile_riff_WAVE_cart_0['data'],    0,    4);
-					$thisfile_riff_WAVE_cart_0['title']                =             trim(substr($thisfile_riff_WAVE_cart_0['data'],    4,   64));
-					$thisfile_riff_WAVE_cart_0['artist']               =             trim(substr($thisfile_riff_WAVE_cart_0['data'],   68,   64));
-					$thisfile_riff_WAVE_cart_0['cut_id']               =             trim(substr($thisfile_riff_WAVE_cart_0['data'],  132,   64));
-					$thisfile_riff_WAVE_cart_0['client_id']            =             trim(substr($thisfile_riff_WAVE_cart_0['data'],  196,   64));
-					$thisfile_riff_WAVE_cart_0['category']             =             trim(substr($thisfile_riff_WAVE_cart_0['data'],  260,   64));
-					$thisfile_riff_WAVE_cart_0['classification']       =             trim(substr($thisfile_riff_WAVE_cart_0['data'],  324,   64));
-					$thisfile_riff_WAVE_cart_0['out_cue']              =             trim(substr($thisfile_riff_WAVE_cart_0['data'],  388,   64));
-					$thisfile_riff_WAVE_cart_0['start_date']           =             trim(substr($thisfile_riff_WAVE_cart_0['data'],  452,   10));
-					$thisfile_riff_WAVE_cart_0['start_time']           =             trim(substr($thisfile_riff_WAVE_cart_0['data'],  462,    8));
-					$thisfile_riff_WAVE_cart_0['end_date']             =             trim(substr($thisfile_riff_WAVE_cart_0['data'],  470,   10));
-					$thisfile_riff_WAVE_cart_0['end_time']             =             trim(substr($thisfile_riff_WAVE_cart_0['data'],  480,    8));
-					$thisfile_riff_WAVE_cart_0['producer_app_id']      =             trim(substr($thisfile_riff_WAVE_cart_0['data'],  488,   64));
-					$thisfile_riff_WAVE_cart_0['producer_app_version'] =             trim(substr($thisfile_riff_WAVE_cart_0['data'],  552,   64));
-					$thisfile_riff_WAVE_cart_0['user_defined_text']    =             trim(substr($thisfile_riff_WAVE_cart_0['data'],  616,   64));
-					$thisfile_riff_WAVE_cart_0['zero_db_reference']    = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_cart_0['data'],  680,    4), true);
-					for ($i = 0; $i < 8; $i++) {
-						$thisfile_riff_WAVE_cart_0['post_time'][$i]['usage_fourcc'] =                  substr($thisfile_riff_WAVE_cart_0['data'], 684 + ($i * 8), 4);
-						$thisfile_riff_WAVE_cart_0['post_time'][$i]['timer_value']  = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_cart_0['data'], 684 + ($i * 8) + 4, 4));
-					}
-					$thisfile_riff_WAVE_cart_0['url']              =                 trim(substr($thisfile_riff_WAVE_cart_0['data'],  748, 1024));
-					$thisfile_riff_WAVE_cart_0['tag_text']         = explode("\r\n", trim(substr($thisfile_riff_WAVE_cart_0['data'], 1772)));
-
-					$thisfile_riff['comments']['artist'][] = $thisfile_riff_WAVE_cart_0['artist'];
-					$thisfile_riff['comments']['title'][]  = $thisfile_riff_WAVE_cart_0['title'];
-				}
-
-				if (isset($thisfile_riff_WAVE['SNDM'][0]['data'])) {
-					// SoundMiner metadata
-
-					// shortcuts
-					$thisfile_riff_WAVE_SNDM_0      = &$thisfile_riff_WAVE['SNDM'][0];
-					$thisfile_riff_WAVE_SNDM_0_data = &$thisfile_riff_WAVE_SNDM_0['data'];
-					$SNDM_startoffset = 0;
-					$SNDM_endoffset   = $thisfile_riff_WAVE_SNDM_0['size'];
-
-					while ($SNDM_startoffset < $SNDM_endoffset) {
-						$SNDM_thisTagOffset = 0;
-						$SNDM_thisTagSize      = getid3_lib::BigEndian2Int(substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, 4));
-						$SNDM_thisTagOffset += 4;
-						$SNDM_thisTagKey       =                           substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, 4);
-						$SNDM_thisTagOffset += 4;
-						$SNDM_thisTagDataSize  = getid3_lib::BigEndian2Int(substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, 2));
-						$SNDM_thisTagOffset += 2;
-						$SNDM_thisTagDataFlags = getid3_lib::BigEndian2Int(substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, 2));
-						$SNDM_thisTagOffset += 2;
-						$SNDM_thisTagDataText =                            substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, $SNDM_thisTagDataSize);
-						$SNDM_thisTagOffset += $SNDM_thisTagDataSize;
-
-						if ($SNDM_thisTagSize != (4 + 4 + 2 + 2 + $SNDM_thisTagDataSize)) {
-							$info['warning'][] = 'RIFF.WAVE.SNDM.data contains tag not expected length (expected: '.$SNDM_thisTagSize.', found: '.(4 + 4 + 2 + 2 + $SNDM_thisTagDataSize).') at offset '.$SNDM_startoffset.' (file offset '.($thisfile_riff_WAVE_SNDM_0['offset'] + $SNDM_startoffset).')';
-							break;
-						} elseif ($SNDM_thisTagSize <= 0) {
-							$info['warning'][] = 'RIFF.WAVE.SNDM.data contains zero-size tag at offset '.$SNDM_startoffset.' (file offset '.($thisfile_riff_WAVE_SNDM_0['offset'] + $SNDM_startoffset).')';
-							break;
-						}
-						$SNDM_startoffset += $SNDM_thisTagSize;
-
-						$thisfile_riff_WAVE_SNDM_0['parsed_raw'][$SNDM_thisTagKey] = $SNDM_thisTagDataText;
-						if ($parsedkey = $this->RIFFwaveSNDMtagLookup($SNDM_thisTagKey)) {
-							$thisfile_riff_WAVE_SNDM_0['parsed'][$parsedkey] = $SNDM_thisTagDataText;
-						} else {
-							$info['warning'][] = 'RIFF.WAVE.SNDM contains unknown tag "'.$SNDM_thisTagKey.'" at offset '.$SNDM_startoffset.' (file offset '.($thisfile_riff_WAVE_SNDM_0['offset'] + $SNDM_startoffset).')';
-						}
-					}
-
-					$tagmapping = array(
-						'tracktitle'=>'title',
-						'category'  =>'genre',
-						'cdtitle'   =>'album',
-						'tracktitle'=>'title',
-					);
-					foreach ($tagmapping as $fromkey => $tokey) {
-						if (isset($thisfile_riff_WAVE_SNDM_0['parsed'][$fromkey])) {
-							$thisfile_riff['comments'][$tokey][] = $thisfile_riff_WAVE_SNDM_0['parsed'][$fromkey];
-						}
-					}
-				}
-
-				if (isset($thisfile_riff_WAVE['iXML'][0]['data'])) {
-					// requires functions simplexml_load_string and get_object_vars
-					if ($parsedXML = getid3_lib::XML2array($thisfile_riff_WAVE['iXML'][0]['data'])) {
-						$thisfile_riff_WAVE['iXML'][0]['parsed'] = $parsedXML;
-						if (isset($parsedXML['SPEED']['MASTER_SPEED'])) {
-							@list($numerator, $denominator) = explode('/', $parsedXML['SPEED']['MASTER_SPEED']);
-							$thisfile_riff_WAVE['iXML'][0]['master_speed'] = $numerator / ($denominator ? $denominator : 1000);
-						}
-						if (isset($parsedXML['SPEED']['TIMECODE_RATE'])) {
-							@list($numerator, $denominator) = explode('/', $parsedXML['SPEED']['TIMECODE_RATE']);
-							$thisfile_riff_WAVE['iXML'][0]['timecode_rate'] = $numerator / ($denominator ? $denominator : 1000);
-						}
-						if (isset($parsedXML['SPEED']['TIMESTAMP_SAMPLES_SINCE_MIDNIGHT_LO']) && !empty($parsedXML['SPEED']['TIMESTAMP_SAMPLE_RATE']) && !empty($thisfile_riff_WAVE['iXML'][0]['timecode_rate'])) {
-							$samples_since_midnight = floatval(ltrim($parsedXML['SPEED']['TIMESTAMP_SAMPLES_SINCE_MIDNIGHT_HI'].$parsedXML['SPEED']['TIMESTAMP_SAMPLES_SINCE_MIDNIGHT_LO'], '0'));
-							$thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] = $samples_since_midnight / $parsedXML['SPEED']['TIMESTAMP_SAMPLE_RATE'];
-							$h = floor( $thisfile_riff_WAVE['iXML'][0]['timecode_seconds']       / 3600);
-							$m = floor(($thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] - ($h * 3600))      / 60);
-							$s = floor( $thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] - ($h * 3600) - ($m * 60));
-							$f =       ($thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] - ($h * 3600) - ($m * 60) - $s) * $thisfile_riff_WAVE['iXML'][0]['timecode_rate'];
-							$thisfile_riff_WAVE['iXML'][0]['timecode_string']       = sprintf('%02d:%02d:%02d:%05.2f', $h, $m, $s,       $f);
-							$thisfile_riff_WAVE['iXML'][0]['timecode_string_round'] = sprintf('%02d:%02d:%02d:%02d',   $h, $m, $s, round($f));
-						}
-						unset($parsedXML);
-					}
-				}
-
-
-
-				if (!isset($thisfile_audio['bitrate']) && isset($thisfile_riff_audio[$streamindex]['bitrate'])) {
-					$thisfile_audio['bitrate'] = $thisfile_riff_audio[$streamindex]['bitrate'];
-					$info['playtime_seconds'] = (float) ((($info['avdataend'] - $info['avdataoffset']) * 8) / $thisfile_audio['bitrate']);
-				}
-
-				if (!empty($info['wavpack'])) {
-					$thisfile_audio_dataformat = 'wavpack';
-					$thisfile_audio['bitrate_mode'] = 'vbr';
-					$thisfile_audio['encoder']      = 'WavPack v'.$info['wavpack']['version'];
-
-					// Reset to the way it was - RIFF parsing will have messed this up
-					$info['avdataend']        = $Original['avdataend'];
-					$thisfile_audio['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-
-					fseek($this->getid3->fp, $info['avdataoffset'] - 44, SEEK_SET);
-					$RIFFdata = fread($this->getid3->fp, 44);
-					$OrignalRIFFheaderSize = getid3_lib::LittleEndian2Int(substr($RIFFdata,  4, 4)) +  8;
-					$OrignalRIFFdataSize   = getid3_lib::LittleEndian2Int(substr($RIFFdata, 40, 4)) + 44;
-
-					if ($OrignalRIFFheaderSize > $OrignalRIFFdataSize) {
-						$info['avdataend'] -= ($OrignalRIFFheaderSize - $OrignalRIFFdataSize);
-						fseek($this->getid3->fp, $info['avdataend'], SEEK_SET);
-						$RIFFdata .= fread($this->getid3->fp, $OrignalRIFFheaderSize - $OrignalRIFFdataSize);
-					}
-
-					// move the data chunk after all other chunks (if any)
-					// so that the RIFF parser doesn't see EOF when trying
-					// to skip over the data chunk
-					$RIFFdata = substr($RIFFdata, 0, 36).substr($RIFFdata, 44).substr($RIFFdata, 36, 8);
-					$getid3_riff = new getid3_riff($this->getid3);
-					$getid3_riff->ParseRIFFdata($RIFFdata);
-					unset($getid3_riff);
-				}
-
-				if (isset($thisfile_riff_raw['fmt ']['wFormatTag'])) {
-					switch ($thisfile_riff_raw['fmt ']['wFormatTag']) {
-						case 0x0001: // PCM
-							if (!empty($info['ac3'])) {
-								// Dolby Digital WAV files masquerade as PCM-WAV, but they're not
-								$thisfile_audio['wformattag']  = 0x2000;
-								$thisfile_audio['codec']       = $this->RIFFwFormatTagLookup($thisfile_audio['wformattag']);
-								$thisfile_audio['lossless']    = false;
-								$thisfile_audio['bitrate']     = $info['ac3']['bitrate'];
-								$thisfile_audio['sample_rate'] = $info['ac3']['sample_rate'];
-							}
-							break;
-						case 0x08AE: // ClearJump LiteWave
-							$thisfile_audio['bitrate_mode'] = 'vbr';
-							$thisfile_audio_dataformat   = 'litewave';
-
-							//typedef struct tagSLwFormat {
-							//  WORD    m_wCompFormat;     // low byte defines compression method, high byte is compression flags
-							//  DWORD   m_dwScale;         // scale factor for lossy compression
-							//  DWORD   m_dwBlockSize;     // number of samples in encoded blocks
-							//  WORD    m_wQuality;        // alias for the scale factor
-							//  WORD    m_wMarkDistance;   // distance between marks in bytes
-							//  WORD    m_wReserved;
-							//
-							//  //following paramters are ignored if CF_FILESRC is not set
-							//  DWORD   m_dwOrgSize;       // original file size in bytes
-							//  WORD    m_bFactExists;     // indicates if 'fact' chunk exists in the original file
-							//  DWORD   m_dwRiffChunkSize; // riff chunk size in the original file
-							//
-							//  PCMWAVEFORMAT m_OrgWf;     // original wave format
-							// }SLwFormat, *PSLwFormat;
-
-							// shortcut
-							$thisfile_riff['litewave']['raw'] = array();
-							$thisfile_riff_litewave     = &$thisfile_riff['litewave'];
-							$thisfile_riff_litewave_raw = &$thisfile_riff_litewave['raw'];
-
-							$thisfile_riff_litewave_raw['compression_method'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 18, 1));
-							$thisfile_riff_litewave_raw['compression_flags']  = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 19, 1));
-							$thisfile_riff_litewave_raw['m_dwScale']          = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 20, 4));
-							$thisfile_riff_litewave_raw['m_dwBlockSize']      = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 24, 4));
-							$thisfile_riff_litewave_raw['m_wQuality']         = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 28, 2));
-							$thisfile_riff_litewave_raw['m_wMarkDistance']    = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 30, 2));
-							$thisfile_riff_litewave_raw['m_wReserved']        = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 32, 2));
-							$thisfile_riff_litewave_raw['m_dwOrgSize']        = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 34, 4));
-							$thisfile_riff_litewave_raw['m_bFactExists']      = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 38, 2));
-							$thisfile_riff_litewave_raw['m_dwRiffChunkSize']  = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 40, 4));
-
-							//$thisfile_riff_litewave['quality_factor'] = intval(round((2000 - $thisfile_riff_litewave_raw['m_dwScale']) / 20));
-							$thisfile_riff_litewave['quality_factor'] = $thisfile_riff_litewave_raw['m_wQuality'];
-
-							$thisfile_riff_litewave['flags']['raw_source']    = ($thisfile_riff_litewave_raw['compression_flags'] & 0x01) ? false : true;
-							$thisfile_riff_litewave['flags']['vbr_blocksize'] = ($thisfile_riff_litewave_raw['compression_flags'] & 0x02) ? false : true;
-							$thisfile_riff_litewave['flags']['seekpoints']    =        (bool) ($thisfile_riff_litewave_raw['compression_flags'] & 0x04);
-
-							$thisfile_audio['lossless']        = (($thisfile_riff_litewave_raw['m_wQuality'] == 100) ? true : false);
-							$thisfile_audio['encoder_options'] = '-q'.$thisfile_riff_litewave['quality_factor'];
-							break;
-
-						default:
-							break;
-					}
-				}
-				if ($info['avdataend'] > $info['filesize']) {
-					switch (!empty($thisfile_audio_dataformat) ? $thisfile_audio_dataformat : '') {
-						case 'wavpack': // WavPack
-						case 'lpac':    // LPAC
-						case 'ofr':     // OptimFROG
-						case 'ofs':     // OptimFROG DualStream
-							// lossless compressed audio formats that keep original RIFF headers - skip warning
-							break;
-
-						case 'litewave':
-							if (($info['avdataend'] - $info['filesize']) == 1) {
-								// LiteWave appears to incorrectly *not* pad actual output file
-								// to nearest WORD boundary so may appear to be short by one
-								// byte, in which case - skip warning
-							} else {
-								// Short by more than one byte, throw warning
-								$info['warning'][] = 'Probably truncated file - expecting '.$thisfile_riff[$RIFFsubtype]['data'][0]['size'].' bytes of data, only found '.($info['filesize'] - $info['avdataoffset']).' (short by '.($thisfile_riff[$RIFFsubtype]['data'][0]['size'] - ($info['filesize'] - $info['avdataoffset'])).' bytes)';
-								$info['avdataend'] = $info['filesize'];
-							}
-							break;
-
-						default:
-							if ((($info['avdataend'] - $info['filesize']) == 1) && (($thisfile_riff[$RIFFsubtype]['data'][0]['size'] % 2) == 0) && ((($info['filesize'] - $info['avdataoffset']) % 2) == 1)) {
-								// output file appears to be incorrectly *not* padded to nearest WORD boundary
-								// Output less severe warning
-								$info['warning'][] = 'File should probably be padded to nearest WORD boundary, but it is not (expecting '.$thisfile_riff[$RIFFsubtype]['data'][0]['size'].' bytes of data, only found '.($info['filesize'] - $info['avdataoffset']).' therefore short by '.($thisfile_riff[$RIFFsubtype]['data'][0]['size'] - ($info['filesize'] - $info['avdataoffset'])).' bytes)';
-								$info['avdataend'] = $info['filesize'];
-							} else {
-								// Short by more than one byte, throw warning
-								$info['warning'][] = 'Probably truncated file - expecting '.$thisfile_riff[$RIFFsubtype]['data'][0]['size'].' bytes of data, only found '.($info['filesize'] - $info['avdataoffset']).' (short by '.($thisfile_riff[$RIFFsubtype]['data'][0]['size'] - ($info['filesize'] - $info['avdataoffset'])).' bytes)';
-								$info['avdataend'] = $info['filesize'];
-							}
-							break;
-					}
-				}
-				if (!empty($info['mpeg']['audio']['LAME']['audio_bytes'])) {
-					if ((($info['avdataend'] - $info['avdataoffset']) - $info['mpeg']['audio']['LAME']['audio_bytes']) == 1) {
-						$info['avdataend']--;
-						$info['warning'][] = 'Extra null byte at end of MP3 data assumed to be RIFF padding and therefore ignored';
-					}
-				}
-				if (isset($thisfile_audio_dataformat) && ($thisfile_audio_dataformat == 'ac3')) {
-					unset($thisfile_audio['bits_per_sample']);
-					if (!empty($info['ac3']['bitrate']) && ($info['ac3']['bitrate'] != $thisfile_audio['bitrate'])) {
-						$thisfile_audio['bitrate'] = $info['ac3']['bitrate'];
-					}
-				}
-				break;
-
-			case 'AVI ':
-				$thisfile_video['bitrate_mode'] = 'vbr'; // maybe not, but probably
-				$thisfile_video['dataformat']   = 'avi';
-				$info['mime_type']      = 'video/avi';
-
-				if (isset($thisfile_riff[$RIFFsubtype]['movi']['offset'])) {
-					$info['avdataoffset'] = $thisfile_riff[$RIFFsubtype]['movi']['offset'] + 8;
-					if (isset($thisfile_riff['AVIX'])) {
-						$info['avdataend'] = $thisfile_riff['AVIX'][(count($thisfile_riff['AVIX']) - 1)]['chunks']['movi']['offset'] + $thisfile_riff['AVIX'][(count($thisfile_riff['AVIX']) - 1)]['chunks']['movi']['size'];
-					} else {
-						$info['avdataend'] = $thisfile_riff['AVI ']['movi']['offset'] + $thisfile_riff['AVI ']['movi']['size'];
-					}
-					if ($info['avdataend'] > $info['filesize']) {
-						$info['warning'][] = 'Probably truncated file - expecting '.($info['avdataend'] - $info['avdataoffset']).' bytes of data, only found '.($info['filesize'] - $info['avdataoffset']).' (short by '.($info['avdataend'] - $info['filesize']).' bytes)';
-						$info['avdataend'] = $info['filesize'];
-					}
-				}
-
-				if (isset($thisfile_riff['AVI ']['hdrl']['strl']['indx'])) {
-					//$bIndexType = array(
-					//	0x00 => 'AVI_INDEX_OF_INDEXES',
-					//	0x01 => 'AVI_INDEX_OF_CHUNKS',
-					//	0x80 => 'AVI_INDEX_IS_DATA',
-					//);
-					//$bIndexSubtype = array(
-					//	0x01 => array(
-					//		0x01 => 'AVI_INDEX_2FIELD',
-					//	),
-					//);
-					foreach ($thisfile_riff['AVI ']['hdrl']['strl']['indx'] as $streamnumber => $steamdataarray) {
-						$thisfile_riff_avi_hdrl_strl_indx_stream_data = &$thisfile_riff['AVI ']['hdrl']['strl']['indx'][$streamnumber]['data'];
-
-						$thisfile_riff_raw['indx'][$streamnumber]['wLongsPerEntry'] = $this->EitherEndian2Int(substr($thisfile_riff_avi_hdrl_strl_indx_stream_data,  0, 2));
-						$thisfile_riff_raw['indx'][$streamnumber]['bIndexSubType']  = $this->EitherEndian2Int(substr($thisfile_riff_avi_hdrl_strl_indx_stream_data,  2, 1));
-						$thisfile_riff_raw['indx'][$streamnumber]['bIndexType']     = $this->EitherEndian2Int(substr($thisfile_riff_avi_hdrl_strl_indx_stream_data,  3, 1));
-						$thisfile_riff_raw['indx'][$streamnumber]['nEntriesInUse']  = $this->EitherEndian2Int(substr($thisfile_riff_avi_hdrl_strl_indx_stream_data,  4, 4));
-						$thisfile_riff_raw['indx'][$streamnumber]['dwChunkId']      =                         substr($thisfile_riff_avi_hdrl_strl_indx_stream_data,  8, 4);
-						$thisfile_riff_raw['indx'][$streamnumber]['dwReserved']     = $this->EitherEndian2Int(substr($thisfile_riff_avi_hdrl_strl_indx_stream_data, 12, 4));
-
-						//$thisfile_riff_raw['indx'][$streamnumber]['bIndexType_name']    =    $bIndexType[$thisfile_riff_raw['indx'][$streamnumber]['bIndexType']];
-						//$thisfile_riff_raw['indx'][$streamnumber]['bIndexSubType_name'] = $bIndexSubtype[$thisfile_riff_raw['indx'][$streamnumber]['bIndexType']][$thisfile_riff_raw['indx'][$streamnumber]['bIndexSubType']];
-
-						unset($thisfile_riff_avi_hdrl_strl_indx_stream_data);
-					}
-				}
-				if (isset($thisfile_riff['AVI ']['hdrl']['avih'][$streamindex]['data'])) {
-					$avihData = $thisfile_riff['AVI ']['hdrl']['avih'][$streamindex]['data'];
-
-					// shortcut
-					$thisfile_riff_raw['avih'] = array();
-					$thisfile_riff_raw_avih = &$thisfile_riff_raw['avih'];
-
-					$thisfile_riff_raw_avih['dwMicroSecPerFrame']    = $this->EitherEndian2Int(substr($avihData,  0, 4)); // frame display rate (or 0L)
-					if ($thisfile_riff_raw_avih['dwMicroSecPerFrame'] == 0) {
-						$info['error'][] = 'Corrupt RIFF file: avih.dwMicroSecPerFrame == zero';
-						return false;
-					}
-					$thisfile_riff_raw_avih['dwMaxBytesPerSec']      = $this->EitherEndian2Int(substr($avihData,  4, 4)); // max. transfer rate
-					$thisfile_riff_raw_avih['dwPaddingGranularity']  = $this->EitherEndian2Int(substr($avihData,  8, 4)); // pad to multiples of this size; normally 2K.
-					$thisfile_riff_raw_avih['dwFlags']               = $this->EitherEndian2Int(substr($avihData, 12, 4)); // the ever-present flags
-					$thisfile_riff_raw_avih['dwTotalFrames']         = $this->EitherEndian2Int(substr($avihData, 16, 4)); // # frames in file
-					$thisfile_riff_raw_avih['dwInitialFrames']       = $this->EitherEndian2Int(substr($avihData, 20, 4));
-					$thisfile_riff_raw_avih['dwStreams']             = $this->EitherEndian2Int(substr($avihData, 24, 4));
-					$thisfile_riff_raw_avih['dwSuggestedBufferSize'] = $this->EitherEndian2Int(substr($avihData, 28, 4));
-					$thisfile_riff_raw_avih['dwWidth']               = $this->EitherEndian2Int(substr($avihData, 32, 4));
-					$thisfile_riff_raw_avih['dwHeight']              = $this->EitherEndian2Int(substr($avihData, 36, 4));
-					$thisfile_riff_raw_avih['dwScale']               = $this->EitherEndian2Int(substr($avihData, 40, 4));
-					$thisfile_riff_raw_avih['dwRate']                = $this->EitherEndian2Int(substr($avihData, 44, 4));
-					$thisfile_riff_raw_avih['dwStart']               = $this->EitherEndian2Int(substr($avihData, 48, 4));
-					$thisfile_riff_raw_avih['dwLength']              = $this->EitherEndian2Int(substr($avihData, 52, 4));
-
-					$thisfile_riff_raw_avih['flags']['hasindex']     = (bool) ($thisfile_riff_raw_avih['dwFlags'] & 0x00000010);
-					$thisfile_riff_raw_avih['flags']['mustuseindex'] = (bool) ($thisfile_riff_raw_avih['dwFlags'] & 0x00000020);
-					$thisfile_riff_raw_avih['flags']['interleaved']  = (bool) ($thisfile_riff_raw_avih['dwFlags'] & 0x00000100);
-					$thisfile_riff_raw_avih['flags']['trustcktype']  = (bool) ($thisfile_riff_raw_avih['dwFlags'] & 0x00000800);
-					$thisfile_riff_raw_avih['flags']['capturedfile'] = (bool) ($thisfile_riff_raw_avih['dwFlags'] & 0x00010000);
-					$thisfile_riff_raw_avih['flags']['copyrighted']  = (bool) ($thisfile_riff_raw_avih['dwFlags'] & 0x00020010);
-
-					// shortcut
-					$thisfile_riff_video[$streamindex] = array();
-					$thisfile_riff_video_current = &$thisfile_riff_video[$streamindex];
-
-					if ($thisfile_riff_raw_avih['dwWidth'] > 0) {
-						$thisfile_riff_video_current['frame_width'] = $thisfile_riff_raw_avih['dwWidth'];
-						$thisfile_video['resolution_x']             = $thisfile_riff_video_current['frame_width'];
-					}
-					if ($thisfile_riff_raw_avih['dwHeight'] > 0) {
-						$thisfile_riff_video_current['frame_height'] = $thisfile_riff_raw_avih['dwHeight'];
-						$thisfile_video['resolution_y']              = $thisfile_riff_video_current['frame_height'];
-					}
-					if ($thisfile_riff_raw_avih['dwTotalFrames'] > 0) {
-						$thisfile_riff_video_current['total_frames'] = $thisfile_riff_raw_avih['dwTotalFrames'];
-						$thisfile_video['total_frames']              = $thisfile_riff_video_current['total_frames'];
-					}
-
-					$thisfile_riff_video_current['frame_rate'] = round(1000000 / $thisfile_riff_raw_avih['dwMicroSecPerFrame'], 3);
-					$thisfile_video['frame_rate'] = $thisfile_riff_video_current['frame_rate'];
-				}
-				if (isset($thisfile_riff['AVI ']['hdrl']['strl']['strh'][0]['data'])) {
-					if (is_array($thisfile_riff['AVI ']['hdrl']['strl']['strh'])) {
-						for ($i = 0; $i < count($thisfile_riff['AVI ']['hdrl']['strl']['strh']); $i++) {
-							if (isset($thisfile_riff['AVI ']['hdrl']['strl']['strh'][$i]['data'])) {
-								$strhData = $thisfile_riff['AVI ']['hdrl']['strl']['strh'][$i]['data'];
-								$strhfccType = substr($strhData,  0, 4);
-
-								if (isset($thisfile_riff['AVI ']['hdrl']['strl']['strf'][$i]['data'])) {
-									$strfData = $thisfile_riff['AVI ']['hdrl']['strl']['strf'][$i]['data'];
-
-									// shortcut
-									$thisfile_riff_raw_strf_strhfccType_streamindex = &$thisfile_riff_raw['strf'][$strhfccType][$streamindex];
-
-									switch ($strhfccType) {
-										case 'auds':
-											$thisfile_audio['bitrate_mode'] = 'cbr';
-											$thisfile_audio_dataformat      = 'wav';
-											if (isset($thisfile_riff_audio) && is_array($thisfile_riff_audio)) {
-												$streamindex = count($thisfile_riff_audio);
-											}
-
-											$thisfile_riff_audio[$streamindex] = getid3_riff::RIFFparseWAVEFORMATex($strfData);
-											$thisfile_audio['wformattag'] = $thisfile_riff_audio[$streamindex]['raw']['wFormatTag'];
-
-											// shortcut
-											$thisfile_audio['streams'][$streamindex] = $thisfile_riff_audio[$streamindex];
-											$thisfile_audio_streams_currentstream = &$thisfile_audio['streams'][$streamindex];
-
-											if ($thisfile_audio_streams_currentstream['bits_per_sample'] == 0) {
-												unset($thisfile_audio_streams_currentstream['bits_per_sample']);
-											}
-											$thisfile_audio_streams_currentstream['wformattag'] = $thisfile_audio_streams_currentstream['raw']['wFormatTag'];
-											unset($thisfile_audio_streams_currentstream['raw']);
-
-											// shortcut
-											$thisfile_riff_raw['strf'][$strhfccType][$streamindex] = $thisfile_riff_audio[$streamindex]['raw'];
-
-											unset($thisfile_riff_audio[$streamindex]['raw']);
-											$thisfile_audio = getid3_lib::array_merge_noclobber($thisfile_audio, $thisfile_riff_audio[$streamindex]);
-
-											$thisfile_audio['lossless'] = false;
-											switch ($thisfile_riff_raw_strf_strhfccType_streamindex['wFormatTag']) {
-												case 0x0001:  // PCM
-													$thisfile_audio_dataformat  = 'wav';
-													$thisfile_audio['lossless'] = true;
-													break;
-
-												case 0x0050: // MPEG Layer 2 or Layer 1
-													$thisfile_audio_dataformat = 'mp2'; // Assume Layer-2
-													break;
-
-												case 0x0055: // MPEG Layer 3
-													$thisfile_audio_dataformat = 'mp3';
-													break;
-
-												case 0x00FF: // AAC
-													$thisfile_audio_dataformat = 'aac';
-													break;
-
-												case 0x0161: // Windows Media v7 / v8 / v9
-												case 0x0162: // Windows Media Professional v9
-												case 0x0163: // Windows Media Lossess v9
-													$thisfile_audio_dataformat = 'wma';
-													break;
-
-												case 0x2000: // AC-3
-													$thisfile_audio_dataformat = 'ac3';
-													break;
-
-												case 0x2001: // DTS
-													$thisfile_audio_dataformat = 'dts';
-													break;
-
-												default:
-													$thisfile_audio_dataformat = 'wav';
-													break;
-											}
-											$thisfile_audio_streams_currentstream['dataformat']   = $thisfile_audio_dataformat;
-											$thisfile_audio_streams_currentstream['lossless']     = $thisfile_audio['lossless'];
-											$thisfile_audio_streams_currentstream['bitrate_mode'] = $thisfile_audio['bitrate_mode'];
-											break;
-
-
-										case 'iavs':
-										case 'vids':
-											// shortcut
-											$thisfile_riff_raw['strh'][$i]                  = array();
-											$thisfile_riff_raw_strh_current                 = &$thisfile_riff_raw['strh'][$i];
-
-											$thisfile_riff_raw_strh_current['fccType']               =                         substr($strhData,  0, 4);  // same as $strhfccType;
-											$thisfile_riff_raw_strh_current['fccHandler']            =                         substr($strhData,  4, 4);
-											$thisfile_riff_raw_strh_current['dwFlags']               = $this->EitherEndian2Int(substr($strhData,  8, 4)); // Contains AVITF_* flags
-											$thisfile_riff_raw_strh_current['wPriority']             = $this->EitherEndian2Int(substr($strhData, 12, 2));
-											$thisfile_riff_raw_strh_current['wLanguage']             = $this->EitherEndian2Int(substr($strhData, 14, 2));
-											$thisfile_riff_raw_strh_current['dwInitialFrames']       = $this->EitherEndian2Int(substr($strhData, 16, 4));
-											$thisfile_riff_raw_strh_current['dwScale']               = $this->EitherEndian2Int(substr($strhData, 20, 4));
-											$thisfile_riff_raw_strh_current['dwRate']                = $this->EitherEndian2Int(substr($strhData, 24, 4));
-											$thisfile_riff_raw_strh_current['dwStart']               = $this->EitherEndian2Int(substr($strhData, 28, 4));
-											$thisfile_riff_raw_strh_current['dwLength']              = $this->EitherEndian2Int(substr($strhData, 32, 4));
-											$thisfile_riff_raw_strh_current['dwSuggestedBufferSize'] = $this->EitherEndian2Int(substr($strhData, 36, 4));
-											$thisfile_riff_raw_strh_current['dwQuality']             = $this->EitherEndian2Int(substr($strhData, 40, 4));
-											$thisfile_riff_raw_strh_current['dwSampleSize']          = $this->EitherEndian2Int(substr($strhData, 44, 4));
-											$thisfile_riff_raw_strh_current['rcFrame']               = $this->EitherEndian2Int(substr($strhData, 48, 4));
-
-											$thisfile_riff_video_current['codec'] = getid3_riff::RIFFfourccLookup($thisfile_riff_raw_strh_current['fccHandler']);
-											$thisfile_video['fourcc']             = $thisfile_riff_raw_strh_current['fccHandler'];
-											if (!$thisfile_riff_video_current['codec'] && isset($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc']) && getid3_riff::RIFFfourccLookup($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'])) {
-												$thisfile_riff_video_current['codec'] = getid3_riff::RIFFfourccLookup($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc']);
-												$thisfile_video['fourcc']             = $thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'];
-											}
-											$thisfile_video['codec']              = $thisfile_riff_video_current['codec'];
-											$thisfile_video['pixel_aspect_ratio'] = (float) 1;
-											switch ($thisfile_riff_raw_strh_current['fccHandler']) {
-												case 'HFYU': // Huffman Lossless Codec
-												case 'IRAW': // Intel YUV Uncompressed
-												case 'YUY2': // Uncompressed YUV 4:2:2
-													$thisfile_video['lossless'] = true;
-													break;
-
-												default:
-													$thisfile_video['lossless'] = false;
-													break;
-											}
-
-											switch ($strhfccType) {
-												case 'vids':
-													$thisfile_riff_raw_strf_strhfccType_streamindex = getid3_riff::ParseBITMAPINFOHEADER(substr($strfData, 0, 40), ($info['fileformat'] == 'riff'));
-//echo '<pre>'.print_r($thisfile_riff_raw_strf_strhfccType_streamindex, true).'</pre>';
-													$thisfile_video['bits_per_sample'] = $thisfile_riff_raw_strf_strhfccType_streamindex['biBitCount'];
-
-													if ($thisfile_riff_video_current['codec'] == 'DV') {
-														$thisfile_riff_video_current['dv_type'] = 2;
-													}
-													break;
-
-												case 'iavs':
-													$thisfile_riff_video_current['dv_type'] = 1;
-													break;
-											}
-											break;
-
-										default:
-											$info['warning'][] = 'Unhandled fccType for stream ('.$i.'): "'.$strhfccType.'"';
-											break;
-
-									}
-								}
-							}
-
-							if (isset($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'])) {
-
-								$thisfile_video['fourcc'] = $thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'];
-								if (getid3_riff::RIFFfourccLookup($thisfile_video['fourcc'])) {
-									$thisfile_riff_video_current['codec'] = getid3_riff::RIFFfourccLookup($thisfile_video['fourcc']);
-									$thisfile_video['codec']              = $thisfile_riff_video_current['codec'];
-								}
-
-								switch ($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc']) {
-									case 'HFYU': // Huffman Lossless Codec
-									case 'IRAW': // Intel YUV Uncompressed
-									case 'YUY2': // Uncompressed YUV 4:2:2
-										$thisfile_video['lossless']        = true;
-										//$thisfile_video['bits_per_sample'] = 24;
-										break;
-
-									default:
-										$thisfile_video['lossless']        = false;
-										//$thisfile_video['bits_per_sample'] = 24;
-										break;
-								}
-
-							}
-						}
-					}
-				}
-				break;
-
-			case 'CDDA':
-				$thisfile_audio['bitrate_mode'] = 'cbr';
-				$thisfile_audio_dataformat      = 'cda';
-				$thisfile_audio['lossless']     = true;
-				unset($info['mime_type']);
-
-				$info['avdataoffset'] = 44;
-
-				if (isset($thisfile_riff['CDDA']['fmt '][0]['data'])) {
-					// shortcut
-					$thisfile_riff_CDDA_fmt_0 = &$thisfile_riff['CDDA']['fmt '][0];
-
-					$thisfile_riff_CDDA_fmt_0['unknown1']           = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'],  0, 2));
-					$thisfile_riff_CDDA_fmt_0['track_num']          = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'],  2, 2));
-					$thisfile_riff_CDDA_fmt_0['disc_id']            = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'],  4, 4));
-					$thisfile_riff_CDDA_fmt_0['start_offset_frame'] = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'],  8, 4));
-					$thisfile_riff_CDDA_fmt_0['playtime_frames']    = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 12, 4));
-					$thisfile_riff_CDDA_fmt_0['unknown6']           = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 16, 4));
-					$thisfile_riff_CDDA_fmt_0['unknown7']           = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 20, 4));
-
-					$thisfile_riff_CDDA_fmt_0['start_offset_seconds'] = (float) $thisfile_riff_CDDA_fmt_0['start_offset_frame'] / 75;
-					$thisfile_riff_CDDA_fmt_0['playtime_seconds']     = (float) $thisfile_riff_CDDA_fmt_0['playtime_frames'] / 75;
-					$info['comments']['track']                = $thisfile_riff_CDDA_fmt_0['track_num'];
-					$info['playtime_seconds']                 = $thisfile_riff_CDDA_fmt_0['playtime_seconds'];
-
-					// hardcoded data for CD-audio
-					$thisfile_audio['sample_rate']     = 44100;
-					$thisfile_audio['channels']        = 2;
-					$thisfile_audio['bits_per_sample'] = 16;
-					$thisfile_audio['bitrate']         = $thisfile_audio['sample_rate'] * $thisfile_audio['channels'] * $thisfile_audio['bits_per_sample'];
-					$thisfile_audio['bitrate_mode']    = 'cbr';
-				}
-				break;
-
-
-			case 'AIFF':
-			case 'AIFC':
-				$thisfile_audio['bitrate_mode'] = 'cbr';
-				$thisfile_audio_dataformat      = 'aiff';
-				$thisfile_audio['lossless']     = true;
-				$info['mime_type']      = 'audio/x-aiff';
-
-				if (isset($thisfile_riff[$RIFFsubtype]['SSND'][0]['offset'])) {
-					$info['avdataoffset'] = $thisfile_riff[$RIFFsubtype]['SSND'][0]['offset'] + 8;
-					$info['avdataend']    = $info['avdataoffset'] + $thisfile_riff[$RIFFsubtype]['SSND'][0]['size'];
-					if ($info['avdataend'] > $info['filesize']) {
-						if (($info['avdataend'] == ($info['filesize'] + 1)) && (($info['filesize'] % 2) == 1)) {
-							// structures rounded to 2-byte boundary, but dumb encoders
-							// forget to pad end of file to make this actually work
-						} else {
-							$info['warning'][] = 'Probable truncated AIFF file: expecting '.$thisfile_riff[$RIFFsubtype]['SSND'][0]['size'].' bytes of audio data, only '.($info['filesize'] - $info['avdataoffset']).' bytes found';
-						}
-						$info['avdataend'] = $info['filesize'];
-					}
-				}
-
-				if (isset($thisfile_riff[$RIFFsubtype]['COMM'][0]['data'])) {
-
-					// shortcut
-					$thisfile_riff_RIFFsubtype_COMM_0_data = &$thisfile_riff[$RIFFsubtype]['COMM'][0]['data'];
-
-					$thisfile_riff_audio['channels']         =         getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_COMM_0_data,  0,  2), true);
-					$thisfile_riff_audio['total_samples']    =         getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_COMM_0_data,  2,  4), false);
-					$thisfile_riff_audio['bits_per_sample']  =         getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_COMM_0_data,  6,  2), true);
-					$thisfile_riff_audio['sample_rate']      = (int) getid3_lib::BigEndian2Float(substr($thisfile_riff_RIFFsubtype_COMM_0_data,  8, 10));
-
-					if ($thisfile_riff[$RIFFsubtype]['COMM'][0]['size'] > 18) {
-						$thisfile_riff_audio['codec_fourcc'] =                                   substr($thisfile_riff_RIFFsubtype_COMM_0_data, 18,  4);
-						$CodecNameSize                       =         getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_COMM_0_data, 22,  1), false);
-						$thisfile_riff_audio['codec_name']   =                                   substr($thisfile_riff_RIFFsubtype_COMM_0_data, 23,  $CodecNameSize);
-						switch ($thisfile_riff_audio['codec_name']) {
-							case 'NONE':
-								$thisfile_audio['codec']    = 'Pulse Code Modulation (PCM)';
-								$thisfile_audio['lossless'] = true;
-								break;
-
-							case '':
-								switch ($thisfile_riff_audio['codec_fourcc']) {
-									// http://developer.apple.com/qa/snd/snd07.html
-									case 'sowt':
-										$thisfile_riff_audio['codec_name'] = 'Two\'s Compliment Little-Endian PCM';
-										$thisfile_audio['lossless'] = true;
-										break;
-
-									case 'twos':
-										$thisfile_riff_audio['codec_name'] = 'Two\'s Compliment Big-Endian PCM';
-										$thisfile_audio['lossless'] = true;
-										break;
-
-									default:
-										break;
-								}
-								break;
-
-							default:
-								$thisfile_audio['codec']    = $thisfile_riff_audio['codec_name'];
-								$thisfile_audio['lossless'] = false;
-								break;
-						}
-					}
-
-					$thisfile_audio['channels']        = $thisfile_riff_audio['channels'];
-					if ($thisfile_riff_audio['bits_per_sample'] > 0) {
-						$thisfile_audio['bits_per_sample'] = $thisfile_riff_audio['bits_per_sample'];
-					}
-					$thisfile_audio['sample_rate']     = $thisfile_riff_audio['sample_rate'];
-					if ($thisfile_audio['sample_rate'] == 0) {
-						$info['error'][] = 'Corrupted AIFF file: sample_rate == zero';
-						return false;
-					}
-					$info['playtime_seconds'] = $thisfile_riff_audio['total_samples'] / $thisfile_audio['sample_rate'];
-				}
-
-				if (isset($thisfile_riff[$RIFFsubtype]['COMT'])) {
-					$offset = 0;
-					$CommentCount                                   = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 2), false);
-					$offset += 2;
-					for ($i = 0; $i < $CommentCount; $i++) {
-						$info['comments_raw'][$i]['timestamp']      = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 4), false);
-						$offset += 4;
-						$info['comments_raw'][$i]['marker_id']      = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 2), true);
-						$offset += 2;
-						$CommentLength                              = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 2), false);
-						$offset += 2;
-						$info['comments_raw'][$i]['comment']        =                           substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, $CommentLength);
-						$offset += $CommentLength;
-
-						$info['comments_raw'][$i]['timestamp_unix'] = getid3_lib::DateMac2Unix($info['comments_raw'][$i]['timestamp']);
-						$thisfile_riff['comments']['comment'][] = $info['comments_raw'][$i]['comment'];
-					}
-				}
-
-				$CommentsChunkNames = array('NAME'=>'title', 'author'=>'artist', '(c) '=>'copyright', 'ANNO'=>'comment');
-				foreach ($CommentsChunkNames as $key => $value) {
-					if (isset($thisfile_riff[$RIFFsubtype][$key][0]['data'])) {
-						$thisfile_riff['comments'][$value][] = $thisfile_riff[$RIFFsubtype][$key][0]['data'];
-					}
-				}
-
-				if (isset($thisfile_riff[$RIFFsubtype]['ID3 '])) {
-					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true);
-					$getid3_temp = new getID3();
-					$getid3_temp->openfile($this->getid3->filename);
-					$getid3_id3v2 = new getid3_id3v2($getid3_temp);
-					$getid3_id3v2->StartingOffset = $thisfile_riff[$RIFFsubtype]['ID3 '][0]['offset'] + 8;
-					if ($thisfile_riff[$RIFFsubtype]['ID3 '][0]['valid'] = $getid3_id3v2->Analyze()) {
-						$info['id3v2'] = $getid3_temp->info['id3v2'];
-					}
-					unset($getid3_temp, $getid3_id3v2);
-				}
-				break;
-
-			case '8SVX':
-				$thisfile_audio['bitrate_mode']    = 'cbr';
-				$thisfile_audio_dataformat         = '8svx';
-				$thisfile_audio['bits_per_sample'] = 8;
-				$thisfile_audio['channels']        = 1; // overridden below, if need be
-				$info['mime_type']                = 'audio/x-aiff';
-
-				if (isset($thisfile_riff[$RIFFsubtype]['BODY'][0]['offset'])) {
-					$info['avdataoffset'] = $thisfile_riff[$RIFFsubtype]['BODY'][0]['offset'] + 8;
-					$info['avdataend']    = $info['avdataoffset'] + $thisfile_riff[$RIFFsubtype]['BODY'][0]['size'];
-					if ($info['avdataend'] > $info['filesize']) {
-						$info['warning'][] = 'Probable truncated AIFF file: expecting '.$thisfile_riff[$RIFFsubtype]['BODY'][0]['size'].' bytes of audio data, only '.($info['filesize'] - $info['avdataoffset']).' bytes found';
-					}
-				}
-
-				if (isset($thisfile_riff[$RIFFsubtype]['VHDR'][0]['offset'])) {
-					// shortcut
-					$thisfile_riff_RIFFsubtype_VHDR_0 = &$thisfile_riff[$RIFFsubtype]['VHDR'][0];
-
-					$thisfile_riff_RIFFsubtype_VHDR_0['oneShotHiSamples']  =   getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'],  0, 4));
-					$thisfile_riff_RIFFsubtype_VHDR_0['repeatHiSamples']   =   getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'],  4, 4));
-					$thisfile_riff_RIFFsubtype_VHDR_0['samplesPerHiCycle'] =   getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'],  8, 4));
-					$thisfile_riff_RIFFsubtype_VHDR_0['samplesPerSec']     =   getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'], 12, 2));
-					$thisfile_riff_RIFFsubtype_VHDR_0['ctOctave']          =   getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'], 14, 1));
-					$thisfile_riff_RIFFsubtype_VHDR_0['sCompression']      =   getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'], 15, 1));
-					$thisfile_riff_RIFFsubtype_VHDR_0['Volume']            = getid3_lib::FixedPoint16_16(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'], 16, 4));
-
-					$thisfile_audio['sample_rate'] = $thisfile_riff_RIFFsubtype_VHDR_0['samplesPerSec'];
-
-					switch ($thisfile_riff_RIFFsubtype_VHDR_0['sCompression']) {
-						case 0:
-							$thisfile_audio['codec']    = 'Pulse Code Modulation (PCM)';
-							$thisfile_audio['lossless'] = true;
-							$ActualBitsPerSample        = 8;
-							break;
-
-						case 1:
-							$thisfile_audio['codec']    = 'Fibonacci-delta encoding';
-							$thisfile_audio['lossless'] = false;
-							$ActualBitsPerSample        = 4;
-							break;
-
-						default:
-							$info['warning'][] = 'Unexpected sCompression value in 8SVX.VHDR chunk - expecting 0 or 1, found "'.sCompression.'"';
-							break;
-					}
-				}
-
-				if (isset($thisfile_riff[$RIFFsubtype]['CHAN'][0]['data'])) {
-					$ChannelsIndex = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['CHAN'][0]['data'], 0, 4));
-					switch ($ChannelsIndex) {
-						case 6: // Stereo
-							$thisfile_audio['channels'] = 2;
-							break;
-
-						case 2: // Left channel only
-						case 4: // Right channel only
-							$thisfile_audio['channels'] = 1;
-							break;
-
-						default:
-							$info['warning'][] = 'Unexpected value in 8SVX.CHAN chunk - expecting 2 or 4 or 6, found "'.$ChannelsIndex.'"';
-							break;
-					}
-
-				}
-
-				$CommentsChunkNames = array('NAME'=>'title', 'author'=>'artist', '(c) '=>'copyright', 'ANNO'=>'comment');
-				foreach ($CommentsChunkNames as $key => $value) {
-					if (isset($thisfile_riff[$RIFFsubtype][$key][0]['data'])) {
-						$thisfile_riff['comments'][$value][] = $thisfile_riff[$RIFFsubtype][$key][0]['data'];
-					}
-				}
-
-				$thisfile_audio['bitrate'] = $thisfile_audio['sample_rate'] * $ActualBitsPerSample * $thisfile_audio['channels'];
-				if (!empty($thisfile_audio['bitrate'])) {
-					$info['playtime_seconds'] = ($info['avdataend'] - $info['avdataoffset']) / ($thisfile_audio['bitrate'] / 8);
-				}
-				break;
-
-
-			case 'CDXA':
-				$info['mime_type'] = 'video/mpeg';
-				if (!empty($thisfile_riff['CDXA']['data'][0]['size'])) {
-					if (getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.mpeg.php', __FILE__, false)) {
-						$getid3_temp = new getID3();
-						$getid3_temp->openfile($this->getid3->filename);
-						$getid3_mpeg = new getid3_mpeg($getid3_temp);
-						$getid3_mpeg->Analyze();
-						if (empty($getid3_temp->info['error'])) {
-							$info['audio']   = $getid3_temp->info['audio'];
-							$info['video']   = $getid3_temp->info['video'];
-							$info['mpeg']    = $getid3_temp->info['mpeg'];
-							$info['warning'] = $getid3_temp->info['warning'];
-						}
-						unset($getid3_temp, $getid3_mpeg);
-					}
-				}
-				break;
-
-
-			default:
-				$info['error'][] = 'Unknown RIFF type: expecting one of (WAVE|RMP3|AVI |CDDA|AIFF|AIFC|8SVX|CDXA), found "'.$RIFFsubtype.'" instead';
-				unset($info['fileformat']);
-				break;
-		}
-
-		if (isset($thisfile_riff_raw['fmt ']['wFormatTag']) && ($thisfile_riff_raw['fmt ']['wFormatTag'] == 1)) {
-			// http://www.mega-nerd.com/erikd/Blog/Windiots/dts.html
-			fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-			$FirstFourBytes = fread($this->getid3->fp, 4);
-			if (preg_match('/^\xFF\x1F\x00\xE8/s', $FirstFourBytes)) {
-				// DTSWAV
-				$thisfile_audio_dataformat = 'dts';
-			} elseif (preg_match('/^\x7F\xFF\x80\x01/s', $FirstFourBytes)) {
-				// DTS, but this probably shouldn't happen
-				$thisfile_audio_dataformat = 'dts';
-			}
-		}
-
-
-		if (isset($thisfile_riff_WAVE['DISP']) && is_array($thisfile_riff_WAVE['DISP'])) {
-			$thisfile_riff['comments']['title'][] = trim(substr($thisfile_riff_WAVE['DISP'][count($thisfile_riff_WAVE['DISP']) - 1]['data'], 4));
-		}
-		if (isset($thisfile_riff_WAVE['INFO']) && is_array($thisfile_riff_WAVE['INFO'])) {
-			$this->RIFFcommentsParse($thisfile_riff_WAVE['INFO'], $thisfile_riff['comments']);
-		}
-		if (isset($thisfile_riff['AVI ']['INFO']) && is_array($thisfile_riff['AVI ']['INFO'])) {
-			$this->RIFFcommentsParse($thisfile_riff['AVI ']['INFO'], $thisfile_riff['comments']);
-		}
-
-		if (empty($thisfile_audio['encoder']) && !empty($info['mpeg']['audio']['LAME']['short_version'])) {
-			$thisfile_audio['encoder'] = $info['mpeg']['audio']['LAME']['short_version'];
-		}
-
-		if (!isset($info['playtime_seconds'])) {
-			$info['playtime_seconds'] = 0;
-		}
-		if (isset($thisfile_riff_raw['strh'][0]['dwLength']) && isset($thisfile_riff_raw['avih']['dwMicroSecPerFrame'])) {
-			// needed for >2GB AVIs where 'avih' chunk only lists number of frames in that chunk, not entire movie
-			$info['playtime_seconds'] = $thisfile_riff_raw['strh'][0]['dwLength'] * ($thisfile_riff_raw['avih']['dwMicroSecPerFrame'] / 1000000);
-		} elseif (isset($thisfile_riff_raw['avih']['dwTotalFrames']) && isset($thisfile_riff_raw['avih']['dwMicroSecPerFrame'])) {
-			$info['playtime_seconds'] = $thisfile_riff_raw['avih']['dwTotalFrames'] * ($thisfile_riff_raw['avih']['dwMicroSecPerFrame'] / 1000000);
-		}
-
-		if ($info['playtime_seconds'] > 0) {
-			if (isset($thisfile_riff_audio) && isset($thisfile_riff_video)) {
-
-				if (!isset($info['bitrate'])) {
-					$info['bitrate'] = ((($info['avdataend'] - $info['avdataoffset']) / $info['playtime_seconds']) * 8);
-				}
-
-			} elseif (isset($thisfile_riff_audio) && !isset($thisfile_riff_video)) {
-
-				if (!isset($thisfile_audio['bitrate'])) {
-					$thisfile_audio['bitrate'] = ((($info['avdataend'] - $info['avdataoffset']) / $info['playtime_seconds']) * 8);
-				}
-
-			} elseif (!isset($thisfile_riff_audio) && isset($thisfile_riff_video)) {
-
-				if (!isset($thisfile_video['bitrate'])) {
-					$thisfile_video['bitrate'] = ((($info['avdataend'] - $info['avdataoffset']) / $info['playtime_seconds']) * 8);
-				}
-
-			}
-		}
-
-
-		if (isset($thisfile_riff_video) && isset($thisfile_audio['bitrate']) && ($thisfile_audio['bitrate'] > 0) && ($info['playtime_seconds'] > 0)) {
-
-			$info['bitrate'] = ((($info['avdataend'] - $info['avdataoffset']) / $info['playtime_seconds']) * 8);
-			$thisfile_audio['bitrate'] = 0;
-			$thisfile_video['bitrate'] = $info['bitrate'];
-			foreach ($thisfile_riff_audio as $channelnumber => $audioinfoarray) {
-				$thisfile_video['bitrate'] -= $audioinfoarray['bitrate'];
-				$thisfile_audio['bitrate'] += $audioinfoarray['bitrate'];
-			}
-			if ($thisfile_video['bitrate'] <= 0) {
-				unset($thisfile_video['bitrate']);
-			}
-			if ($thisfile_audio['bitrate'] <= 0) {
-				unset($thisfile_audio['bitrate']);
-			}
-		}
-
-		if (isset($info['mpeg']['audio'])) {
-			$thisfile_audio_dataformat      = 'mp'.$info['mpeg']['audio']['layer'];
-			$thisfile_audio['sample_rate']  = $info['mpeg']['audio']['sample_rate'];
-			$thisfile_audio['channels']     = $info['mpeg']['audio']['channels'];
-			$thisfile_audio['bitrate']      = $info['mpeg']['audio']['bitrate'];
-			$thisfile_audio['bitrate_mode'] = strtolower($info['mpeg']['audio']['bitrate_mode']);
-			if (!empty($info['mpeg']['audio']['codec'])) {
-				$thisfile_audio['codec'] = $info['mpeg']['audio']['codec'].' '.$thisfile_audio['codec'];
-			}
-			if (!empty($thisfile_audio['streams'])) {
-				foreach ($thisfile_audio['streams'] as $streamnumber => $streamdata) {
-					if ($streamdata['dataformat'] == $thisfile_audio_dataformat) {
-						$thisfile_audio['streams'][$streamnumber]['sample_rate']  = $thisfile_audio['sample_rate'];
-						$thisfile_audio['streams'][$streamnumber]['channels']     = $thisfile_audio['channels'];
-						$thisfile_audio['streams'][$streamnumber]['bitrate']      = $thisfile_audio['bitrate'];
-						$thisfile_audio['streams'][$streamnumber]['bitrate_mode'] = $thisfile_audio['bitrate_mode'];
-						$thisfile_audio['streams'][$streamnumber]['codec']        = $thisfile_audio['codec'];
-					}
-				}
-			}
-			$getid3_mp3 = new getid3_mp3($this->getid3);
-			$thisfile_audio['encoder_options'] = $getid3_mp3->GuessEncoderOptions();
-			unset($getid3_mp3);
-		}
-
-
-		if (!empty($thisfile_riff_raw['fmt ']['wBitsPerSample']) && ($thisfile_riff_raw['fmt ']['wBitsPerSample'] > 0)) {
-			switch ($thisfile_audio_dataformat) {
-				case 'ac3':
-					// ignore bits_per_sample
-					break;
-
-				default:
-					$thisfile_audio['bits_per_sample'] = $thisfile_riff_raw['fmt ']['wBitsPerSample'];
-					break;
-			}
-		}
-
-
-		if (empty($thisfile_riff_raw)) {
-			unset($thisfile_riff['raw']);
-		}
-		if (empty($thisfile_riff_audio)) {
-			unset($thisfile_riff['audio']);
-		}
-		if (empty($thisfile_riff_video)) {
-			unset($thisfile_riff['video']);
-		}
-
-		return true;
-	}
-
-
-	static function RIFFcommentsParse(&$RIFFinfoArray, &$CommentsTargetArray) {
-		$RIFFinfoKeyLookup = array(
-			'IARL'=>'archivallocation',
-			'IART'=>'artist',
-			'ICDS'=>'costumedesigner',
-			'ICMS'=>'commissionedby',
-			'ICMT'=>'comment',
-			'ICNT'=>'country',
-			'ICOP'=>'copyright',
-			'ICRD'=>'creationdate',
-			'IDIM'=>'dimensions',
-			'IDIT'=>'digitizationdate',
-			'IDPI'=>'resolution',
-			'IDST'=>'distributor',
-			'IEDT'=>'editor',
-			'IENG'=>'engineers',
-			'IFRM'=>'accountofparts',
-			'IGNR'=>'genre',
-			'IKEY'=>'keywords',
-			'ILGT'=>'lightness',
-			'ILNG'=>'language',
-			'IMED'=>'orignalmedium',
-			'IMUS'=>'composer',
-			'INAM'=>'title',
-			'IPDS'=>'productiondesigner',
-			'IPLT'=>'palette',
-			'IPRD'=>'product',
-			'IPRO'=>'producer',
-			'IPRT'=>'part',
-			'IRTD'=>'rating',
-			'ISBJ'=>'subject',
-			'ISFT'=>'software',
-			'ISGN'=>'secondarygenre',
-			'ISHP'=>'sharpness',
-			'ISRC'=>'sourcesupplier',
-			'ISRF'=>'digitizationsource',
-			'ISTD'=>'productionstudio',
-			'ISTR'=>'starring',
-			'ITCH'=>'encoded_by',
-			'IWEB'=>'url',
-			'IWRI'=>'writer'
-		);
-		foreach ($RIFFinfoKeyLookup as $key => $value) {
-			if (isset($RIFFinfoArray[$key])) {
-				foreach ($RIFFinfoArray[$key] as $commentid => $commentdata) {
-					if (trim($commentdata['data']) != '') {
-						if (isset($CommentsTargetArray[$value])) {
-							$CommentsTargetArray[$value][] =     trim($commentdata['data']);
-						} else {
-							$CommentsTargetArray[$value] = array(trim($commentdata['data']));
-						}
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-	function ParseRIFF($startoffset, $maxoffset) {
-		$info = &$this->getid3->info;
-
-		$maxoffset = min($maxoffset, $info['avdataend']);
-
-		$RIFFchunk = false;
-		$FoundAllChunksWeNeed = false;
-
-		if (($startoffset < 0) || !getid3_lib::intValueSupported($startoffset)) {
-			$info['warning'][] = 'Unable to ParseRIFF() at '.$startoffset.' because beyond '.round(PHP_INT_MAX / 1073741824).'GB limit of PHP filesystem functions';
-			return false;
-		}
-		$max_usable_offset = min(PHP_INT_MAX - 1024, $maxoffset);
-		if ($maxoffset > $max_usable_offset) {
-			$info['warning'][] = 'ParseRIFF() may return incomplete data for chunk starting at '.$startoffset.' because beyond it extends to '.$maxoffset.', which is beyond the '.round(PHP_INT_MAX / 1073741824).'GB limit of PHP filesystem functions';
-		}
-		fseek($this->getid3->fp, $startoffset, SEEK_SET);
-
-		while (ftell($this->getid3->fp) < $max_usable_offset) {
-			$chunknamesize = fread($this->getid3->fp, 8);
-			$chunkname =                         substr($chunknamesize, 0, 4);
-			$chunksize = $this->EitherEndian2Int(substr($chunknamesize, 4, 4));
-			if (strlen($chunkname) < 4) {
-				$info['error'][] = 'Expecting chunk name at offset '.(ftell($this->getid3->fp) - 4).' but found nothing. Aborting RIFF parsing.';
-				break;
-			}
-			if ($chunksize == 0) {
-				if ($chunkname == 'JUNK') {
-					// we'll allow zero-size JUNK frames
-				} else {
-					$info['warning'][] = 'Chunk size at offset '.(ftell($this->getid3->fp) - 4).' is zero. Aborting RIFF parsing.';
-					break;
-				}
-			}
-			if (($chunksize % 2) != 0) {
-				// all structures are packed on word boundaries
-				$chunksize++;
-			}
-
-			switch ($chunkname) {
-				case 'LIST':
-					$listname = fread($this->getid3->fp, 4);
-					if (preg_match('#^(movi|rec )$#i', $listname)) {
-						$RIFFchunk[$listname]['offset'] = ftell($this->getid3->fp) - 4;
-						$RIFFchunk[$listname]['size']   = $chunksize;
-
-						if ($FoundAllChunksWeNeed) {
-
-							// skip over
-
-						} else {
-
-							$WhereWeWere      = ftell($this->getid3->fp);
-							$AudioChunkHeader = fread($this->getid3->fp, 12);
-							$AudioChunkStreamNum  =                              substr($AudioChunkHeader, 0, 2);
-							$AudioChunkStreamType =                              substr($AudioChunkHeader, 2, 2);
-							$AudioChunkSize       = getid3_lib::LittleEndian2Int(substr($AudioChunkHeader, 4, 4));
-
-							if ($AudioChunkStreamType == 'wb') {
-								$FirstFourBytes = substr($AudioChunkHeader, 8, 4);
-								if (preg_match('/^\xFF[\xE2-\xE7\xF2-\xF7\xFA-\xFF][\x00-\xEB]/s', $FirstFourBytes)) {
-									// MP3
-									if (getid3_mp3::MPEGaudioHeaderBytesValid($FirstFourBytes)) {
-										$getid3_temp = new getID3();
-										$getid3_temp->openfile($this->getid3->filename);
-										$getid3_temp->info['avdataoffset'] = ftell($this->getid3->fp) - 4;
-										$getid3_temp->info['avdataend']    = ftell($this->getid3->fp) + $AudioChunkSize;
-										$getid3_mp3 = new getid3_mp3($getid3_temp);
-										$getid3_mp3->getOnlyMPEGaudioInfo($getid3_temp->info['avdataoffset'], false);
-										if (isset($getid3_temp->info['mpeg']['audio'])) {
-											$info['mpeg']['audio']         = $getid3_temp->info['mpeg']['audio'];
-											$info['audio']                 = $getid3_temp->info['audio'];
-											$info['audio']['dataformat']   = 'mp'.$info['mpeg']['audio']['layer'];
-											$info['audio']['sample_rate']  = $info['mpeg']['audio']['sample_rate'];
-											$info['audio']['channels']     = $info['mpeg']['audio']['channels'];
-											$info['audio']['bitrate']      = $info['mpeg']['audio']['bitrate'];
-											$info['audio']['bitrate_mode'] = strtolower($info['mpeg']['audio']['bitrate_mode']);
-											//$info['bitrate']               = $info['audio']['bitrate'];
-										}
-										unset($getid3_temp, $getid3_mp3);
-									}
-
-								} elseif (preg_match('/^\x0B\x77/s', $FirstFourBytes)) {
-
-									// AC3
-									if (getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ac3.php', __FILE__, false)) {
-										$getid3_temp = new getID3();
-										$getid3_temp->openfile($this->getid3->filename);
-										$getid3_temp->info['avdataoffset'] = ftell($this->getid3->fp) - 4;
-										$getid3_temp->info['avdataend']    = ftell($this->getid3->fp) + $AudioChunkSize;
-										$getid3_ac3 = new getid3_ac3($getid3_temp);
-										$getid3_ac3->Analyze();
-										if (empty($getid3_temp->info['error'])) {
-											$info['audio']   = $getid3_temp->info['audio'];
-											$info['ac3']     = $getid3_temp->info['ac3'];
-											if (!empty($getid3_temp->info['warning'])) {
-												foreach ($getid3_temp->info['warning'] as $key => $value) {
-													$info['warning'][] = $value;
-												}
-											}
-										}
-										unset($getid3_temp, $getid3_ac3);
-									}
-
-								}
-
-							}
-
-							$FoundAllChunksWeNeed = true;
-							fseek($this->getid3->fp, $WhereWeWere, SEEK_SET);
-
-						}
-						fseek($this->getid3->fp, $chunksize - 4, SEEK_CUR);
-
-					//} elseif (preg_match('#^[0-9]{2}(wb|pc|dc|db)$#i', $listname)) {
-					//
-					//	// data chunk, ignore
-					//
-					} else {
-
-						if (!isset($RIFFchunk[$listname])) {
-							$RIFFchunk[$listname] = array();
-						}
-						$LISTchunkParent    = $listname;
-						$LISTchunkMaxOffset = ftell($this->getid3->fp) - 4 + $chunksize;
-						if ($parsedChunk = $this->ParseRIFF(ftell($this->getid3->fp), ftell($this->getid3->fp) + $chunksize - 4)) {
-							$RIFFchunk[$listname] = array_merge_recursive($RIFFchunk[$listname], $parsedChunk);
-						}
-
-					}
-					break;
-
-				default:
-					if (preg_match('#^[0-9]{2}(wb|pc|dc|db)$#', $chunkname)) {
-						$nextoffset = ftell($this->getid3->fp) + $chunksize;
-						if (($nextoffset < 0) || !getid3_lib::intValueSupported($nextoffset)) {
-							$info['warning'][] = 'Unable to parse chunk at offset '.$nextoffset.' because beyond '.round(PHP_INT_MAX / 1073741824).'GB limit of PHP filesystem functions';
-							break 2;
-						}
-						fseek($this->getid3->fp, $nextoffset, SEEK_SET);
-						break;
-					}
-					$thisindex = 0;
-					if (isset($RIFFchunk[$chunkname]) && is_array($RIFFchunk[$chunkname])) {
-						$thisindex = count($RIFFchunk[$chunkname]);
-					}
-					$RIFFchunk[$chunkname][$thisindex]['offset'] = ftell($this->getid3->fp) - 8;
-					$RIFFchunk[$chunkname][$thisindex]['size']   = $chunksize;
-					switch ($chunkname) {
-						case 'data':
-							$info['avdataoffset'] = ftell($this->getid3->fp);
-							$info['avdataend']    = $info['avdataoffset'] + $chunksize;
-
-							$RIFFdataChunkContentsTest = fread($this->getid3->fp, 36);
-
-							if ((strlen($RIFFdataChunkContentsTest) > 0) && preg_match('/^\xFF[\xE2-\xE7\xF2-\xF7\xFA-\xFF][\x00-\xEB]/s', substr($RIFFdataChunkContentsTest, 0, 4))) {
-
-								// Probably is MP3 data
-								if (getid3_mp3::MPEGaudioHeaderBytesValid(substr($RIFFdataChunkContentsTest, 0, 4))) {
-									$getid3_temp = new getID3();
-									$getid3_temp->openfile($this->getid3->filename);
-									$getid3_temp->info['avdataoffset'] = $RIFFchunk[$chunkname][$thisindex]['offset'];
-									$getid3_temp->info['avdataend']    = $RIFFchunk[$chunkname][$thisindex]['offset'] + $RIFFchunk[$chunkname][$thisindex]['size'];
-									$getid3_mp3 = new getid3_mp3($getid3_temp);
-									$getid3_mp3->getOnlyMPEGaudioInfo($RIFFchunk[$chunkname][$thisindex]['offset'], false);
-									if (empty($getid3_temp->info['error'])) {
-										$info['mpeg']  = $getid3_temp->info['mpeg'];
-										$info['audio'] = $getid3_temp->info['audio'];
-									}
-									unset($getid3_temp, $getid3_mp3);
-								}
-
-							} elseif ((strlen($RIFFdataChunkContentsTest) > 0) && (substr($RIFFdataChunkContentsTest, 0, 2) == "\x0B\x77")) {
-
-								// This is probably AC-3 data
-								if (getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ac3.php', __FILE__, false)) {
-									$getid3_temp = new getID3();
-									$getid3_temp->openfile($this->getid3->filename);
-									$getid3_temp->info['avdataoffset'] = $RIFFchunk[$chunkname][$thisindex]['offset'];
-									$getid3_temp->info['avdataend']    = $RIFFchunk[$chunkname][$thisindex]['offset'] + $RIFFchunk[$chunkname][$thisindex]['size'];
-									$getid3_ac3 = new getid3_ac3($getid3_temp);
-									$getid3_ac3->Analyze();
-									if (empty($getid3_temp->info['error'])) {
-										$info['audio']   = $getid3_temp->info['audio'];
-										$info['ac3']     = $getid3_temp->info['ac3'];
-										$info['warning'] = $getid3_temp->info['warning'];
-									}
-									unset($getid3_temp, $getid3_ac3);
-								}
-
-							} elseif ((strlen($RIFFdataChunkContentsTest) > 0) && (substr($RIFFdataChunkContentsTest, 8, 2) == "\x77\x0B")) {
-
-								// Dolby Digital WAV
-								// AC-3 content, but not encoded in same format as normal AC-3 file
-								// For one thing, byte order is swapped
-
-								if (getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ac3.php', __FILE__, false)) {
-
-									// ok to use tmpfile here - only 56 bytes
-									if ($RIFFtempfilename = tempnam(GETID3_TEMP_DIR, 'id3')) {
-										if ($fd_temp = fopen($RIFFtempfilename, 'wb')) {
-											for ($i = 0; $i < 28; $i += 2) {
-												// swap byte order
-												fwrite($fd_temp, substr($RIFFdataChunkContentsTest, 8 + $i + 1, 1));
-												fwrite($fd_temp, substr($RIFFdataChunkContentsTest, 8 + $i + 0, 1));
-											}
-											fclose($fd_temp);
-
-											$getid3_temp = new getID3();
-											$getid3_temp->openfile($RIFFtempfilename);
-											$getid3_temp->info['avdataend'] = 20;
-											$getid3_ac3 = new getid3_ac3($getid3_temp);
-											$getid3_ac3->Analyze();
-											if (empty($getid3_temp->info['error'])) {
-												$info['audio']   = $getid3_temp->info['audio'];
-												$info['ac3']     = $getid3_temp->info['ac3'];
-												$info['warning'] = $getid3_temp->info['warning'];
-											} else {
-												$info['error'][] = 'Error parsing Dolby Digital WAV (AC3-in-RIFF): '.implode(';', $getid3_temp->info['error']);
-											}
-											unset($getid3_ac3, $getid3_temp);
-										} else {
-											$info['error'][] = 'Error parsing Dolby Digital WAV (AC3-in-RIFF): failed to write temp file';
-										}
-										unlink($RIFFtempfilename);
-
-									} else {
-										$info['error'][] = 'Error parsing Dolby Digital WAV (AC3-in-RIFF): failed to write temp file';
-									}
-
-								}
-
-							} elseif ((strlen($RIFFdataChunkContentsTest) > 0) && (substr($RIFFdataChunkContentsTest, 0, 4) == 'wvpk')) {
-
-								// This is WavPack data
-								$info['wavpack']['offset'] = $RIFFchunk[$chunkname][$thisindex]['offset'];
-								$info['wavpack']['size']   = getid3_lib::LittleEndian2Int(substr($RIFFdataChunkContentsTest, 4, 4));
-								$this->RIFFparseWavPackHeader(substr($RIFFdataChunkContentsTest, 8, 28));
-
-							} else {
-
-								// This is some other kind of data (quite possibly just PCM)
-								// do nothing special, just skip it
-
-							}
-							$nextoffset = $RIFFchunk[$chunkname][$thisindex]['offset'] + 8 + $chunksize;
-							if (($nextoffset < 0) || !getid3_lib::intValueSupported($nextoffset)) {
-								$info['warning'][] = 'Unable to parse chunk at offset '.$nextoffset.' because beyond '.round(PHP_INT_MAX / 1073741824).'GB limit of PHP filesystem functions';
-								break 3;
-							}
-							fseek($this->getid3->fp, $RIFFchunk[$chunkname][$thisindex]['offset'] + 8 + $chunksize, SEEK_SET);
-							break;
-
-						case 'iXML':
-						case 'bext':
-						case 'cart':
-						case 'fmt ':
-						case 'strh':
-						case 'strf':
-						case 'indx':
-						case 'MEXT':
-						case 'DISP':
-							// always read data in
-						case 'JUNK':
-							// should be: never read data in
-							// but some programs write their version strings in a JUNK chunk (e.g. VirtualDub, AVIdemux, etc)
-							if ($chunksize < 1048576) {
-								if ($chunksize > 0) {
-									$RIFFchunk[$chunkname][$thisindex]['data'] = fread($this->getid3->fp, $chunksize);
-									if ($chunkname == 'JUNK') {
-										if (preg_match('#^([\\x20-\\x7F]+)#', $RIFFchunk[$chunkname][$thisindex]['data'], $matches)) {
-											// only keep text characters [chr(32)-chr(127)]
-											$info['riff']['comments']['junk'][] = trim($matches[1]);
-										}
-										// but if nothing there, ignore
-										// remove the key in either case
-										unset($RIFFchunk[$chunkname][$thisindex]['data']);
-									}
-								}
-							} else {
-								$info['warning'][] = 'chunk "'.$chunkname.'" at offset '.ftell($this->getid3->fp).' is unexpectedly larger than 1MB (claims to be '.number_format($chunksize).' bytes), skipping data';
-								$nextoffset = ftell($this->getid3->fp) + $chunksize;
-								if (($nextoffset < 0) || !getid3_lib::intValueSupported($nextoffset)) {
-									$info['warning'][] = 'Unable to parse chunk at offset '.$nextoffset.' because beyond '.round(PHP_INT_MAX / 1073741824).'GB limit of PHP filesystem functions';
-									break 3;
-								}
-								fseek($this->getid3->fp, $nextoffset, SEEK_SET);
-							}
-							break;
-
-						default:
-							if (!preg_match('#^[0-9]{2}(wb|pc|dc|db)$#', $chunkname) && !empty($LISTchunkParent) && (($RIFFchunk[$chunkname][$thisindex]['offset'] + $RIFFchunk[$chunkname][$thisindex]['size']) <= $LISTchunkMaxOffset)) {
-								$RIFFchunk[$LISTchunkParent][$chunkname][$thisindex]['offset'] = $RIFFchunk[$chunkname][$thisindex]['offset'];
-								$RIFFchunk[$LISTchunkParent][$chunkname][$thisindex]['size']   = $RIFFchunk[$chunkname][$thisindex]['size'];
-								unset($RIFFchunk[$chunkname][$thisindex]['offset']);
-								unset($RIFFchunk[$chunkname][$thisindex]['size']);
-								if (isset($RIFFchunk[$chunkname][$thisindex]) && empty($RIFFchunk[$chunkname][$thisindex])) {
-									unset($RIFFchunk[$chunkname][$thisindex]);
-								}
-								if (isset($RIFFchunk[$chunkname]) && empty($RIFFchunk[$chunkname])) {
-									unset($RIFFchunk[$chunkname]);
-								}
-								$RIFFchunk[$LISTchunkParent][$chunkname][$thisindex]['data'] = fread($this->getid3->fp, $chunksize);
-							//} elseif (in_array($chunkname, array('ID3 ')) || (($chunksize > 0) && ($chunksize < 2048))) {
-							} elseif (($chunksize > 0) && ($chunksize < 2048)) {
-								// only read data in if smaller than 2kB
-								$RIFFchunk[$chunkname][$thisindex]['data'] = fread($this->getid3->fp, $chunksize);
-							} else {
-								$nextoffset = ftell($this->getid3->fp) + $chunksize;
-								if (($nextoffset < 0) || !getid3_lib::intValueSupported($nextoffset)) {
-									$info['warning'][] = 'Unable to parse chunk at offset '.$nextoffset.' because beyond '.round(PHP_INT_MAX / 1073741824).'GB limit of PHP filesystem functions';
-									break 3;
-								}
-								fseek($this->getid3->fp, $nextoffset, SEEK_SET);
-							}
-							break;
-					}
-					break;
-
-			}
-
-		}
-
-		return $RIFFchunk;
-	}
-
-
-	function ParseRIFFdata(&$RIFFdata) {
-		$info = &$this->getid3->info;
-		if ($RIFFdata) {
-			$tempfile = tempnam(GETID3_TEMP_DIR, 'getID3');
-			$fp_temp  = fopen($tempfile, 'wb');
-			$RIFFdataLength = strlen($RIFFdata);
-			$NewLengthString = getid3_lib::LittleEndian2String($RIFFdataLength, 4);
-			for ($i = 0; $i < 4; $i++) {
-				$RIFFdata{$i + 4} = $NewLengthString{$i};
-			}
-			fwrite($fp_temp, $RIFFdata);
-			fclose($fp_temp);
-
-			$getid3_temp = new getID3();
-			$getid3_temp->openfile($tempfile);
-			$getid3_temp->info['filesize']     = $RIFFdataLength;
-			$getid3_temp->info['filenamepath'] = $info['filenamepath'];
-			$getid3_temp->info['tags']         = $info['tags'];
-			$getid3_temp->info['warning']      = $info['warning'];
-			$getid3_temp->info['error']        = $info['error'];
-			$getid3_temp->info['comments']     = $info['comments'];
-			$getid3_temp->info['audio']        = (isset($info['audio']) ? $info['audio'] : array());
-			$getid3_temp->info['video']        = (isset($info['video']) ? $info['video'] : array());
-			$getid3_riff = new getid3_riff($getid3_temp);
-			$getid3_riff->Analyze();
-
-			$info['riff']     = $getid3_temp->info['riff'];
-			$info['warning']  = $getid3_temp->info['warning'];
-			$info['error']    = $getid3_temp->info['error'];
-			$info['tags']     = $getid3_temp->info['tags'];
-			$info['comments'] = $getid3_temp->info['comments'];
-			unset($getid3_riff, $getid3_temp);
-			unlink($tempfile);
-		}
-		return false;
-	}
-
-
-	public static function RIFFparseWAVEFORMATex($WaveFormatExData) {
-		// shortcut
-		$WaveFormatEx['raw'] = array();
-		$WaveFormatEx_raw    = &$WaveFormatEx['raw'];
-
-		$WaveFormatEx_raw['wFormatTag']      = getid3_lib::LittleEndian2Int(substr($WaveFormatExData,  0, 2));
-		$WaveFormatEx_raw['nChannels']       = getid3_lib::LittleEndian2Int(substr($WaveFormatExData,  2, 2));
-		$WaveFormatEx_raw['nSamplesPerSec']  = getid3_lib::LittleEndian2Int(substr($WaveFormatExData,  4, 4));
-		$WaveFormatEx_raw['nAvgBytesPerSec'] = getid3_lib::LittleEndian2Int(substr($WaveFormatExData,  8, 4));
-		$WaveFormatEx_raw['nBlockAlign']     = getid3_lib::LittleEndian2Int(substr($WaveFormatExData, 12, 2));
-		$WaveFormatEx_raw['wBitsPerSample']  = getid3_lib::LittleEndian2Int(substr($WaveFormatExData, 14, 2));
-		if (strlen($WaveFormatExData) > 16) {
-			$WaveFormatEx_raw['cbSize']      = getid3_lib::LittleEndian2Int(substr($WaveFormatExData, 16, 2));
-		}
-
-		$WaveFormatEx['codec']           = getid3_riff::RIFFwFormatTagLookup($WaveFormatEx_raw['wFormatTag']);
-		$WaveFormatEx['channels']        = $WaveFormatEx_raw['nChannels'];
-		$WaveFormatEx['sample_rate']     = $WaveFormatEx_raw['nSamplesPerSec'];
-		$WaveFormatEx['bitrate']         = $WaveFormatEx_raw['nAvgBytesPerSec'] * 8;
-		$WaveFormatEx['bits_per_sample'] = $WaveFormatEx_raw['wBitsPerSample'];
-
-		return $WaveFormatEx;
-	}
-
-
-	function RIFFparseWavPackHeader($WavPackChunkData) {
-		// typedef struct {
-		//     char ckID [4];
-		//     long ckSize;
-		//     short version;
-		//     short bits;                // added for version 2.00
-		//     short flags, shift;        // added for version 3.00
-		//     long total_samples, crc, crc2;
-		//     char extension [4], extra_bc, extras [3];
-		// } WavpackHeader;
-
-		// shortcut
-		$info = &$this->getid3->info;
-		$info['wavpack']  = array();
-		$thisfile_wavpack = &$info['wavpack'];
-
-		$thisfile_wavpack['version']           = getid3_lib::LittleEndian2Int(substr($WavPackChunkData,  0, 2));
-		if ($thisfile_wavpack['version'] >= 2) {
-			$thisfile_wavpack['bits']          = getid3_lib::LittleEndian2Int(substr($WavPackChunkData,  2, 2));
-		}
-		if ($thisfile_wavpack['version'] >= 3) {
-			$thisfile_wavpack['flags_raw']     = getid3_lib::LittleEndian2Int(substr($WavPackChunkData,  4, 2));
-			$thisfile_wavpack['shift']         = getid3_lib::LittleEndian2Int(substr($WavPackChunkData,  6, 2));
-			$thisfile_wavpack['total_samples'] = getid3_lib::LittleEndian2Int(substr($WavPackChunkData,  8, 4));
-			$thisfile_wavpack['crc1']          = getid3_lib::LittleEndian2Int(substr($WavPackChunkData, 12, 4));
-			$thisfile_wavpack['crc2']          = getid3_lib::LittleEndian2Int(substr($WavPackChunkData, 16, 4));
-			$thisfile_wavpack['extension']     =                              substr($WavPackChunkData, 20, 4);
-			$thisfile_wavpack['extra_bc']      = getid3_lib::LittleEndian2Int(substr($WavPackChunkData, 24, 1));
-			for ($i = 0; $i <= 2; $i++) {
-				$thisfile_wavpack['extras'][]  = getid3_lib::LittleEndian2Int(substr($WavPackChunkData, 25 + $i, 1));
-			}
-
-			// shortcut
-			$thisfile_wavpack['flags'] = array();
-			$thisfile_wavpack_flags = &$thisfile_wavpack['flags'];
-
-			$thisfile_wavpack_flags['mono']                 = (bool) ($thisfile_wavpack['flags_raw'] & 0x000001);
-			$thisfile_wavpack_flags['fast_mode']            = (bool) ($thisfile_wavpack['flags_raw'] & 0x000002);
-			$thisfile_wavpack_flags['raw_mode']             = (bool) ($thisfile_wavpack['flags_raw'] & 0x000004);
-			$thisfile_wavpack_flags['calc_noise']           = (bool) ($thisfile_wavpack['flags_raw'] & 0x000008);
-			$thisfile_wavpack_flags['high_quality']         = (bool) ($thisfile_wavpack['flags_raw'] & 0x000010);
-			$thisfile_wavpack_flags['3_byte_samples']       = (bool) ($thisfile_wavpack['flags_raw'] & 0x000020);
-			$thisfile_wavpack_flags['over_20_bits']         = (bool) ($thisfile_wavpack['flags_raw'] & 0x000040);
-			$thisfile_wavpack_flags['use_wvc']              = (bool) ($thisfile_wavpack['flags_raw'] & 0x000080);
-			$thisfile_wavpack_flags['noiseshaping']         = (bool) ($thisfile_wavpack['flags_raw'] & 0x000100);
-			$thisfile_wavpack_flags['very_fast_mode']       = (bool) ($thisfile_wavpack['flags_raw'] & 0x000200);
-			$thisfile_wavpack_flags['new_high_quality']     = (bool) ($thisfile_wavpack['flags_raw'] & 0x000400);
-			$thisfile_wavpack_flags['cancel_extreme']       = (bool) ($thisfile_wavpack['flags_raw'] & 0x000800);
-			$thisfile_wavpack_flags['cross_decorrelation']  = (bool) ($thisfile_wavpack['flags_raw'] & 0x001000);
-			$thisfile_wavpack_flags['new_decorrelation']    = (bool) ($thisfile_wavpack['flags_raw'] & 0x002000);
-			$thisfile_wavpack_flags['joint_stereo']         = (bool) ($thisfile_wavpack['flags_raw'] & 0x004000);
-			$thisfile_wavpack_flags['extra_decorrelation']  = (bool) ($thisfile_wavpack['flags_raw'] & 0x008000);
-			$thisfile_wavpack_flags['override_noiseshape']  = (bool) ($thisfile_wavpack['flags_raw'] & 0x010000);
-			$thisfile_wavpack_flags['override_jointstereo'] = (bool) ($thisfile_wavpack['flags_raw'] & 0x020000);
-			$thisfile_wavpack_flags['copy_source_filetime'] = (bool) ($thisfile_wavpack['flags_raw'] & 0x040000);
-			$thisfile_wavpack_flags['create_exe']           = (bool) ($thisfile_wavpack['flags_raw'] & 0x080000);
-		}
-
-		return true;
-	}
-
-	public static function ParseBITMAPINFOHEADER($BITMAPINFOHEADER, $littleEndian=true) {
-
-		$functionname = ($littleEndian ? 'LittleEndian2Int' : 'BigEndian2Int');
-		$parsed['biSize']          = getid3_lib::$functionname(substr($BITMAPINFOHEADER,  0, 4)); // number of bytes required by the BITMAPINFOHEADER structure
-		$parsed['biWidth']         = getid3_lib::$functionname(substr($BITMAPINFOHEADER,  4, 4)); // width of the bitmap in pixels
-		$parsed['biHeight']        = getid3_lib::$functionname(substr($BITMAPINFOHEADER,  8, 4)); // height of the bitmap in pixels. If biHeight is positive, the bitmap is a 'bottom-up' DIB and its origin is the lower left corner. If biHeight is negative, the bitmap is a 'top-down' DIB and its origin is the upper left corner
-		$parsed['biPlanes']        = getid3_lib::$functionname(substr($BITMAPINFOHEADER, 12, 2)); // number of color planes on the target device. In most cases this value must be set to 1
-		$parsed['biBitCount']      = getid3_lib::$functionname(substr($BITMAPINFOHEADER, 14, 2)); // Specifies the number of bits per pixels
-		$parsed['fourcc']          =                            substr($BITMAPINFOHEADER, 16, 4);  // compression identifier
-		$parsed['biSizeImage']     = getid3_lib::$functionname(substr($BITMAPINFOHEADER, 20, 4)); // size of the bitmap data section of the image (the actual pixel data, excluding BITMAPINFOHEADER and RGBQUAD structures)
-		$parsed['biXPelsPerMeter'] = getid3_lib::$functionname(substr($BITMAPINFOHEADER, 24, 4)); // horizontal resolution, in pixels per metre, of the target device
-		$parsed['biYPelsPerMeter'] = getid3_lib::$functionname(substr($BITMAPINFOHEADER, 28, 4)); // vertical resolution, in pixels per metre, of the target device
-		$parsed['biClrUsed']       = getid3_lib::$functionname(substr($BITMAPINFOHEADER, 32, 4)); // actual number of color indices in the color table used by the bitmap. If this value is zero, the bitmap uses the maximum number of colors corresponding to the value of the biBitCount member for the compression mode specified by biCompression
-		$parsed['biClrImportant']  = getid3_lib::$functionname(substr($BITMAPINFOHEADER, 36, 4)); // number of color indices that are considered important for displaying the bitmap. If this value is zero, all colors are important
-
-		return $parsed;
-	}
-
-	static function ParseDIVXTAG($DIVXTAG) {
-		// structure from "IDivX" source, Form1.frm, by "Greg Frazier of Daemonic Software Group", email: gfrazier@icestorm.net, web: http://dsg.cjb.net/
-		// source available at http://files.divx-digest.com/download/c663efe7ef8ad2e90bf4af4d3ea6188a/on0SWN2r/edit/IDivX.zip
-		// 'Byte Layout:                   '1111111111111111
-		// '32 for Movie - 1               '1111111111111111
-		// '28 for Author - 6              '6666666666666666
-		// '4  for year - 2                '6666666666662222
-		// '3  for genre - 3               '7777777777777777
-		// '48 for Comments - 7            '7777777777777777
-		// '1  for Rating - 4              '7777777777777777
-		// '5  for Future Additions - 0    '333400000DIVXTAG
-		// '128 bytes total
-
-		static $DIVXTAGgenre  = array(
-			 0 => 'Action',
-			 1 => 'Action/Adventure',
-			 2 => 'Adventure',
-			 3 => 'Adult',
-			 4 => 'Anime',
-			 5 => 'Cartoon',
-			 6 => 'Claymation',
-			 7 => 'Comedy',
-			 8 => 'Commercial',
-			 9 => 'Documentary',
-			10 => 'Drama',
-			11 => 'Home Video',
-			12 => 'Horror',
-			13 => 'Infomercial',
-			14 => 'Interactive',
-			15 => 'Mystery',
-			16 => 'Music Video',
-			17 => 'Other',
-			18 => 'Religion',
-			19 => 'Sci Fi',
-			20 => 'Thriller',
-			21 => 'Western',
-		);
-		static $DIVXTAGrating = array(
-			0=>'Unrated',
-			1=>'G',
-			2=>'PG',
-			3=>'PG-13',
-			4=>'R',
-			5=>'NC-17'
-		);
-
-		$parsed['title']     =        trim(substr($DIVXTAG,   0, 32));
-		$parsed['artist']    =        trim(substr($DIVXTAG,  32, 28));
-		$parsed['year']      = intval(trim(substr($DIVXTAG,  60,  4)));
-		$parsed['comment']   =        trim(substr($DIVXTAG,  64, 48));
-		$parsed['genre_id']  = intval(trim(substr($DIVXTAG, 112,  3)));
-		$parsed['rating_id'] =         ord(substr($DIVXTAG, 115,  1));
-		//$parsed['padding'] =             substr($DIVXTAG, 116,  5);  // 5-byte null
-		//$parsed['magic']   =             substr($DIVXTAG, 121,  7);  // "DIVXTAG"
-
-		$parsed['genre']  = (isset($DIVXTAGgenre[$parsed['genre_id']])   ? $DIVXTAGgenre[$parsed['genre_id']]   : $parsed['genre_id']);
-		$parsed['rating'] = (isset($DIVXTAGrating[$parsed['rating_id']]) ? $DIVXTAGrating[$parsed['rating_id']] : $parsed['rating_id']);
-		return $parsed;
-	}
-
-	static function RIFFwaveSNDMtagLookup($tagshortname) {
-		$begin = __LINE__;
-
-		/** This is not a comment!
-
-			�kwd	keywords
-			�BPM	bpm
-			�trt	tracktitle
-			�des	description
-			�gen	category
-			�fin	featuredinstrument
-			�LID	longid
-			�bex	bwdescription
-			�pub	publisher
-			�cdt	cdtitle
-			�alb	library
-			�com	composer
-
-		*/
-
-		return getid3_lib::EmbeddedLookup($tagshortname, $begin, __LINE__, __FILE__, 'riff-sndm');
-	}
-
-	static function RIFFwFormatTagLookup($wFormatTag) {
-
-		$begin = __LINE__;
-
-		/** This is not a comment!
-
-			0x0000	Microsoft Unknown Wave Format
-			0x0001	Pulse Code Modulation (PCM)
-			0x0002	Microsoft ADPCM
-			0x0003	IEEE Float
-			0x0004	Compaq Computer VSELP
-			0x0005	IBM CVSD
-			0x0006	Microsoft A-Law
-			0x0007	Microsoft mu-Law
-			0x0008	Microsoft DTS
-			0x0010	OKI ADPCM
-			0x0011	Intel DVI/IMA ADPCM
-			0x0012	Videologic MediaSpace ADPCM
-			0x0013	Sierra Semiconductor ADPCM
-			0x0014	Antex Electronics G.723 ADPCM
-			0x0015	DSP Solutions DigiSTD
-			0x0016	DSP Solutions DigiFIX
-			0x0017	Dialogic OKI ADPCM
-			0x0018	MediaVision ADPCM
-			0x0019	Hewlett-Packard CU
-			0x0020	Yamaha ADPCM
-			0x0021	Speech Compression Sonarc
-			0x0022	DSP Group TrueSpeech
-			0x0023	Echo Speech EchoSC1
-			0x0024	Audiofile AF36
-			0x0025	Audio Processing Technology APTX
-			0x0026	AudioFile AF10
-			0x0027	Prosody 1612
-			0x0028	LRC
-			0x0030	Dolby AC2
-			0x0031	Microsoft GSM 6.10
-			0x0032	MSNAudio
-			0x0033	Antex Electronics ADPCME
-			0x0034	Control Resources VQLPC
-			0x0035	DSP Solutions DigiREAL
-			0x0036	DSP Solutions DigiADPCM
-			0x0037	Control Resources CR10
-			0x0038	Natural MicroSystems VBXADPCM
-			0x0039	Crystal Semiconductor IMA ADPCM
-			0x003A	EchoSC3
-			0x003B	Rockwell ADPCM
-			0x003C	Rockwell Digit LK
-			0x003D	Xebec
-			0x0040	Antex Electronics G.721 ADPCM
-			0x0041	G.728 CELP
-			0x0042	MSG723
-			0x0050	MPEG Layer-2 or Layer-1
-			0x0052	RT24
-			0x0053	PAC
-			0x0055	MPEG Layer-3
-			0x0059	Lucent G.723
-			0x0060	Cirrus
-			0x0061	ESPCM
-			0x0062	Voxware
-			0x0063	Canopus Atrac
-			0x0064	G.726 ADPCM
-			0x0065	G.722 ADPCM
-			0x0066	DSAT
-			0x0067	DSAT Display
-			0x0069	Voxware Byte Aligned
-			0x0070	Voxware AC8
-			0x0071	Voxware AC10
-			0x0072	Voxware AC16
-			0x0073	Voxware AC20
-			0x0074	Voxware MetaVoice
-			0x0075	Voxware MetaSound
-			0x0076	Voxware RT29HW
-			0x0077	Voxware VR12
-			0x0078	Voxware VR18
-			0x0079	Voxware TQ40
-			0x0080	Softsound
-			0x0081	Voxware TQ60
-			0x0082	MSRT24
-			0x0083	G.729A
-			0x0084	MVI MV12
-			0x0085	DF G.726
-			0x0086	DF GSM610
-			0x0088	ISIAudio
-			0x0089	Onlive
-			0x0091	SBC24
-			0x0092	Dolby AC3 SPDIF
-			0x0093	MediaSonic G.723
-			0x0094	Aculab PLC    Prosody 8kbps
-			0x0097	ZyXEL ADPCM
-			0x0098	Philips LPCBB
-			0x0099	Packed
-			0x00FF	AAC
-			0x0100	Rhetorex ADPCM
-			0x0101	IBM mu-law
-			0x0102	IBM A-law
-			0x0103	IBM AVC Adaptive Differential Pulse Code Modulation (ADPCM)
-			0x0111	Vivo G.723
-			0x0112	Vivo Siren
-			0x0123	Digital G.723
-			0x0125	Sanyo LD ADPCM
-			0x0130	Sipro Lab Telecom ACELP NET
-			0x0131	Sipro Lab Telecom ACELP 4800
-			0x0132	Sipro Lab Telecom ACELP 8V3
-			0x0133	Sipro Lab Telecom G.729
-			0x0134	Sipro Lab Telecom G.729A
-			0x0135	Sipro Lab Telecom Kelvin
-			0x0140	Windows Media Video V8
-			0x0150	Qualcomm PureVoice
-			0x0151	Qualcomm HalfRate
-			0x0155	Ring Zero Systems TUB GSM
-			0x0160	Microsoft Audio 1
-			0x0161	Windows Media Audio V7 / V8 / V9
-			0x0162	Windows Media Audio Professional V9
-			0x0163	Windows Media Audio Lossless V9
-			0x0200	Creative Labs ADPCM
-			0x0202	Creative Labs Fastspeech8
-			0x0203	Creative Labs Fastspeech10
-			0x0210	UHER Informatic GmbH ADPCM
-			0x0220	Quarterdeck
-			0x0230	I-link Worldwide VC
-			0x0240	Aureal RAW Sport
-			0x0250	Interactive Products HSX
-			0x0251	Interactive Products RPELP
-			0x0260	Consistent Software CS2
-			0x0270	Sony SCX
-			0x0300	Fujitsu FM Towns Snd
-			0x0400	BTV Digital
-			0x0401	Intel Music Coder
-			0x0450	QDesign Music
-			0x0680	VME VMPCM
-			0x0681	AT&T Labs TPC
-			0x08AE	ClearJump LiteWave
-			0x1000	Olivetti GSM
-			0x1001	Olivetti ADPCM
-			0x1002	Olivetti CELP
-			0x1003	Olivetti SBC
-			0x1004	Olivetti OPR
-			0x1100	Lernout & Hauspie Codec (0x1100)
-			0x1101	Lernout & Hauspie CELP Codec (0x1101)
-			0x1102	Lernout & Hauspie SBC Codec (0x1102)
-			0x1103	Lernout & Hauspie SBC Codec (0x1103)
-			0x1104	Lernout & Hauspie SBC Codec (0x1104)
-			0x1400	Norris
-			0x1401	AT&T ISIAudio
-			0x1500	Soundspace Music Compression
-			0x181C	VoxWare RT24 Speech
-			0x1FC4	NCT Soft ALF2CD (www.nctsoft.com)
-			0x2000	Dolby AC3
-			0x2001	Dolby DTS
-			0x2002	WAVE_FORMAT_14_4
-			0x2003	WAVE_FORMAT_28_8
-			0x2004	WAVE_FORMAT_COOK
-			0x2005	WAVE_FORMAT_DNET
-			0x674F	Ogg Vorbis 1
-			0x6750	Ogg Vorbis 2
-			0x6751	Ogg Vorbis 3
-			0x676F	Ogg Vorbis 1+
-			0x6770	Ogg Vorbis 2+
-			0x6771	Ogg Vorbis 3+
-			0x7A21	GSM-AMR (CBR, no SID)
-			0x7A22	GSM-AMR (VBR, including SID)
-			0xFFFE	WAVE_FORMAT_EXTENSIBLE
-			0xFFFF	WAVE_FORMAT_DEVELOPMENT
-
-		*/
-
-		return getid3_lib::EmbeddedLookup('0x'.str_pad(strtoupper(dechex($wFormatTag)), 4, '0', STR_PAD_LEFT), $begin, __LINE__, __FILE__, 'riff-wFormatTag');
-
-	}
-
-
-	public static function RIFFfourccLookup($fourcc) {
-
-		$begin = __LINE__;
-
-		/** This is not a comment!
-
-			swot	http://developer.apple.com/qa/snd/snd07.html
-			____	No Codec (____)
-			_BIT	BI_BITFIELDS (Raw RGB)
-			_JPG	JPEG compressed
-			_PNG	PNG compressed W3C/ISO/IEC (RFC-2083)
-			_RAW	Full Frames (Uncompressed)
-			_RGB	Raw RGB Bitmap
-			_RL4	RLE 4bpp RGB
-			_RL8	RLE 8bpp RGB
-			3IV1	3ivx MPEG-4 v1
-			3IV2	3ivx MPEG-4 v2
-			3IVX	3ivx MPEG-4
-			AASC	Autodesk Animator
-			ABYR	Kensington ?ABYR?
-			AEMI	Array Microsystems VideoONE MPEG1-I Capture
-			AFLC	Autodesk Animator FLC
-			AFLI	Autodesk Animator FLI
-			AMPG	Array Microsystems VideoONE MPEG
-			ANIM	Intel RDX (ANIM)
-			AP41	AngelPotion Definitive
-			ASV1	Asus Video v1
-			ASV2	Asus Video v2
-			ASVX	Asus Video 2.0 (audio)
-			AUR2	AuraVision Aura 2 Codec - YUV 4:2:2
-			AURA	AuraVision Aura 1 Codec - YUV 4:1:1
-			AVDJ	Independent JPEG Group\'s codec (AVDJ)
-			AVRN	Independent JPEG Group\'s codec (AVRN)
-			AYUV	4:4:4 YUV (AYUV)
-			AZPR	Quicktime Apple Video (AZPR)
-			BGR 	Raw RGB32
-			BLZ0	Blizzard DivX MPEG-4
-			BTVC	Conexant Composite Video
-			BINK	RAD Game Tools Bink Video
-			BT20	Conexant Prosumer Video
-			BTCV	Conexant Composite Video Codec
-			BW10	Data Translation Broadway MPEG Capture
-			CC12	Intel YUV12
-			CDVC	Canopus DV
-			CFCC	Digital Processing Systems DPS Perception
-			CGDI	Microsoft Office 97 Camcorder Video
-			CHAM	Winnov Caviara Champagne
-			CJPG	Creative WebCam JPEG
-			CLJR	Cirrus Logic YUV 4:1:1
-			CMYK	Common Data Format in Printing (Colorgraph)
-			CPLA	Weitek 4:2:0 YUV Planar
-			CRAM	Microsoft Video 1 (CRAM)
-			cvid	Radius Cinepak
-			CVID	Radius Cinepak
-			CWLT	Microsoft Color WLT DIB
-			CYUV	Creative Labs YUV
-			CYUY	ATI YUV
-			D261	H.261
-			D263	H.263
-			DIB 	Device Independent Bitmap
-			DIV1	FFmpeg OpenDivX
-			DIV2	Microsoft MPEG-4 v1/v2
-			DIV3	DivX ;-) MPEG-4 v3.x Low-Motion
-			DIV4	DivX ;-) MPEG-4 v3.x Fast-Motion
-			DIV5	DivX MPEG-4 v5.x
-			DIV6	DivX ;-) (MS MPEG-4 v3.x)
-			DIVX	DivX MPEG-4 v4 (OpenDivX / Project Mayo)
-			divx	DivX MPEG-4
-			DMB1	Matrox Rainbow Runner hardware MJPEG
-			DMB2	Paradigm MJPEG
-			DSVD	?DSVD?
-			DUCK	Duck TrueMotion 1.0
-			DPS0	DPS/Leitch Reality Motion JPEG
-			DPSC	DPS/Leitch PAR Motion JPEG
-			DV25	Matrox DVCPRO codec
-			DV50	Matrox DVCPRO50 codec
-			DVC 	IEC 61834 and SMPTE 314M (DVC/DV Video)
-			DVCP	IEC 61834 and SMPTE 314M (DVC/DV Video)
-			DVHD	IEC Standard DV 1125 lines @ 30fps / 1250 lines @ 25fps
-			DVMA	Darim Vision DVMPEG (dummy for MPEG compressor) (www.darvision.com)
-			DVSL	IEC Standard DV compressed in SD (SDL)
-			DVAN	?DVAN?
-			DVE2	InSoft DVE-2 Videoconferencing
-			dvsd	IEC 61834 and SMPTE 314M DVC/DV Video
-			DVSD	IEC 61834 and SMPTE 314M DVC/DV Video
-			DVX1	Lucent DVX1000SP Video Decoder
-			DVX2	Lucent DVX2000S Video Decoder
-			DVX3	Lucent DVX3000S Video Decoder
-			DX50	DivX v5
-			DXT1	Microsoft DirectX Compressed Texture (DXT1)
-			DXT2	Microsoft DirectX Compressed Texture (DXT2)
-			DXT3	Microsoft DirectX Compressed Texture (DXT3)
-			DXT4	Microsoft DirectX Compressed Texture (DXT4)
-			DXT5	Microsoft DirectX Compressed Texture (DXT5)
-			DXTC	Microsoft DirectX Compressed Texture (DXTC)
-			DXTn	Microsoft DirectX Compressed Texture (DXTn)
-			EM2V	Etymonix MPEG-2 I-frame (www.etymonix.com)
-			EKQ0	Elsa ?EKQ0?
-			ELK0	Elsa ?ELK0?
-			ESCP	Eidos Escape
-			ETV1	eTreppid Video ETV1
-			ETV2	eTreppid Video ETV2
-			ETVC	eTreppid Video ETVC
-			FLIC	Autodesk FLI/FLC Animation
-			FLV1	Sorenson Spark
-			FLV4	On2 TrueMotion VP6
-			FRWT	Darim Vision Forward Motion JPEG (www.darvision.com)
-			FRWU	Darim Vision Forward Uncompressed (www.darvision.com)
-			FLJP	D-Vision Field Encoded Motion JPEG
-			FPS1	FRAPS v1
-			FRWA	SoftLab-Nsk Forward Motion JPEG w/ alpha channel
-			FRWD	SoftLab-Nsk Forward Motion JPEG
-			FVF1	Iterated Systems Fractal Video Frame
-			GLZW	Motion LZW (gabest@freemail.hu)
-			GPEG	Motion JPEG (gabest@freemail.hu)
-			GWLT	Microsoft Greyscale WLT DIB
-			H260	Intel ITU H.260 Videoconferencing
-			H261	Intel ITU H.261 Videoconferencing
-			H262	Intel ITU H.262 Videoconferencing
-			H263	Intel ITU H.263 Videoconferencing
-			H264	Intel ITU H.264 Videoconferencing
-			H265	Intel ITU H.265 Videoconferencing
-			H266	Intel ITU H.266 Videoconferencing
-			H267	Intel ITU H.267 Videoconferencing
-			H268	Intel ITU H.268 Videoconferencing
-			H269	Intel ITU H.269 Videoconferencing
-			HFYU	Huffman Lossless Codec
-			HMCR	Rendition Motion Compensation Format (HMCR)
-			HMRR	Rendition Motion Compensation Format (HMRR)
-			I263	FFmpeg I263 decoder
-			IF09	Indeo YVU9 ("YVU9 with additional delta-frame info after the U plane")
-			IUYV	Interlaced version of UYVY (www.leadtools.com)
-			IY41	Interlaced version of Y41P (www.leadtools.com)
-			IYU1	12 bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec    IEEE standard
-			IYU2	24 bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec    IEEE standard
-			IYUV	Planar YUV format (8-bpp Y plane, followed by 8-bpp 2�2 U and V planes)
-			i263	Intel ITU H.263 Videoconferencing (i263)
-			I420	Intel Indeo 4
-			IAN 	Intel Indeo 4 (RDX)
-			ICLB	InSoft CellB Videoconferencing
-			IGOR	Power DVD
-			IJPG	Intergraph JPEG
-			ILVC	Intel Layered Video
-			ILVR	ITU-T H.263+
-			IPDV	I-O Data Device Giga AVI DV Codec
-			IR21	Intel Indeo 2.1
-			IRAW	Intel YUV Uncompressed
-			IV30	Intel Indeo 3.0
-			IV31	Intel Indeo 3.1
-			IV32	Ligos Indeo 3.2
-			IV33	Ligos Indeo 3.3
-			IV34	Ligos Indeo 3.4
-			IV35	Ligos Indeo 3.5
-			IV36	Ligos Indeo 3.6
-			IV37	Ligos Indeo 3.7
-			IV38	Ligos Indeo 3.8
-			IV39	Ligos Indeo 3.9
-			IV40	Ligos Indeo Interactive 4.0
-			IV41	Ligos Indeo Interactive 4.1
-			IV42	Ligos Indeo Interactive 4.2
-			IV43	Ligos Indeo Interactive 4.3
-			IV44	Ligos Indeo Interactive 4.4
-			IV45	Ligos Indeo Interactive 4.5
-			IV46	Ligos Indeo Interactive 4.6
-			IV47	Ligos Indeo Interactive 4.7
-			IV48	Ligos Indeo Interactive 4.8
-			IV49	Ligos Indeo Interactive 4.9
-			IV50	Ligos Indeo Interactive 5.0
-			JBYR	Kensington ?JBYR?
-			JPEG	Still Image JPEG DIB
-			JPGL	Pegasus Lossless Motion JPEG
-			KMVC	Team17 Software Karl Morton\'s Video Codec
-			LSVM	Vianet Lighting Strike Vmail (Streaming) (www.vianet.com)
-			LEAD	LEAD Video Codec
-			Ljpg	LEAD MJPEG Codec
-			MDVD	Alex MicroDVD Video (hacked MS MPEG-4) (www.tiasoft.de)
-			MJPA	Morgan Motion JPEG (MJPA) (www.morgan-multimedia.com)
-			MJPB	Morgan Motion JPEG (MJPB) (www.morgan-multimedia.com)
-			MMES	Matrox MPEG-2 I-frame
-			MP2v	Microsoft S-Mpeg 4 version 1 (MP2v)
-			MP42	Microsoft S-Mpeg 4 version 2 (MP42)
-			MP43	Microsoft S-Mpeg 4 version 3 (MP43)
-			MP4S	Microsoft S-Mpeg 4 version 3 (MP4S)
-			MP4V	FFmpeg MPEG-4
-			MPG1	FFmpeg MPEG 1/2
-			MPG2	FFmpeg MPEG 1/2
-			MPG3	FFmpeg DivX ;-) (MS MPEG-4 v3)
-			MPG4	Microsoft MPEG-4
-			MPGI	Sigma Designs MPEG
-			MPNG	PNG images decoder
-			MSS1	Microsoft Windows Screen Video
-			MSZH	LCL (Lossless Codec Library) (www.geocities.co.jp/Playtown-Denei/2837/LRC.htm)
-			M261	Microsoft H.261
-			M263	Microsoft H.263
-			M4S2	Microsoft Fully Compliant MPEG-4 v2 simple profile (M4S2)
-			m4s2	Microsoft Fully Compliant MPEG-4 v2 simple profile (m4s2)
-			MC12	ATI Motion Compensation Format (MC12)
-			MCAM	ATI Motion Compensation Format (MCAM)
-			MJ2C	Morgan Multimedia Motion JPEG2000
-			mJPG	IBM Motion JPEG w/ Huffman Tables
-			MJPG	Microsoft Motion JPEG DIB
-			MP42	Microsoft MPEG-4 (low-motion)
-			MP43	Microsoft MPEG-4 (fast-motion)
-			MP4S	Microsoft MPEG-4 (MP4S)
-			mp4s	Microsoft MPEG-4 (mp4s)
-			MPEG	Chromatic Research MPEG-1 Video I-Frame
-			MPG4	Microsoft MPEG-4 Video High Speed Compressor
-			MPGI	Sigma Designs MPEG
-			MRCA	FAST Multimedia Martin Regen Codec
-			MRLE	Microsoft Run Length Encoding
-			MSVC	Microsoft Video 1
-			MTX1	Matrox ?MTX1?
-			MTX2	Matrox ?MTX2?
-			MTX3	Matrox ?MTX3?
-			MTX4	Matrox ?MTX4?
-			MTX5	Matrox ?MTX5?
-			MTX6	Matrox ?MTX6?
-			MTX7	Matrox ?MTX7?
-			MTX8	Matrox ?MTX8?
-			MTX9	Matrox ?MTX9?
-			MV12	Motion Pixels Codec (old)
-			MWV1	Aware Motion Wavelets
-			nAVI	SMR Codec (hack of Microsoft MPEG-4) (IRC #shadowrealm)
-			NT00	NewTek LightWave HDTV YUV w/ Alpha (www.newtek.com)
-			NUV1	NuppelVideo
-			NTN1	Nogatech Video Compression 1
-			NVS0	nVidia GeForce Texture (NVS0)
-			NVS1	nVidia GeForce Texture (NVS1)
-			NVS2	nVidia GeForce Texture (NVS2)
-			NVS3	nVidia GeForce Texture (NVS3)
-			NVS4	nVidia GeForce Texture (NVS4)
-			NVS5	nVidia GeForce Texture (NVS5)
-			NVT0	nVidia GeForce Texture (NVT0)
-			NVT1	nVidia GeForce Texture (NVT1)
-			NVT2	nVidia GeForce Texture (NVT2)
-			NVT3	nVidia GeForce Texture (NVT3)
-			NVT4	nVidia GeForce Texture (NVT4)
-			NVT5	nVidia GeForce Texture (NVT5)
-			PIXL	MiroXL, Pinnacle PCTV
-			PDVC	I-O Data Device Digital Video Capture DV codec
-			PGVV	Radius Video Vision
-			PHMO	IBM Photomotion
-			PIM1	MPEG Realtime (Pinnacle Cards)
-			PIM2	Pegasus Imaging ?PIM2?
-			PIMJ	Pegasus Imaging Lossless JPEG
-			PVEZ	Horizons Technology PowerEZ
-			PVMM	PacketVideo Corporation MPEG-4
-			PVW2	Pegasus Imaging Wavelet Compression
-			Q1.0	Q-Team\'s QPEG 1.0 (www.q-team.de)
-			Q1.1	Q-Team\'s QPEG 1.1 (www.q-team.de)
-			QPEG	Q-Team QPEG 1.0
-			qpeq	Q-Team QPEG 1.1
-			RGB 	Raw BGR32
-			RGBA	Raw RGB w/ Alpha
-			RMP4	REALmagic MPEG-4 (unauthorized XVID copy) (www.sigmadesigns.com)
-			ROQV	Id RoQ File Video Decoder
-			RPZA	Quicktime Apple Video (RPZA)
-			RUD0	Rududu video codec (http://rududu.ifrance.com/rududu/)
-			RV10	RealVideo 1.0 (aka RealVideo 5.0)
-			RV13	RealVideo 1.0 (RV13)
-			RV20	RealVideo G2
-			RV30	RealVideo 8
-			RV40	RealVideo 9
-			RGBT	Raw RGB w/ Transparency
-			RLE 	Microsoft Run Length Encoder
-			RLE4	Run Length Encoded (4bpp, 16-color)
-			RLE8	Run Length Encoded (8bpp, 256-color)
-			RT21	Intel Indeo RealTime Video 2.1
-			rv20	RealVideo G2
-			rv30	RealVideo 8
-			RVX 	Intel RDX (RVX )
-			SMC 	Apple Graphics (SMC )
-			SP54	Logitech Sunplus Sp54 Codec for Mustek GSmart Mini 2
-			SPIG	Radius Spigot
-			SVQ3	Sorenson Video 3 (Apple Quicktime 5)
-			s422	Tekram VideoCap C210 YUV 4:2:2
-			SDCC	Sun Communication Digital Camera Codec
-			SFMC	CrystalNet Surface Fitting Method
-			SMSC	Radius SMSC
-			SMSD	Radius SMSD
-			smsv	WorldConnect Wavelet Video
-			SPIG	Radius Spigot
-			SPLC	Splash Studios ACM Audio Codec (www.splashstudios.net)
-			SQZ2	Microsoft VXTreme Video Codec V2
-			STVA	ST Microelectronics CMOS Imager Data (Bayer)
-			STVB	ST Microelectronics CMOS Imager Data (Nudged Bayer)
-			STVC	ST Microelectronics CMOS Imager Data (Bunched)
-			STVX	ST Microelectronics CMOS Imager Data (Extended CODEC Data Format)
-			STVY	ST Microelectronics CMOS Imager Data (Extended CODEC Data Format with Correction Data)
-			SV10	Sorenson Video R1
-			SVQ1	Sorenson Video
-			T420	Toshiba YUV 4:2:0
-			TM2A	Duck TrueMotion Archiver 2.0 (www.duck.com)
-			TVJP	Pinnacle/Truevision Targa 2000 board (TVJP)
-			TVMJ	Pinnacle/Truevision Targa 2000 board (TVMJ)
-			TY0N	Tecomac Low-Bit Rate Codec (www.tecomac.com)
-			TY2C	Trident Decompression Driver
-			TLMS	TeraLogic Motion Intraframe Codec (TLMS)
-			TLST	TeraLogic Motion Intraframe Codec (TLST)
-			TM20	Duck TrueMotion 2.0
-			TM2X	Duck TrueMotion 2X
-			TMIC	TeraLogic Motion Intraframe Codec (TMIC)
-			TMOT	Horizons Technology TrueMotion S
-			tmot	Horizons TrueMotion Video Compression
-			TR20	Duck TrueMotion RealTime 2.0
-			TSCC	TechSmith Screen Capture Codec
-			TV10	Tecomac Low-Bit Rate Codec
-			TY2N	Trident ?TY2N?
-			U263	UB Video H.263/H.263+/H.263++ Decoder
-			UMP4	UB Video MPEG 4 (www.ubvideo.com)
-			UYNV	Nvidia UYVY packed 4:2:2
-			UYVP	Evans & Sutherland YCbCr 4:2:2 extended precision
-			UCOD	eMajix.com ClearVideo
-			ULTI	IBM Ultimotion
-			UYVY	UYVY packed 4:2:2
-			V261	Lucent VX2000S
-			VIFP	VFAPI Reader Codec (www.yks.ne.jp/~hori/)
-			VIV1	FFmpeg H263+ decoder
-			VIV2	Vivo H.263
-			VQC2	Vector-quantised codec 2 (research) http://eprints.ecs.soton.ac.uk/archive/00001310/01/VTC97-js.pdf)
-			VTLP	Alaris VideoGramPiX
-			VYU9	ATI YUV (VYU9)
-			VYUY	ATI YUV (VYUY)
-			V261	Lucent VX2000S
-			V422	Vitec Multimedia 24-bit YUV 4:2:2 Format
-			V655	Vitec Multimedia 16-bit YUV 4:2:2 Format
-			VCR1	ATI Video Codec 1
-			VCR2	ATI Video Codec 2
-			VCR3	ATI VCR 3.0
-			VCR4	ATI VCR 4.0
-			VCR5	ATI VCR 5.0
-			VCR6	ATI VCR 6.0
-			VCR7	ATI VCR 7.0
-			VCR8	ATI VCR 8.0
-			VCR9	ATI VCR 9.0
-			VDCT	Vitec Multimedia Video Maker Pro DIB
-			VDOM	VDOnet VDOWave
-			VDOW	VDOnet VDOLive (H.263)
-			VDTZ	Darim Vison VideoTizer YUV
-			VGPX	Alaris VideoGramPiX
-			VIDS	Vitec Multimedia YUV 4:2:2 CCIR 601 for V422
-			VIVO	Vivo H.263 v2.00
-			vivo	Vivo H.263
-			VIXL	Miro/Pinnacle Video XL
-			VLV1	VideoLogic/PURE Digital Videologic Capture
-			VP30	On2 VP3.0
-			VP31	On2 VP3.1
-			VP6F	On2 TrueMotion VP6
-			VX1K	Lucent VX1000S Video Codec
-			VX2K	Lucent VX2000S Video Codec
-			VXSP	Lucent VX1000SP Video Codec
-			WBVC	Winbond W9960
-			WHAM	Microsoft Video 1 (WHAM)
-			WINX	Winnov Software Compression
-			WJPG	AverMedia Winbond JPEG
-			WMV1	Windows Media Video V7
-			WMV2	Windows Media Video V8
-			WMV3	Windows Media Video V9
-			WNV1	Winnov Hardware Compression
-			XYZP	Extended PAL format XYZ palette (www.riff.org)
-			x263	Xirlink H.263
-			XLV0	NetXL Video Decoder
-			XMPG	Xing MPEG (I-Frame only)
-			XVID	XviD MPEG-4 (www.xvid.org)
-			XXAN	?XXAN?
-			YU92	Intel YUV (YU92)
-			YUNV	Nvidia Uncompressed YUV 4:2:2
-			YUVP	Extended PAL format YUV palette (www.riff.org)
-			Y211	YUV 2:1:1 Packed
-			Y411	YUV 4:1:1 Packed
-			Y41B	Weitek YUV 4:1:1 Planar
-			Y41P	Brooktree PC1 YUV 4:1:1 Packed
-			Y41T	Brooktree PC1 YUV 4:1:1 with transparency
-			Y42B	Weitek YUV 4:2:2 Planar
-			Y42T	Brooktree UYUV 4:2:2 with transparency
-			Y422	ADS Technologies Copy of UYVY used in Pyro WebCam firewire camera
-			Y800	Simple, single Y plane for monochrome images
-			Y8  	Grayscale video
-			YC12	Intel YUV 12 codec
-			YUV8	Winnov Caviar YUV8
-			YUV9	Intel YUV9
-			YUY2	Uncompressed YUV 4:2:2
-			YUYV	Canopus YUV
-			YV12	YVU12 Planar
-			YVU9	Intel YVU9 Planar (8-bpp Y plane, followed by 8-bpp 4x4 U and V planes)
-			YVYU	YVYU 4:2:2 Packed
-			ZLIB	Lossless Codec Library zlib compression (www.geocities.co.jp/Playtown-Denei/2837/LRC.htm)
-			ZPEG	Metheus Video Zipper
-
-		*/
-
-		return getid3_lib::EmbeddedLookup($fourcc, $begin, __LINE__, __FILE__, 'riff-fourcc');
-	}
-
-
-	function EitherEndian2Int($byteword, $signed=false) {
-		if ($this->getid3->info['fileformat'] == 'riff') {
-			return getid3_lib::LittleEndian2Int($byteword, $signed);
-		}
-		return getid3_lib::BigEndian2Int($byteword, false, $signed);
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio-video.swf.php b/lib/getid3/getid3/module.audio-video.swf.php
deleted file mode 100644
index a3d49f950..000000000
--- a/lib/getid3/getid3/module.audio-video.swf.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio-video.swf.php                                  //
-// module for analyzing Shockwave Flash files                  //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_swf extends getid3_handler
-{
-	var $ReturnAllTagData = false;
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat']          = 'swf';
-		$info['video']['dataformat'] = 'swf';
-
-		// http://www.openswf.org/spec/SWFfileformat.html
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-
-		$SWFfileData = fread($this->getid3->fp, $info['avdataend'] - $info['avdataoffset']); // 8 + 2 + 2 + max(9) bytes NOT including Frame_Size RECT data
-
-		$info['swf']['header']['signature']  = substr($SWFfileData, 0, 3);
-		switch ($info['swf']['header']['signature']) {
-			case 'FWS':
-				$info['swf']['header']['compressed'] = false;
-				break;
-
-			case 'CWS':
-				$info['swf']['header']['compressed'] = true;
-				break;
-
-			default:
-				$info['error'][] = 'Expecting "FWS" or "CWS" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($info['swf']['header']['signature']).'"';
-				unset($info['swf']);
-				unset($info['fileformat']);
-				return false;
-				break;
-		}
-		$info['swf']['header']['version'] = getid3_lib::LittleEndian2Int(substr($SWFfileData, 3, 1));
-		$info['swf']['header']['length']  = getid3_lib::LittleEndian2Int(substr($SWFfileData, 4, 4));
-
-		if ($info['swf']['header']['compressed']) {
-			$SWFHead     = substr($SWFfileData, 0, 8);
-			$SWFfileData = substr($SWFfileData, 8);
-			if ($decompressed = @gzuncompress($SWFfileData)) {
-				$SWFfileData = $SWFHead.$decompressed;
-			} else {
-				$info['error'][] = 'Error decompressing compressed SWF data ('.strlen($SWFfileData).' bytes compressed, should be '.($info['swf']['header']['length'] - 8).' bytes uncompressed)';
-				return false;
-			}
-		}
-
-		$FrameSizeBitsPerValue = (ord(substr($SWFfileData, 8, 1)) & 0xF8) >> 3;
-		$FrameSizeDataLength   = ceil((5 + (4 * $FrameSizeBitsPerValue)) / 8);
-		$FrameSizeDataString   = str_pad(decbin(ord(substr($SWFfileData, 8, 1)) & 0x07), 3, '0', STR_PAD_LEFT);
-		for ($i = 1; $i < $FrameSizeDataLength; $i++) {
-			$FrameSizeDataString .= str_pad(decbin(ord(substr($SWFfileData, 8 + $i, 1))), 8, '0', STR_PAD_LEFT);
-		}
-		list($X1, $X2, $Y1, $Y2) = explode("\n", wordwrap($FrameSizeDataString, $FrameSizeBitsPerValue, "\n", 1));
-		$info['swf']['header']['frame_width']  = getid3_lib::Bin2Dec($X2);
-		$info['swf']['header']['frame_height'] = getid3_lib::Bin2Dec($Y2);
-
-		// http://www-lehre.informatik.uni-osnabrueck.de/~fbstark/diplom/docs/swf/Flash_Uncovered.htm
-		// Next in the header is the frame rate, which is kind of weird.
-		// It is supposed to be stored as a 16bit integer, but the first byte
-		// (or last depending on how you look at it) is completely ignored.
-		// Example: 0x000C  ->  0x0C  ->  12     So the frame rate is 12 fps.
-
-		// Byte at (8 + $FrameSizeDataLength) is always zero and ignored
-		$info['swf']['header']['frame_rate']  = getid3_lib::LittleEndian2Int(substr($SWFfileData,  9 + $FrameSizeDataLength, 1));
-		$info['swf']['header']['frame_count'] = getid3_lib::LittleEndian2Int(substr($SWFfileData, 10 + $FrameSizeDataLength, 2));
-
-		$info['video']['frame_rate']         = $info['swf']['header']['frame_rate'];
-		$info['video']['resolution_x']       = intval(round($info['swf']['header']['frame_width']  / 20));
-		$info['video']['resolution_y']       = intval(round($info['swf']['header']['frame_height'] / 20));
-		$info['video']['pixel_aspect_ratio'] = (float) 1;
-
-		if (($info['swf']['header']['frame_count'] > 0) && ($info['swf']['header']['frame_rate'] > 0)) {
-			$info['playtime_seconds'] = $info['swf']['header']['frame_count'] / $info['swf']['header']['frame_rate'];
-		}
-//echo __LINE__.'='.number_format(microtime(true) - $start_time, 3).'<br>';
-
-
-		// SWF tags
-
-		$CurrentOffset = 12 + $FrameSizeDataLength;
-		$SWFdataLength = strlen($SWFfileData);
-
-		while ($CurrentOffset < $SWFdataLength) {
-//echo __LINE__.'='.number_format(microtime(true) - $start_time, 3).'<br>';
-
-			$TagIDTagLength = getid3_lib::LittleEndian2Int(substr($SWFfileData, $CurrentOffset, 2));
-			$TagID     = ($TagIDTagLength & 0xFFFC) >> 6;
-			$TagLength = ($TagIDTagLength & 0x003F);
-			$CurrentOffset += 2;
-			if ($TagLength == 0x3F) {
-				$TagLength = getid3_lib::LittleEndian2Int(substr($SWFfileData, $CurrentOffset, 4));
-				$CurrentOffset += 4;
-			}
-
-			unset($TagData);
-			$TagData['offset'] = $CurrentOffset;
-			$TagData['size']   = $TagLength;
-			$TagData['id']     = $TagID;
-			$TagData['data']   = substr($SWFfileData, $CurrentOffset, $TagLength);
-			switch ($TagID) {
-				case 0: // end of movie
-					break 2;
-
-				case 9: // Set background color
-					//$info['swf']['tags'][] = $TagData;
-					$info['swf']['bgcolor'] = strtoupper(str_pad(dechex(getid3_lib::BigEndian2Int($TagData['data'])), 6, '0', STR_PAD_LEFT));
-					break;
-
-				default:
-					if ($this->ReturnAllTagData) {
-						$info['swf']['tags'][] = $TagData;
-					}
-					break;
-			}
-
-			$CurrentOffset += $TagLength;
-		}
-
-		return true;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.aa.php b/lib/getid3/getid3/module.audio.aa.php
deleted file mode 100644
index 39cb77c85..000000000
--- a/lib/getid3/getid3/module.audio.aa.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.aa.php                                         //
-// module for analyzing Audible Audiobook files                //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_aa extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$AAheader  = fread($this->getid3->fp, 8);
-
-		$magic = "\x57\x90\x75\x36";
-		if (substr($AAheader, 4, 4) != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($AAheader, 4, 4)).'"';
-			return false;
-		}
-
-		// shortcut
-		$info['aa'] = array();
-		$thisfile_au = &$info['aa'];
-
-		$info['fileformat']            = 'aa';
-		$info['audio']['dataformat']   = 'aa';
-		$info['audio']['bitrate_mode'] = 'cbr'; // is it?
-		$thisfile_au['encoding']       = 'ISO-8859-1';
-
-		$thisfile_au['filesize'] = getid3_lib::BigEndian2Int(substr($AUheader,  0, 4));
-		if ($thisfile_au['filesize'] > ($info['avdataend'] - $info['avdataoffset'])) {
-			$info['warning'][] = 'Possible truncated file - expecting "'.$thisfile_au['filesize'].'" bytes of data, only found '.($info['avdataend'] - $info['avdataoffset']).' bytes"';
-		}
-
-		$info['audio']['bits_per_sample'] = 16; // is it?
-		$info['audio']['sample_rate'] = $thisfile_au['sample_rate'];
-		$info['audio']['channels']    = $thisfile_au['channels'];
-
-		//$info['playtime_seconds'] = 0;
-		//$info['audio']['bitrate'] = 0;
-
-		return true;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.aac.php b/lib/getid3/getid3/module.audio.aac.php
deleted file mode 100644
index d573e11d7..000000000
--- a/lib/getid3/getid3/module.audio.aac.php
+++ /dev/null
@@ -1,515 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.aac.php                                        //
-// module for analyzing AAC Audio files                        //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_aac extends getid3_handler
-{
-	function Analyze() {
-		$info = &$this->getid3->info;
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		if (fread($this->getid3->fp, 4) == 'ADIF') {
-			$this->getAACADIFheaderFilepointer();
-		} else {
-			$this->getAACADTSheaderFilepointer();
-		}
-		return true;
-	}
-
-
-
-	function getAACADIFheaderFilepointer() {
-		$info = &$this->getid3->info;
-		$info['fileformat']          = 'aac';
-		$info['audio']['dataformat'] = 'aac';
-		$info['audio']['lossless']   = false;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$AACheader = fread($this->getid3->fp, 1024);
-		$offset    = 0;
-
-		if (substr($AACheader, 0, 4) == 'ADIF') {
-
-			// http://faac.sourceforge.net/wiki/index.php?page=ADIF
-
-			// http://libmpeg.org/mpeg4/doc/w2203tfs.pdf
-			// adif_header() {
-			//     adif_id                                32
-			//     copyright_id_present                    1
-			//     if( copyright_id_present )
-			//         copyright_id                       72
-			//     original_copy                           1
-			//     home                                    1
-			//     bitstream_type                          1
-			//     bitrate                                23
-			//     num_program_config_elements             4
-			//     for (i = 0; i < num_program_config_elements + 1; i++ ) {
-			//         if( bitstream_type == '0' )
-			//             adif_buffer_fullness           20
-			//         program_config_element()
-			//     }
-			// }
-
-			$AACheaderBitstream = getid3_lib::BigEndian2Bin($AACheader);
-			$bitoffset          = 0;
-
-			$info['aac']['header_type']                   = 'ADIF';
-			$bitoffset += 32;
-			$info['aac']['header']['mpeg_version']        = 4;
-
-			$info['aac']['header']['copyright']           = (bool) (substr($AACheaderBitstream, $bitoffset, 1) == '1');
-			$bitoffset += 1;
-			if ($info['aac']['header']['copyright']) {
-				$info['aac']['header']['copyright_id']    = getid3_lib::Bin2String(substr($AACheaderBitstream, $bitoffset, 72));
-				$bitoffset += 72;
-			}
-			$info['aac']['header']['original_copy']       = (bool) (substr($AACheaderBitstream, $bitoffset, 1) == '1');
-			$bitoffset += 1;
-			$info['aac']['header']['home']                = (bool) (substr($AACheaderBitstream, $bitoffset, 1) == '1');
-			$bitoffset += 1;
-			$info['aac']['header']['is_vbr']              = (bool) (substr($AACheaderBitstream, $bitoffset, 1) == '1');
-			$bitoffset += 1;
-			if ($info['aac']['header']['is_vbr']) {
-				$info['audio']['bitrate_mode']            = 'vbr';
-				$info['aac']['header']['bitrate_max']     = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 23));
-				$bitoffset += 23;
-			} else {
-				$info['audio']['bitrate_mode']            = 'cbr';
-				$info['aac']['header']['bitrate']         = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 23));
-				$bitoffset += 23;
-				$info['audio']['bitrate']                 = $info['aac']['header']['bitrate'];
-			}
-			if ($info['audio']['bitrate'] == 0) {
-				$info['error'][] = 'Corrupt AAC file: bitrate_audio == zero';
-				return false;
-			}
-			$info['aac']['header']['num_program_configs'] = 1 + getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
-			$bitoffset += 4;
-
-			for ($i = 0; $i < $info['aac']['header']['num_program_configs']; $i++) {
-				// http://www.audiocoding.com/wiki/index.php?page=program_config_element
-
-				// buffer_fullness                       20
-
-				// element_instance_tag                   4
-				// object_type                            2
-				// sampling_frequency_index               4
-				// num_front_channel_elements             4
-				// num_side_channel_elements              4
-				// num_back_channel_elements              4
-				// num_lfe_channel_elements               2
-				// num_assoc_data_elements                3
-				// num_valid_cc_elements                  4
-				// mono_mixdown_present                   1
-				// mono_mixdown_element_number            4   if mono_mixdown_present == 1
-				// stereo_mixdown_present                 1
-				// stereo_mixdown_element_number          4   if stereo_mixdown_present == 1
-				// matrix_mixdown_idx_present             1
-				// matrix_mixdown_idx                     2   if matrix_mixdown_idx_present == 1
-				// pseudo_surround_enable                 1   if matrix_mixdown_idx_present == 1
-				// for (i = 0; i < num_front_channel_elements; i++) {
-				//     front_element_is_cpe[i]            1
-				//     front_element_tag_select[i]        4
-				// }
-				// for (i = 0; i < num_side_channel_elements; i++) {
-				//     side_element_is_cpe[i]             1
-				//     side_element_tag_select[i]         4
-				// }
-				// for (i = 0; i < num_back_channel_elements; i++) {
-				//     back_element_is_cpe[i]             1
-				//     back_element_tag_select[i]         4
-				// }
-				// for (i = 0; i < num_lfe_channel_elements; i++) {
-				//     lfe_element_tag_select[i]          4
-				// }
-				// for (i = 0; i < num_assoc_data_elements; i++) {
-				//     assoc_data_element_tag_select[i]   4
-				// }
-				// for (i = 0; i < num_valid_cc_elements; i++) {
-				//     cc_element_is_ind_sw[i]            1
-				//     valid_cc_element_tag_select[i]     4
-				// }
-				// byte_alignment()                       VAR
-				// comment_field_bytes                    8
-				// for (i = 0; i < comment_field_bytes; i++) {
-				//     comment_field_data[i]              8
-				// }
-
-				if (!$info['aac']['header']['is_vbr']) {
-					$info['aac']['program_configs'][$i]['buffer_fullness']        = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 20));
-					$bitoffset += 20;
-				}
-				$info['aac']['program_configs'][$i]['element_instance_tag']       = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
-				$bitoffset += 4;
-				$info['aac']['program_configs'][$i]['object_type']                = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 2));
-				$bitoffset += 2;
-				$info['aac']['program_configs'][$i]['sampling_frequency_index']   = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
-				$bitoffset += 4;
-				$info['aac']['program_configs'][$i]['num_front_channel_elements'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
-				$bitoffset += 4;
-				$info['aac']['program_configs'][$i]['num_side_channel_elements']  = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
-				$bitoffset += 4;
-				$info['aac']['program_configs'][$i]['num_back_channel_elements']  = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
-				$bitoffset += 4;
-				$info['aac']['program_configs'][$i]['num_lfe_channel_elements']   = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 2));
-				$bitoffset += 2;
-				$info['aac']['program_configs'][$i]['num_assoc_data_elements']    = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 3));
-				$bitoffset += 3;
-				$info['aac']['program_configs'][$i]['num_valid_cc_elements']      = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
-				$bitoffset += 4;
-				$info['aac']['program_configs'][$i]['mono_mixdown_present']       = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
-				$bitoffset += 1;
-				if ($info['aac']['program_configs'][$i]['mono_mixdown_present']) {
-					$info['aac']['program_configs'][$i]['mono_mixdown_element_number']    = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
-					$bitoffset += 4;
-				}
-				$info['aac']['program_configs'][$i]['stereo_mixdown_present']             = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
-				$bitoffset += 1;
-				if ($info['aac']['program_configs'][$i]['stereo_mixdown_present']) {
-					$info['aac']['program_configs'][$i]['stereo_mixdown_element_number']  = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
-					$bitoffset += 4;
-				}
-				$info['aac']['program_configs'][$i]['matrix_mixdown_idx_present']         = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
-				$bitoffset += 1;
-				if ($info['aac']['program_configs'][$i]['matrix_mixdown_idx_present']) {
-					$info['aac']['program_configs'][$i]['matrix_mixdown_idx']             = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 2));
-					$bitoffset += 2;
-					$info['aac']['program_configs'][$i]['pseudo_surround_enable']         = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
-					$bitoffset += 1;
-				}
-				for ($j = 0; $j < $info['aac']['program_configs'][$i]['num_front_channel_elements']; $j++) {
-					$info['aac']['program_configs'][$i]['front_element_is_cpe'][$j]     = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
-					$bitoffset += 1;
-					$info['aac']['program_configs'][$i]['front_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
-					$bitoffset += 4;
-				}
-				for ($j = 0; $j < $info['aac']['program_configs'][$i]['num_side_channel_elements']; $j++) {
-					$info['aac']['program_configs'][$i]['side_element_is_cpe'][$j]     = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
-					$bitoffset += 1;
-					$info['aac']['program_configs'][$i]['side_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
-					$bitoffset += 4;
-				}
-				for ($j = 0; $j < $info['aac']['program_configs'][$i]['num_back_channel_elements']; $j++) {
-					$info['aac']['program_configs'][$i]['back_element_is_cpe'][$j]     = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
-					$bitoffset += 1;
-					$info['aac']['program_configs'][$i]['back_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
-					$bitoffset += 4;
-				}
-				for ($j = 0; $j < $info['aac']['program_configs'][$i]['num_lfe_channel_elements']; $j++) {
-					$info['aac']['program_configs'][$i]['lfe_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
-					$bitoffset += 4;
-				}
-				for ($j = 0; $j < $info['aac']['program_configs'][$i]['num_assoc_data_elements']; $j++) {
-					$info['aac']['program_configs'][$i]['assoc_data_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
-					$bitoffset += 4;
-				}
-				for ($j = 0; $j < $info['aac']['program_configs'][$i]['num_valid_cc_elements']; $j++) {
-					$info['aac']['program_configs'][$i]['cc_element_is_ind_sw'][$j]          = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
-					$bitoffset += 1;
-					$info['aac']['program_configs'][$i]['valid_cc_element_tag_select'][$j]   = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
-					$bitoffset += 4;
-				}
-
-				$bitoffset = ceil($bitoffset / 8) * 8;
-
-				$info['aac']['program_configs'][$i]['comment_field_bytes'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 8));
-				$bitoffset += 8;
-				$info['aac']['program_configs'][$i]['comment_field']       = getid3_lib::Bin2String(substr($AACheaderBitstream, $bitoffset, 8 * $info['aac']['program_configs'][$i]['comment_field_bytes']));
-				$bitoffset += 8 * $info['aac']['program_configs'][$i]['comment_field_bytes'];
-
-
-				$info['aac']['header']['profile']                           = self::AACprofileLookup($info['aac']['program_configs'][$i]['object_type'], $info['aac']['header']['mpeg_version']);
-				$info['aac']['program_configs'][$i]['sampling_frequency']   = self::AACsampleRateLookup($info['aac']['program_configs'][$i]['sampling_frequency_index']);
-				$info['audio']['sample_rate']                               = $info['aac']['program_configs'][$i]['sampling_frequency'];
-				$info['audio']['channels']                                  = self::AACchannelCountCalculate($info['aac']['program_configs'][$i]);
-				if ($info['aac']['program_configs'][$i]['comment_field']) {
-					$info['aac']['comments'][]                          = $info['aac']['program_configs'][$i]['comment_field'];
-				}
-			}
-			$info['playtime_seconds'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['audio']['bitrate'];
-
-			$info['audio']['encoder_options'] = $info['aac']['header_type'].' '.$info['aac']['header']['profile'];
-
-
-
-			return true;
-
-		} else {
-
-			unset($info['fileformat']);
-			unset($info['aac']);
-			$info['error'][] = 'AAC-ADIF synch not found at offset '.$info['avdataoffset'].' (expected "ADIF", found "'.substr($AACheader, 0, 4).'" instead)';
-			return false;
-
-		}
-
-	}
-
-
-	function getAACADTSheaderFilepointer($MaxFramesToScan=1000000, $ReturnExtendedInfo=false) {
-		$info = &$this->getid3->info;
-
-		// based loosely on code from AACfile by Jurgen Faul  <jfaul�gmx.de>
-		// http://jfaul.de/atl  or  http://j-faul.virtualave.net/atl/atl.html
-
-
-		// http://faac.sourceforge.net/wiki/index.php?page=ADTS // dead link
-		// http://wiki.multimedia.cx/index.php?title=ADTS
-
-		// * ADTS Fixed Header: these don't change from frame to frame
-		// syncword                                       12    always: '111111111111'
-		// ID                                              1    0: MPEG-4, 1: MPEG-2
-		// MPEG layer                                      2    If you send AAC in MPEG-TS, set to 0
-		// protection_absent                               1    0: CRC present; 1: no CRC
-		// profile                                         2    0: AAC Main; 1: AAC LC (Low Complexity); 2: AAC SSR (Scalable Sample Rate); 3: AAC LTP (Long Term Prediction)
-		// sampling_frequency_index                        4    15 not allowed
-		// private_bit                                     1    usually 0
-		// channel_configuration                           3
-		// original/copy                                   1    0: original; 1: copy
-		// home                                            1    usually 0
-		// emphasis                                        2    only if ID == 0 (ie MPEG-4)  // not present in some documentation?
-
-		// * ADTS Variable Header: these can change from frame to frame
-		// copyright_identification_bit                    1
-		// copyright_identification_start                  1
-		// aac_frame_length                               13    length of the frame including header (in bytes)
-		// adts_buffer_fullness                           11    0x7FF indicates VBR
-		// no_raw_data_blocks_in_frame                     2
-
-		// * ADTS Error check
-		// crc_check                                      16    only if protection_absent == 0
-
-		$byteoffset  = $info['avdataoffset'];
-		$framenumber = 0;
-
-		// Init bit pattern array
-		static $decbin = array();
-
-		// Populate $bindec
-		for ($i = 0; $i < 256; $i++) {
-			$decbin[chr($i)] = str_pad(decbin($i), 8, '0', STR_PAD_LEFT);
-		}
-
-		// used to calculate bitrate below
-		$BitrateCache = array();
-
-
-		while (true) {
-			// breaks out when end-of-file encountered, or invalid data found,
-			// or MaxFramesToScan frames have been scanned
-
-			if (!getid3_lib::intValueSupported($byteoffset)) {
-				$info['warning'][] = 'Unable to parse AAC file beyond '.ftell($this->getid3->fp).' (PHP does not support file operations beyond '.round(PHP_INT_MAX / 1073741824).'GB)';
-				return false;
-			}
-			fseek($this->getid3->fp, $byteoffset, SEEK_SET);
-
-			// First get substring
-			$substring = fread($this->getid3->fp, 9); // header is 7 bytes (or 9 if CRC is present)
-			$substringlength = strlen($substring);
-			if ($substringlength != 9) {
-				$info['error'][] = 'Failed to read 7 bytes at offset '.(ftell($this->getid3->fp) - $substringlength).' (only read '.$substringlength.' bytes)';
-				return false;
-			}
-			// this would be easier with 64-bit math, but split it up to allow for 32-bit:
-			$header1 = getid3_lib::BigEndian2Int(substr($substring, 0, 2));
-			$header2 = getid3_lib::BigEndian2Int(substr($substring, 2, 4));
-			$header3 = getid3_lib::BigEndian2Int(substr($substring, 6, 1));
-
-			$info['aac']['header']['raw']['syncword']          = ($header1 & 0xFFF0) >> 4;
-			if ($info['aac']['header']['raw']['syncword'] != 0x0FFF) {
-				$info['error'][] = 'Synch pattern (0x0FFF) not found at offset '.(ftell($this->getid3->fp) - $substringlength).' (found 0x0'.strtoupper(dechex($info['aac']['header']['raw']['syncword'])).' instead)';
-				//if ($info['fileformat'] == 'aac') {
-				//	return true;
-				//}
-				unset($info['aac']);
-				return false;
-			}
-
-			// Gather info for first frame only - this takes time to do 1000 times!
-			if ($framenumber == 0) {
-				$info['aac']['header_type']                      = 'ADTS';
-				$info['fileformat']                              = 'aac';
-				$info['audio']['dataformat']                     = 'aac';
-
-				$info['aac']['header']['raw']['mpeg_version']      = ($header1 & 0x0008) >> 3;
-				$info['aac']['header']['raw']['mpeg_layer']        = ($header1 & 0x0006) >> 1;
-				$info['aac']['header']['raw']['protection_absent'] = ($header1 & 0x0001) >> 0;
-
-				$info['aac']['header']['raw']['profile_code']      = ($header2 & 0xC0000000) >> 30;
-				$info['aac']['header']['raw']['sample_rate_code']  = ($header2 & 0x3C000000) >> 26;
-				$info['aac']['header']['raw']['private_stream']    = ($header2 & 0x02000000) >> 25;
-				$info['aac']['header']['raw']['channels_code']     = ($header2 & 0x01C00000) >> 22;
-				$info['aac']['header']['raw']['original']          = ($header2 & 0x00200000) >> 21;
-				$info['aac']['header']['raw']['home']              = ($header2 & 0x00100000) >> 20;
-				$info['aac']['header']['raw']['copyright_stream']  = ($header2 & 0x00080000) >> 19;
-				$info['aac']['header']['raw']['copyright_start']   = ($header2 & 0x00040000) >> 18;
-				$info['aac']['header']['raw']['frame_length']      = ($header2 & 0x0003FFE0) >>  5;
-
-				$info['aac']['header']['mpeg_version']     = ($info['aac']['header']['raw']['mpeg_version']      ? 2    : 4);
-				$info['aac']['header']['crc_present']      = ($info['aac']['header']['raw']['protection_absent'] ? false: true);
-				$info['aac']['header']['profile']          = self::AACprofileLookup($info['aac']['header']['raw']['profile_code'], $info['aac']['header']['mpeg_version']);
-				$info['aac']['header']['sample_frequency'] = self::AACsampleRateLookup($info['aac']['header']['raw']['sample_rate_code']);
-				$info['aac']['header']['private']          = (bool) $info['aac']['header']['raw']['private_stream'];
-				$info['aac']['header']['original']         = (bool) $info['aac']['header']['raw']['original'];
-				$info['aac']['header']['home']             = (bool) $info['aac']['header']['raw']['home'];
-				$info['aac']['header']['channels']         = (($info['aac']['header']['raw']['channels_code'] == 7) ? 8 : $info['aac']['header']['raw']['channels_code']);
-				if ($ReturnExtendedInfo) {
-					$info['aac'][$framenumber]['copyright_id_bit']   = (bool) $info['aac']['header']['raw']['copyright_stream'];
-					$info['aac'][$framenumber]['copyright_id_start'] = (bool) $info['aac']['header']['raw']['copyright_start'];
-				}
-
-				if ($info['aac']['header']['raw']['mpeg_layer'] != 0) {
-					$info['warning'][] = 'Layer error - expected "0", found "'.$info['aac']['header']['raw']['mpeg_layer'].'" instead';
-				}
-				if ($info['aac']['header']['sample_frequency'] == 0) {
-					$info['error'][] = 'Corrupt AAC file: sample_frequency == zero';
-					return false;
-				}
-
-				$info['audio']['sample_rate'] = $info['aac']['header']['sample_frequency'];
-				$info['audio']['channels']    = $info['aac']['header']['channels'];
-			}
-
-			$FrameLength = ($header2 & 0x0003FFE0) >>  5;
-
-			if (!isset($BitrateCache[$FrameLength])) {
-				$BitrateCache[$FrameLength] = ($info['aac']['header']['sample_frequency'] / 1024) * $FrameLength * 8;
-			}
-			getid3_lib::safe_inc($info['aac']['bitrate_distribution'][$BitrateCache[$FrameLength]], 1);
-
-			$info['aac'][$framenumber]['aac_frame_length']     = $FrameLength;
-
-			$info['aac'][$framenumber]['adts_buffer_fullness'] = (($header2 & 0x0000001F) << 6) & (($header3 & 0xFC) >> 2);
-			if ($info['aac'][$framenumber]['adts_buffer_fullness'] == 0x07FF) {
-				$info['audio']['bitrate_mode'] = 'vbr';
-			} else {
-				$info['audio']['bitrate_mode'] = 'cbr';
-			}
-			$info['aac'][$framenumber]['num_raw_data_blocks']  = (($header3 & 0x03) >> 0);
-
-			if ($info['aac']['header']['crc_present']) {
-				//$info['aac'][$framenumber]['crc'] = getid3_lib::BigEndian2Int(substr($substring, 7, 2);
-			}
-
-			if (!$ReturnExtendedInfo) {
-				unset($info['aac'][$framenumber]);
-			}
-
-			/*
-			$rounded_precision = 5000;
-			$info['aac']['bitrate_distribution_rounded'] = array();
-			foreach ($info['aac']['bitrate_distribution'] as $bitrate => $count) {
-				$rounded_bitrate = round($bitrate / $rounded_precision) * $rounded_precision;
-				getid3_lib::safe_inc($info['aac']['bitrate_distribution_rounded'][$rounded_bitrate], $count);
-			}
-			ksort($info['aac']['bitrate_distribution_rounded']);
-			*/
-
-			$byteoffset += $FrameLength;
-			if ((++$framenumber < $MaxFramesToScan) && (($byteoffset + 10) < $info['avdataend'])) {
-
-				// keep scanning
-
-			} else {
-
-				$info['aac']['frames']    = $framenumber;
-				$info['playtime_seconds'] = ($info['avdataend'] / $byteoffset) * (($framenumber * 1024) / $info['aac']['header']['sample_frequency']);  // (1 / % of file scanned) * (samples / (samples/sec)) = seconds
-				if ($info['playtime_seconds'] == 0) {
-					$info['error'][] = 'Corrupt AAC file: playtime_seconds == zero';
-					return false;
-				}
-				$info['audio']['bitrate']    = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-				ksort($info['aac']['bitrate_distribution']);
-
-				$info['audio']['encoder_options'] = $info['aac']['header_type'].' '.$info['aac']['header']['profile'];
-
-				return true;
-
-			}
-		}
-		// should never get here.
-	}
-
-	public static function AACsampleRateLookup($samplerateid) {
-		static $AACsampleRateLookup = array();
-		if (empty($AACsampleRateLookup)) {
-			$AACsampleRateLookup[0]  = 96000;
-			$AACsampleRateLookup[1]  = 88200;
-			$AACsampleRateLookup[2]  = 64000;
-			$AACsampleRateLookup[3]  = 48000;
-			$AACsampleRateLookup[4]  = 44100;
-			$AACsampleRateLookup[5]  = 32000;
-			$AACsampleRateLookup[6]  = 24000;
-			$AACsampleRateLookup[7]  = 22050;
-			$AACsampleRateLookup[8]  = 16000;
-			$AACsampleRateLookup[9]  = 12000;
-			$AACsampleRateLookup[10] = 11025;
-			$AACsampleRateLookup[11] = 8000;
-			$AACsampleRateLookup[12] = 0;
-			$AACsampleRateLookup[13] = 0;
-			$AACsampleRateLookup[14] = 0;
-			$AACsampleRateLookup[15] = 0;
-		}
-		return (isset($AACsampleRateLookup[$samplerateid]) ? $AACsampleRateLookup[$samplerateid] : 'invalid');
-	}
-
-	public static function AACprofileLookup($profileid, $mpegversion) {
-		static $AACprofileLookup = array();
-		if (empty($AACprofileLookup)) {
-			$AACprofileLookup[2][0]  = 'Main profile';
-			$AACprofileLookup[2][1]  = 'Low Complexity profile (LC)';
-			$AACprofileLookup[2][2]  = 'Scalable Sample Rate profile (SSR)';
-			$AACprofileLookup[2][3]  = '(reserved)';
-			$AACprofileLookup[4][0]  = 'AAC_MAIN';
-			$AACprofileLookup[4][1]  = 'AAC_LC';
-			$AACprofileLookup[4][2]  = 'AAC_SSR';
-			$AACprofileLookup[4][3]  = 'AAC_LTP';
-		}
-		return (isset($AACprofileLookup[$mpegversion][$profileid]) ? $AACprofileLookup[$mpegversion][$profileid] : 'invalid');
-	}
-
-	public static function AACchannelCountCalculate($program_configs) {
-		$channels = 0;
-		for ($i = 0; $i < $program_configs['num_front_channel_elements']; $i++) {
-			$channels++;
-			if ($program_configs['front_element_is_cpe'][$i]) {
-				// each front element is channel pair (CPE = Channel Pair Element)
-				$channels++;
-			}
-		}
-		for ($i = 0; $i < $program_configs['num_side_channel_elements']; $i++) {
-			$channels++;
-			if ($program_configs['side_element_is_cpe'][$i]) {
-				// each side element is channel pair (CPE = Channel Pair Element)
-				$channels++;
-			}
-		}
-		for ($i = 0; $i < $program_configs['num_back_channel_elements']; $i++) {
-			$channels++;
-			if ($program_configs['back_element_is_cpe'][$i]) {
-				// each back element is channel pair (CPE = Channel Pair Element)
-				$channels++;
-			}
-		}
-		for ($i = 0; $i < $program_configs['num_lfe_channel_elements']; $i++) {
-			$channels++;
-		}
-		return $channels;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.ac3.php b/lib/getid3/getid3/module.audio.ac3.php
deleted file mode 100644
index ffe017468..000000000
--- a/lib/getid3/getid3/module.audio.ac3.php
+++ /dev/null
@@ -1,473 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.ac3.php                                        //
-// module for analyzing AC-3 (aka Dolby Digital) audio files   //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_ac3 extends getid3_handler
-{
-    private $AC3header  = '';
-    private $BSIoffset = 0;
-
-
-	public function Analyze() {
-		$info = &$this->getid3->info;
-
-		///AH
-		$info['ac3']['raw']['bsi'] = array();
-		$thisfile_ac3              = &$info['ac3'];
-		$thisfile_ac3_raw          = &$thisfile_ac3['raw'];
-		$thisfile_ac3_raw_bsi      = &$thisfile_ac3_raw['bsi'];
-
-
-		// http://www.atsc.org/standards/a_52a.pdf
-
-		$info['fileformat']            = 'ac3';
-
-		// An AC-3 serial coded audio bit stream is made up of a sequence of synchronization frames
-		// Each synchronization frame contains 6 coded audio blocks (AB), each of which represent 256
-		// new audio samples per channel. A synchronization information (SI) header at the beginning
-		// of each frame contains information needed to acquire and maintain synchronization. A
-		// bit stream information (BSI) header follows SI, and contains parameters describing the coded
-		// audio service. The coded audio blocks may be followed by an auxiliary data (Aux) field. At the
-		// end of each frame is an error check field that includes a CRC word for error detection. An
-		// additional CRC word is located in the SI header, the use of which, by a decoder, is optional.
-		//
-		// syncinfo() | bsi() | AB0 | AB1 | AB2 | AB3 | AB4 | AB5 | Aux | CRC
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$this->AC3header['syncinfo'] = fread($this->getid3->fp, 5);
-		$thisfile_ac3_raw['synchinfo']['synchword'] = substr($this->AC3header['syncinfo'], 0, 2);
-
-		$magic = "\x0B\x77";
-		if ($thisfile_ac3_raw['synchinfo']['synchword'] != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($thisfile_ac3_raw['synchinfo']['synchword']).'"';
-			unset($info['fileformat'], $info['ac3']);
-			return false;
-		}
-
-		$info['audio']['dataformat']   = 'ac3';
-		$info['audio']['bitrate_mode'] = 'cbr';
-		$info['audio']['lossless']     = false;
-
-		// syncinfo() {
-		// 	 syncword    16
-		// 	 crc1        16
-		// 	 fscod        2
-		// 	 frmsizecod   6
-		// } /* end of syncinfo */
-
-		$thisfile_ac3_raw['synchinfo']['crc1']       = getid3_lib::LittleEndian2Int(substr($this->AC3header['syncinfo'], 2, 2));
-		$ac3_synchinfo_fscod_frmsizecod              = getid3_lib::LittleEndian2Int(substr($this->AC3header['syncinfo'], 4, 1));
-		$thisfile_ac3_raw['synchinfo']['fscod']      = ($ac3_synchinfo_fscod_frmsizecod & 0xC0) >> 6;
-		$thisfile_ac3_raw['synchinfo']['frmsizecod'] = ($ac3_synchinfo_fscod_frmsizecod & 0x3F);
-
-		$thisfile_ac3['sample_rate'] = $this->AC3sampleRateCodeLookup($thisfile_ac3_raw['synchinfo']['fscod']);
-		if ($thisfile_ac3_raw['synchinfo']['fscod'] <= 3) {
-			$info['audio']['sample_rate'] = $thisfile_ac3['sample_rate'];
-		}
-
-		$thisfile_ac3['frame_length'] = $this->AC3frameSizeLookup($thisfile_ac3_raw['synchinfo']['frmsizecod'], $thisfile_ac3_raw['synchinfo']['fscod']);
-		$thisfile_ac3['bitrate']      = $this->AC3bitrateLookup($thisfile_ac3_raw['synchinfo']['frmsizecod']);
-		$info['audio']['bitrate'] = $thisfile_ac3['bitrate'];
-
-		$this->AC3header['bsi'] = getid3_lib::BigEndian2Bin(fread($this->getid3->fp, 15));
-		$ac3_bsi_offset = 0;
-
-		$thisfile_ac3_raw_bsi['bsid'] = $this->readHeaderBSI(5);
-		if ($thisfile_ac3_raw_bsi['bsid'] > 8) {
-			// Decoders which can decode version 8 will thus be able to decode version numbers less than 8.
-			// If this standard is extended by the addition of additional elements or features, a value of bsid greater than 8 will be used.
-			// Decoders built to this version of the standard will not be able to decode versions with bsid greater than 8.
-			$info['error'][] = 'Bit stream identification is version '.$thisfile_ac3_raw_bsi['bsid'].', but getID3() only understands up to version 8';
-			unset($thisfile_ac3);
-			return false;
-		}
-
-		$thisfile_ac3_raw_bsi['bsmod'] = $this->readHeaderBSI(3);
-		$thisfile_ac3_raw_bsi['acmod'] = $this->readHeaderBSI(3);
-
-		$thisfile_ac3['service_type'] = $this->AC3serviceTypeLookup($thisfile_ac3_raw_bsi['bsmod'], $thisfile_ac3_raw_bsi['acmod']);
-		$ac3_coding_mode = $this->AC3audioCodingModeLookup($thisfile_ac3_raw_bsi['acmod']);
-		foreach($ac3_coding_mode as $key => $value) {
-			$thisfile_ac3[$key] = $value;
-		}
-		switch ($thisfile_ac3_raw_bsi['acmod']) {
-			case 0:
-			case 1:
-				$info['audio']['channelmode'] = 'mono';
-				break;
-			case 3:
-			case 4:
-				$info['audio']['channelmode'] = 'stereo';
-				break;
-			default:
-				$info['audio']['channelmode'] = 'surround';
-				break;
-		}
-		$info['audio']['channels'] = $thisfile_ac3['num_channels'];
-
-		if ($thisfile_ac3_raw_bsi['acmod'] & 0x01) {
-			// If the lsb of acmod is a 1, center channel is in use and cmixlev follows in the bit stream.
-			$thisfile_ac3_raw_bsi['cmixlev'] = $this->readHeaderBSI(2);
-			$thisfile_ac3['center_mix_level'] = $this->AC3centerMixLevelLookup($thisfile_ac3_raw_bsi['cmixlev']);
-		}
-
-		if ($thisfile_ac3_raw_bsi['acmod'] & 0x04) {
-			// If the msb of acmod is a 1, surround channels are in use and surmixlev follows in the bit stream.
-			$thisfile_ac3_raw_bsi['surmixlev'] = $this->readHeaderBSI(2);
-			$thisfile_ac3['surround_mix_level'] = $this->AC3surroundMixLevelLookup($thisfile_ac3_raw_bsi['surmixlev']);
-		}
-
-		if ($thisfile_ac3_raw_bsi['acmod'] == 0x02) {
-			// When operating in the two channel mode, this 2-bit code indicates whether or not the program has been encoded in Dolby Surround.
-			$thisfile_ac3_raw_bsi['dsurmod'] = $this->readHeaderBSI(2);
-			$thisfile_ac3['dolby_surround_mode'] = $this->AC3dolbySurroundModeLookup($thisfile_ac3_raw_bsi['dsurmod']);
-		}
-
-		$thisfile_ac3_raw_bsi['lfeon'] = (bool) $this->readHeaderBSI(1);
-		$thisfile_ac3['lfe_enabled'] = $thisfile_ac3_raw_bsi['lfeon'];
-		if ($thisfile_ac3_raw_bsi['lfeon']) {
-			//$info['audio']['channels']++;
-			$info['audio']['channels'] .= '.1';
-		}
-
-		$thisfile_ac3['channels_enabled'] = $this->AC3channelsEnabledLookup($thisfile_ac3_raw_bsi['acmod'], $thisfile_ac3_raw_bsi['lfeon']);
-
-		// This indicates how far the average dialogue level is below digital 100 percent. Valid values are 1�31.
-		// The value of 0 is reserved. The values of 1 to 31 are interpreted as -1 dB to -31 dB with respect to digital 100 percent.
-		$thisfile_ac3_raw_bsi['dialnorm'] = $this->readHeaderBSI(5);
-		$thisfile_ac3['dialogue_normalization'] = '-'.$thisfile_ac3_raw_bsi['dialnorm'].'dB';
-
-		$thisfile_ac3_raw_bsi['compre_flag'] = (bool) $this->readHeaderBSI(1);
-		if ($thisfile_ac3_raw_bsi['compre_flag']) {
-			$thisfile_ac3_raw_bsi['compr'] = $this->readHeaderBSI(8);
-			$thisfile_ac3['heavy_compression'] = $this->AC3heavyCompression($thisfile_ac3_raw_bsi['compr']);
-		}
-
-		$thisfile_ac3_raw_bsi['langcode_flag'] = (bool) $this->readHeaderBSI(1);
-		if ($thisfile_ac3_raw_bsi['langcode_flag']) {
-			$thisfile_ac3_raw_bsi['langcod'] = $this->readHeaderBSI(8);
-		}
-
-		$thisfile_ac3_raw_bsi['audprodie'] = (bool) $this->readHeaderBSI(1);
-		if ($thisfile_ac3_raw_bsi['audprodie']) {
-			$thisfile_ac3_raw_bsi['mixlevel'] = $this->readHeaderBSI(5);
-			$thisfile_ac3_raw_bsi['roomtyp']  = $this->readHeaderBSI(2);
-
-			$thisfile_ac3['mixing_level'] = (80 + $thisfile_ac3_raw_bsi['mixlevel']).'dB';
-			$thisfile_ac3['room_type']    = $this->AC3roomTypeLookup($thisfile_ac3_raw_bsi['roomtyp']);
-		}
-
-		if ($thisfile_ac3_raw_bsi['acmod'] == 0x00) {
-			// If acmod is 0, then two completely independent program channels (dual mono)
-			// are encoded into the bit stream, and are referenced as Ch1, Ch2. In this case,
-			// a number of additional items are present in BSI or audblk to fully describe Ch2.
-
-			// This indicates how far the average dialogue level is below digital 100 percent. Valid values are 1�31.
-			// The value of 0 is reserved. The values of 1 to 31 are interpreted as -1 dB to -31 dB with respect to digital 100 percent.
-			$thisfile_ac3_raw_bsi['dialnorm2'] = $this->readHeaderBSI(5);
-			$thisfile_ac3['dialogue_normalization2'] = '-'.$thisfile_ac3_raw_bsi['dialnorm2'].'dB';
-
-			$thisfile_ac3_raw_bsi['compre_flag2'] = (bool) $this->readHeaderBSI(1);
-			if ($thisfile_ac3_raw_bsi['compre_flag2']) {
-				$thisfile_ac3_raw_bsi['compr2'] = $this->readHeaderBSI(8);
-				$thisfile_ac3['heavy_compression2'] = $this->AC3heavyCompression($thisfile_ac3_raw_bsi['compr2']);
-			}
-
-			$thisfile_ac3_raw_bsi['langcode_flag2'] = (bool) $this->readHeaderBSI(1);
-			if ($thisfile_ac3_raw_bsi['langcode_flag2']) {
-				$thisfile_ac3_raw_bsi['langcod2'] = $this->readHeaderBSI(8);
-			}
-
-			$thisfile_ac3_raw_bsi['audprodie2'] = (bool) $this->readHeaderBSI(1);
-			if ($thisfile_ac3_raw_bsi['audprodie2']) {
-				$thisfile_ac3_raw_bsi['mixlevel2'] = $this->readHeaderBSI(5);
-				$thisfile_ac3_raw_bsi['roomtyp2']  = $this->readHeaderBSI(2);
-
-				$thisfile_ac3['mixing_level2'] = (80 + $thisfile_ac3_raw_bsi['mixlevel2']).'dB';
-				$thisfile_ac3['room_type2']    = $this->AC3roomTypeLookup($thisfile_ac3_raw_bsi['roomtyp2']);
-			}
-
-		}
-
-		$thisfile_ac3_raw_bsi['copyright'] = (bool) $this->readHeaderBSI(1);
-
-		$thisfile_ac3_raw_bsi['original']  = (bool) $this->readHeaderBSI(1);
-
-		$thisfile_ac3_raw_bsi['timecode1_flag'] = (bool) $this->readHeaderBSI(1);
-		if ($thisfile_ac3_raw_bsi['timecode1_flag']) {
-			$thisfile_ac3_raw_bsi['timecode1'] = $this->readHeaderBSI(14);
-		}
-
-		$thisfile_ac3_raw_bsi['timecode2_flag'] = (bool) $this->readHeaderBSI(1);
-		if ($thisfile_ac3_raw_bsi['timecode2_flag']) {
-			$thisfile_ac3_raw_bsi['timecode2'] = $this->readHeaderBSI(14);
-		}
-
-		$thisfile_ac3_raw_bsi['addbsi_flag'] = (bool) $this->readHeaderBSI(1);
-		if ($thisfile_ac3_raw_bsi['addbsi_flag']) {
-			$thisfile_ac3_raw_bsi['addbsi_length'] = $this->readHeaderBSI(6);
-
-			$this->AC3header['bsi'] .= getid3_lib::BigEndian2Bin(fread($this->getid3->fp, $thisfile_ac3_raw_bsi['addbsi_length']));
-
-			$thisfile_ac3_raw_bsi['addbsi_data'] = substr($this->AC3header['bsi'], $this->BSIoffset, $thisfile_ac3_raw_bsi['addbsi_length'] * 8);
-			$this->BSIoffset += $thisfile_ac3_raw_bsi['addbsi_length'] * 8;
-		}
-
-		return true;
-	}
-
-	private function readHeaderBSI($length) {
-		$data = substr($this->AC3header['bsi'], $this->BSIoffset, $length);
-		$this->BSIoffset += $length;
-
-		return bindec($data);
-	}
-
-	public static function AC3sampleRateCodeLookup($fscod) {
-		static $AC3sampleRateCodeLookup = array(
-			0 => 48000,
-			1 => 44100,
-			2 => 32000,
-			3 => 'reserved' // If the reserved code is indicated, the decoder should not attempt to decode audio and should mute.
-		);
-		return (isset($AC3sampleRateCodeLookup[$fscod]) ? $AC3sampleRateCodeLookup[$fscod] : false);
-	}
-
-	public static function AC3serviceTypeLookup($bsmod, $acmod) {
-		static $AC3serviceTypeLookup = array();
-		if (empty($AC3serviceTypeLookup)) {
-			for ($i = 0; $i <= 7; $i++) {
-				$AC3serviceTypeLookup[0][$i] = 'main audio service: complete main (CM)';
-				$AC3serviceTypeLookup[1][$i] = 'main audio service: music and effects (ME)';
-				$AC3serviceTypeLookup[2][$i] = 'associated service: visually impaired (VI)';
-				$AC3serviceTypeLookup[3][$i] = 'associated service: hearing impaired (HI)';
-				$AC3serviceTypeLookup[4][$i] = 'associated service: dialogue (D)';
-				$AC3serviceTypeLookup[5][$i] = 'associated service: commentary (C)';
-				$AC3serviceTypeLookup[6][$i] = 'associated service: emergency (E)';
-			}
-
-			$AC3serviceTypeLookup[7][1]      = 'associated service: voice over (VO)';
-			for ($i = 2; $i <= 7; $i++) {
-				$AC3serviceTypeLookup[7][$i] = 'main audio service: karaoke';
-			}
-		}
-		return (isset($AC3serviceTypeLookup[$bsmod][$acmod]) ? $AC3serviceTypeLookup[$bsmod][$acmod] : false);
-	}
-
-	public static function AC3audioCodingModeLookup($acmod) {
-		static $AC3audioCodingModeLookup = array();
-		if (empty($AC3audioCodingModeLookup)) {
-			// array(channel configuration, # channels (not incl LFE), channel order)
-			$AC3audioCodingModeLookup = array (
-				0 => array('channel_config'=>'1+1', 'num_channels'=>2, 'channel_order'=>'Ch1,Ch2'),
-				1 => array('channel_config'=>'1/0', 'num_channels'=>1, 'channel_order'=>'C'),
-				2 => array('channel_config'=>'2/0', 'num_channels'=>2, 'channel_order'=>'L,R'),
-				3 => array('channel_config'=>'3/0', 'num_channels'=>3, 'channel_order'=>'L,C,R'),
-				4 => array('channel_config'=>'2/1', 'num_channels'=>3, 'channel_order'=>'L,R,S'),
-				5 => array('channel_config'=>'3/1', 'num_channels'=>4, 'channel_order'=>'L,C,R,S'),
-				6 => array('channel_config'=>'2/2', 'num_channels'=>4, 'channel_order'=>'L,R,SL,SR'),
-				7 => array('channel_config'=>'3/2', 'num_channels'=>5, 'channel_order'=>'L,C,R,SL,SR')
-			);
-		}
-		return (isset($AC3audioCodingModeLookup[$acmod]) ? $AC3audioCodingModeLookup[$acmod] : false);
-	}
-
-	public static function AC3centerMixLevelLookup($cmixlev) {
-		static $AC3centerMixLevelLookup;
-		if (empty($AC3centerMixLevelLookup)) {
-			$AC3centerMixLevelLookup = array(
-				0 => pow(2, -3.0 / 6), // 0.707 (�3.0 dB)
-				1 => pow(2, -4.5 / 6), // 0.595 (�4.5 dB)
-				2 => pow(2, -6.0 / 6), // 0.500 (�6.0 dB)
-				3 => 'reserved'
-			);
-		}
-		return (isset($AC3centerMixLevelLookup[$cmixlev]) ? $AC3centerMixLevelLookup[$cmixlev] : false);
-	}
-
-	public static function AC3surroundMixLevelLookup($surmixlev) {
-		static $AC3surroundMixLevelLookup;
-		if (empty($AC3surroundMixLevelLookup)) {
-			$AC3surroundMixLevelLookup = array(
-				0 => pow(2, -3.0 / 6),
-				1 => pow(2, -6.0 / 6),
-				2 => 0,
-				3 => 'reserved'
-			);
-		}
-		return (isset($AC3surroundMixLevelLookup[$surmixlev]) ? $AC3surroundMixLevelLookup[$surmixlev] : false);
-	}
-
-	public static function AC3dolbySurroundModeLookup($dsurmod) {
-		static $AC3dolbySurroundModeLookup = array(
-			0 => 'not indicated',
-			1 => 'Not Dolby Surround encoded',
-			2 => 'Dolby Surround encoded',
-			3 => 'reserved'
-		);
-		return (isset($AC3dolbySurroundModeLookup[$dsurmod]) ? $AC3dolbySurroundModeLookup[$dsurmod] : false);
-	}
-
-	public static function AC3channelsEnabledLookup($acmod, $lfeon) {
-		$AC3channelsEnabledLookup = array(
-			'ch1'=>(bool) ($acmod == 0),
-			'ch2'=>(bool) ($acmod == 0),
-			'left'=>(bool) ($acmod > 1),
-			'right'=>(bool) ($acmod > 1),
-			'center'=>(bool) ($acmod & 0x01),
-			'surround_mono'=>false,
-			'surround_left'=>false,
-			'surround_right'=>false,
-			'lfe'=>$lfeon);
-		switch ($acmod) {
-			case 4:
-			case 5:
-				$AC3channelsEnabledLookup['surround_mono']  = true;
-				break;
-			case 6:
-			case 7:
-				$AC3channelsEnabledLookup['surround_left']  = true;
-				$AC3channelsEnabledLookup['surround_right'] = true;
-				break;
-		}
-		return $AC3channelsEnabledLookup;
-	}
-
-	public static function AC3heavyCompression($compre) {
-		// The first four bits indicate gain changes in 6.02dB increments which can be
-		// implemented with an arithmetic shift operation. The following four bits
-		// indicate linear gain changes, and require a 5-bit multiply.
-		// We will represent the two 4-bit fields of compr as follows:
-		//   X0 X1 X2 X3 . Y4 Y5 Y6 Y7
-		// The meaning of the X values is most simply described by considering X to represent a 4-bit
-		// signed integer with values from �8 to +7. The gain indicated by X is then (X + 1) * 6.02 dB. The
-		// following table shows this in detail.
-
-		// Meaning of 4 msb of compr
-		//  7    +48.16 dB
-		//  6    +42.14 dB
-		//  5    +36.12 dB
-		//  4    +30.10 dB
-		//  3    +24.08 dB
-		//  2    +18.06 dB
-		//  1    +12.04 dB
-		//  0     +6.02 dB
-		// -1         0 dB
-		// -2     �6.02 dB
-		// -3    �12.04 dB
-		// -4    �18.06 dB
-		// -5    �24.08 dB
-		// -6    �30.10 dB
-		// -7    �36.12 dB
-		// -8    �42.14 dB
-
-		$fourbit = str_pad(decbin(($compre & 0xF0) >> 4), 4, '0', STR_PAD_LEFT);
-		if ($fourbit{0} == '1') {
-			$log_gain = -8 + bindec(substr($fourbit, 1));
-		} else {
-			$log_gain = bindec(substr($fourbit, 1));
-		}
-		$log_gain = ($log_gain + 1) * getid3_lib::RGADamplitude2dB(2);
-
-		// The value of Y is a linear representation of a gain change of up to �6 dB. Y is considered to
-		// be an unsigned fractional integer, with a leading value of 1, or: 0.1 Y4 Y5 Y6 Y7 (base 2). Y can
-		// represent values between 0.111112 (or 31/32) and 0.100002 (or 1/2). Thus, Y can represent gain
-		// changes from �0.28 dB to �6.02 dB.
-
-		$lin_gain = (16 + ($compre & 0x0F)) / 32;
-
-		// The combination of X and Y values allows compr to indicate gain changes from
-		//  48.16 � 0.28 = +47.89 dB, to
-		// �42.14 � 6.02 = �48.16 dB.
-
-		return $log_gain - $lin_gain;
-	}
-
-	public static function AC3roomTypeLookup($roomtyp) {
-		static $AC3roomTypeLookup = array(
-			0 => 'not indicated',
-			1 => 'large room, X curve monitor',
-			2 => 'small room, flat monitor',
-			3 => 'reserved'
-		);
-		return (isset($AC3roomTypeLookup[$roomtyp]) ? $AC3roomTypeLookup[$roomtyp] : false);
-	}
-
-	public static function AC3frameSizeLookup($frmsizecod, $fscod) {
-		$padding     = (bool) ($frmsizecod % 2);
-		$framesizeid =   floor($frmsizecod / 2);
-
-		static $AC3frameSizeLookup = array();
-		if (empty($AC3frameSizeLookup)) {
-			$AC3frameSizeLookup = array (
-				0  => array(128, 138, 192),
-				1  => array(40, 160, 174, 240),
-				2  => array(48, 192, 208, 288),
-				3  => array(56, 224, 242, 336),
-				4  => array(64, 256, 278, 384),
-				5  => array(80, 320, 348, 480),
-				6  => array(96, 384, 416, 576),
-				7  => array(112, 448, 486, 672),
-				8  => array(128, 512, 556, 768),
-				9  => array(160, 640, 696, 960),
-				10 => array(192, 768, 834, 1152),
-				11 => array(224, 896, 974, 1344),
-				12 => array(256, 1024, 1114, 1536),
-				13 => array(320, 1280, 1392, 1920),
-				14 => array(384, 1536, 1670, 2304),
-				15 => array(448, 1792, 1950, 2688),
-				16 => array(512, 2048, 2228, 3072),
-				17 => array(576, 2304, 2506, 3456),
-				18 => array(640, 2560, 2786, 3840)
-			);
-		}
-		if (($fscod == 1) && $padding) {
-			// frame lengths are padded by 1 word (16 bits) at 44100
-			$AC3frameSizeLookup[$frmsizecod] += 2;
-		}
-		return (isset($AC3frameSizeLookup[$framesizeid][$fscod]) ? $AC3frameSizeLookup[$framesizeid][$fscod] : false);
-	}
-
-	public static function AC3bitrateLookup($frmsizecod) {
-		$framesizeid =   floor($frmsizecod / 2);
-
-		static $AC3bitrateLookup = array(
-			0  => 32000,
-			1  => 40000,
-			2  => 48000,
-			3  => 56000,
-			4  => 64000,
-			5  => 80000,
-			6  => 96000,
-			7  => 112000,
-			8  => 128000,
-			9  => 160000,
-			10 => 192000,
-			11 => 224000,
-			12 => 256000,
-			13 => 320000,
-			14 => 384000,
-			15 => 448000,
-			16 => 512000,
-			17 => 576000,
-			18 => 640000
-		);
-		return (isset($AC3bitrateLookup[$framesizeid]) ? $AC3bitrateLookup[$framesizeid] : false);
-	}
-
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.au.php b/lib/getid3/getid3/module.audio.au.php
deleted file mode 100644
index a1094dbcd..000000000
--- a/lib/getid3/getid3/module.audio.au.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.au.php                                         //
-// module for analyzing AU files                               //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_au extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$AUheader  = fread($this->getid3->fp, 8);
-
-		$magic = '.snd';
-		if (substr($AUheader, 0, 4) != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" (".snd") at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($AUheader, 0, 4)).'"';
-			return false;
-		}
-
-		// shortcut
-		$info['au'] = array();
-		$thisfile_au        = &$info['au'];
-
-		$info['fileformat']            = 'au';
-		$info['audio']['dataformat']   = 'au';
-		$info['audio']['bitrate_mode'] = 'cbr';
-		$thisfile_au['encoding']               = 'ISO-8859-1';
-
-		$thisfile_au['header_length']   = getid3_lib::BigEndian2Int(substr($AUheader,  4, 4));
-		$AUheader .= fread($this->getid3->fp, $thisfile_au['header_length'] - 8);
-		$info['avdataoffset'] += $thisfile_au['header_length'];
-
-		$thisfile_au['data_size']             = getid3_lib::BigEndian2Int(substr($AUheader,  8, 4));
-		$thisfile_au['data_format_id']        = getid3_lib::BigEndian2Int(substr($AUheader, 12, 4));
-		$thisfile_au['sample_rate']           = getid3_lib::BigEndian2Int(substr($AUheader, 16, 4));
-		$thisfile_au['channels']              = getid3_lib::BigEndian2Int(substr($AUheader, 20, 4));
-		$thisfile_au['comments']['comment'][] =                      trim(substr($AUheader, 24));
-
-		$thisfile_au['data_format'] = $this->AUdataFormatNameLookup($thisfile_au['data_format_id']);
-		$thisfile_au['used_bits_per_sample'] = $this->AUdataFormatUsedBitsPerSampleLookup($thisfile_au['data_format_id']);
-		if ($thisfile_au['bits_per_sample'] = $this->AUdataFormatBitsPerSampleLookup($thisfile_au['data_format_id'])) {
-			$info['audio']['bits_per_sample'] = $thisfile_au['bits_per_sample'];
-		} else {
-			unset($thisfile_au['bits_per_sample']);
-		}
-
-		$info['audio']['sample_rate']  = $thisfile_au['sample_rate'];
-		$info['audio']['channels']     = $thisfile_au['channels'];
-
-		if (($info['avdataoffset'] + $thisfile_au['data_size']) > $info['avdataend']) {
-			$info['warning'][] = 'Possible truncated file - expecting "'.$thisfile_au['data_size'].'" bytes of audio data, only found '.($info['avdataend'] - $info['avdataoffset']).' bytes"';
-		}
-
-		$info['playtime_seconds'] = $thisfile_au['data_size'] / ($thisfile_au['sample_rate'] * $thisfile_au['channels'] * ($thisfile_au['used_bits_per_sample'] / 8));
-		$info['audio']['bitrate'] = ($thisfile_au['data_size'] * 8) / $info['playtime_seconds'];
-
-		return true;
-	}
-
-	function AUdataFormatNameLookup($id) {
-		static $AUdataFormatNameLookup = array(
-			0  => 'unspecified format',
-			1  => '8-bit mu-law',
-			2  => '8-bit linear',
-			3  => '16-bit linear',
-			4  => '24-bit linear',
-			5  => '32-bit linear',
-			6  => 'floating-point',
-			7  => 'double-precision float',
-			8  => 'fragmented sampled data',
-			9  => 'SUN_FORMAT_NESTED',
-			10 => 'DSP program',
-			11 => '8-bit fixed-point',
-			12 => '16-bit fixed-point',
-			13 => '24-bit fixed-point',
-			14 => '32-bit fixed-point',
-
-			16 => 'non-audio display data',
-			17 => 'SND_FORMAT_MULAW_SQUELCH',
-			18 => '16-bit linear with emphasis',
-			19 => '16-bit linear with compression',
-			20 => '16-bit linear with emphasis + compression',
-			21 => 'Music Kit DSP commands',
-			22 => 'SND_FORMAT_DSP_COMMANDS_SAMPLES',
-			23 => 'CCITT g.721 4-bit ADPCM',
-			24 => 'CCITT g.722 ADPCM',
-			25 => 'CCITT g.723 3-bit ADPCM',
-			26 => 'CCITT g.723 5-bit ADPCM',
-			27 => 'A-Law 8-bit'
-		);
-		return (isset($AUdataFormatNameLookup[$id]) ? $AUdataFormatNameLookup[$id] : false);
-	}
-
-	function AUdataFormatBitsPerSampleLookup($id) {
-		static $AUdataFormatBitsPerSampleLookup = array(
-			1  => 8,
-			2  => 8,
-			3  => 16,
-			4  => 24,
-			5  => 32,
-			6  => 32,
-			7  => 64,
-
-			11 => 8,
-			12 => 16,
-			13 => 24,
-			14 => 32,
-
-			18 => 16,
-			19 => 16,
-			20 => 16,
-
-			23 => 16,
-
-			25 => 16,
-			26 => 16,
-			27 => 8
-		);
-		return (isset($AUdataFormatBitsPerSampleLookup[$id]) ? $AUdataFormatBitsPerSampleLookup[$id] : false);
-	}
-
-	function AUdataFormatUsedBitsPerSampleLookup($id) {
-		static $AUdataFormatUsedBitsPerSampleLookup = array(
-			1  => 8,
-			2  => 8,
-			3  => 16,
-			4  => 24,
-			5  => 32,
-			6  => 32,
-			7  => 64,
-
-			11 => 8,
-			12 => 16,
-			13 => 24,
-			14 => 32,
-
-			18 => 16,
-			19 => 16,
-			20 => 16,
-
-			23 => 4,
-
-			25 => 3,
-			26 => 5,
-			27 => 8,
-		);
-		return (isset($AUdataFormatUsedBitsPerSampleLookup[$id]) ? $AUdataFormatUsedBitsPerSampleLookup[$id] : false);
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.avr.php b/lib/getid3/getid3/module.audio.avr.php
deleted file mode 100644
index 9c6d66507..000000000
--- a/lib/getid3/getid3/module.audio.avr.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.avr.php                                        //
-// module for analyzing AVR Audio files                        //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_avr extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		// http://cui.unige.ch/OSG/info/AudioFormats/ap11.html
-		// http://www.btinternet.com/~AnthonyJ/Atari/programming/avr_format.html
-		// offset    type    length    name        comments
-		// ---------------------------------------------------------------------
-		// 0    char    4    ID        format ID == "2BIT"
-		// 4    char    8    name        sample name (unused space filled with 0)
-		// 12    short    1    mono/stereo    0=mono, -1 (0xFFFF)=stereo
-		//                     With stereo, samples are alternated,
-		//                     the first voice is the left :
-		//                     (LRLRLRLRLRLRLRLRLR...)
-		// 14    short    1    resolution    8, 12 or 16 (bits)
-		// 16    short    1    signed or not    0=unsigned, -1 (0xFFFF)=signed
-		// 18    short    1    loop or not    0=no loop, -1 (0xFFFF)=loop on
-		// 20    short    1    MIDI note    0xFFnn, where 0 <= nn <= 127
-		//                     0xFFFF means "no MIDI note defined"
-		// 22    byte    1    Replay speed    Frequence in the Replay software
-		//                     0=5.485 Khz, 1=8.084 Khz, 2=10.971 Khz,
-		//                     3=16.168 Khz, 4=21.942 Khz, 5=32.336 Khz
-		//                     6=43.885 Khz, 7=47.261 Khz
-		//                     -1 (0xFF)=no defined Frequence
-		// 23    byte    3    sample rate    in Hertz
-		// 26    long    1    size in bytes (2 * bytes in stereo)
-		// 30    long    1    loop begin    0 for no loop
-		// 34    long    1    loop size    equal to 'size' for no loop
-		// 38  short   2   Reserved, MIDI keyboard split */
-		// 40  short   2   Reserved, sample compression */
-		// 42  short   2   Reserved */
-		// 44  char   20;  Additional filename space, used if (name[7] != 0)
-		// 64    byte    64    user data
-		// 128    bytes    ?    sample data    (12 bits samples are coded on 16 bits:
-		//                     0000 xxxx xxxx xxxx)
-		// ---------------------------------------------------------------------
-
-		// Note that all values are in motorola (big-endian) format, and that long is
-		// assumed to be 4 bytes, and short 2 bytes.
-		// When reading the samples, you should handle both signed and unsigned data,
-		// and be prepared to convert 16->8 bit, or mono->stereo if needed. To convert
-		// 8-bit data between signed/unsigned just add 127 to the sample values.
-		// Simularly for 16-bit data you should add 32769
-
-		$info['fileformat'] = 'avr';
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$AVRheader = fread($this->getid3->fp, 128);
-
-		$info['avr']['raw']['magic'] = substr($AVRheader,  0,  4);
-		$magic = '2BIT';
-		if ($info['avr']['raw']['magic'] != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($info['avr']['raw']['magic']).'"';
-			unset($info['fileformat']);
-			unset($info['avr']);
-			return false;
-		}
-		$info['avdataoffset'] += 128;
-
-		$info['avr']['sample_name']        =         rtrim(substr($AVRheader,  4,  8));
-		$info['avr']['raw']['mono']        = getid3_lib::BigEndian2Int(substr($AVRheader, 12,  2));
-		$info['avr']['bits_per_sample']    = getid3_lib::BigEndian2Int(substr($AVRheader, 14,  2));
-		$info['avr']['raw']['signed']      = getid3_lib::BigEndian2Int(substr($AVRheader, 16,  2));
-		$info['avr']['raw']['loop']        = getid3_lib::BigEndian2Int(substr($AVRheader, 18,  2));
-		$info['avr']['raw']['midi']        = getid3_lib::BigEndian2Int(substr($AVRheader, 20,  2));
-		$info['avr']['raw']['replay_freq'] = getid3_lib::BigEndian2Int(substr($AVRheader, 22,  1));
-		$info['avr']['sample_rate']        = getid3_lib::BigEndian2Int(substr($AVRheader, 23,  3));
-		$info['avr']['sample_length']      = getid3_lib::BigEndian2Int(substr($AVRheader, 26,  4));
-		$info['avr']['loop_start']         = getid3_lib::BigEndian2Int(substr($AVRheader, 30,  4));
-		$info['avr']['loop_end']           = getid3_lib::BigEndian2Int(substr($AVRheader, 34,  4));
-		$info['avr']['midi_split']         = getid3_lib::BigEndian2Int(substr($AVRheader, 38,  2));
-		$info['avr']['sample_compression'] = getid3_lib::BigEndian2Int(substr($AVRheader, 40,  2));
-		$info['avr']['reserved']           = getid3_lib::BigEndian2Int(substr($AVRheader, 42,  2));
-		$info['avr']['sample_name_extra']  =         rtrim(substr($AVRheader, 44, 20));
-		$info['avr']['comment']            =         rtrim(substr($AVRheader, 64, 64));
-
-		$info['avr']['flags']['stereo'] = (($info['avr']['raw']['mono']   == 0) ? false : true);
-		$info['avr']['flags']['signed'] = (($info['avr']['raw']['signed'] == 0) ? false : true);
-		$info['avr']['flags']['loop']   = (($info['avr']['raw']['loop']   == 0) ? false : true);
-
-		$info['avr']['midi_notes'] = array();
-		if (($info['avr']['raw']['midi'] & 0xFF00) != 0xFF00) {
-			$info['avr']['midi_notes'][] = ($info['avr']['raw']['midi'] & 0xFF00) >> 8;
-		}
-		if (($info['avr']['raw']['midi'] & 0x00FF) != 0x00FF) {
-			$info['avr']['midi_notes'][] = ($info['avr']['raw']['midi'] & 0x00FF);
-		}
-
-		if (($info['avdataend'] - $info['avdataoffset']) != ($info['avr']['sample_length'] * (($info['avr']['bits_per_sample'] == 8) ? 1 : 2))) {
-			$info['warning'][] = 'Probable truncated file: expecting '.($info['avr']['sample_length'] * (($info['avr']['bits_per_sample'] == 8) ? 1 : 2)).' bytes of audio data, found '.($info['avdataend'] - $info['avdataoffset']);
-		}
-
-		$info['audio']['dataformat']      = 'avr';
-		$info['audio']['lossless']        = true;
-		$info['audio']['bitrate_mode']    = 'cbr';
-		$info['audio']['bits_per_sample'] = $info['avr']['bits_per_sample'];
-		$info['audio']['sample_rate']     = $info['avr']['sample_rate'];
-		$info['audio']['channels']        = ($info['avr']['flags']['stereo'] ? 2 : 1);
-		$info['playtime_seconds']         = ($info['avr']['sample_length'] / $info['audio']['channels']) / $info['avr']['sample_rate'];
-		$info['audio']['bitrate']         = ($info['avr']['sample_length'] * (($info['avr']['bits_per_sample'] == 8) ? 8 : 16)) / $info['playtime_seconds'];
-
-
-		return true;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.bonk.php b/lib/getid3/getid3/module.audio.bonk.php
deleted file mode 100644
index 9f5187e3c..000000000
--- a/lib/getid3/getid3/module.audio.bonk.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.la.php                                         //
-// module for analyzing BONK audio files                       //
-// dependencies: module.tag.id3v2.php (optional)               //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_bonk extends getid3_handler
-{
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		// shortcut
-		$info['bonk'] = array();
-		$thisfile_bonk        = &$info['bonk'];
-
-		$thisfile_bonk['dataoffset'] = $info['avdataoffset'];
-		$thisfile_bonk['dataend']    = $info['avdataend'];
-
-		if (!getid3_lib::intValueSupported($thisfile_bonk['dataend'])) {
-
-			$info['warning'][] = 'Unable to parse BONK file from end (v0.6+ preferred method) because PHP filesystem functions only support up to '.round(PHP_INT_MAX / 1073741824).'GB';
-
-		} else {
-
-			// scan-from-end method, for v0.6 and higher
-			fseek($this->getid3->fp, $thisfile_bonk['dataend'] - 8, SEEK_SET);
-			$PossibleBonkTag = fread($this->getid3->fp, 8);
-			while ($this->BonkIsValidTagName(substr($PossibleBonkTag, 4, 4), true)) {
-				$BonkTagSize = getid3_lib::LittleEndian2Int(substr($PossibleBonkTag, 0, 4));
-				fseek($this->getid3->fp, 0 - $BonkTagSize, SEEK_CUR);
-				$BonkTagOffset = ftell($this->getid3->fp);
-				$TagHeaderTest = fread($this->getid3->fp, 5);
-				if (($TagHeaderTest{0} != "\x00") || (substr($PossibleBonkTag, 4, 4) != strtolower(substr($PossibleBonkTag, 4, 4)))) {
-					$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes("\x00".strtoupper(substr($PossibleBonkTag, 4, 4))).'" at offset '.$BonkTagOffset.', found "'.getid3_lib::PrintHexBytes($TagHeaderTest).'"';
-					return false;
-				}
-				$BonkTagName = substr($TagHeaderTest, 1, 4);
-
-				$thisfile_bonk[$BonkTagName]['size']   = $BonkTagSize;
-				$thisfile_bonk[$BonkTagName]['offset'] = $BonkTagOffset;
-				$this->HandleBonkTags($BonkTagName);
-				$NextTagEndOffset = $BonkTagOffset - 8;
-				if ($NextTagEndOffset < $thisfile_bonk['dataoffset']) {
-					if (empty($info['audio']['encoder'])) {
-						$info['audio']['encoder'] = 'Extended BONK v0.9+';
-					}
-					return true;
-				}
-				fseek($this->getid3->fp, $NextTagEndOffset, SEEK_SET);
-				$PossibleBonkTag = fread($this->getid3->fp, 8);
-			}
-
-		}
-
-		// seek-from-beginning method for v0.4 and v0.5
-		if (empty($thisfile_bonk['BONK'])) {
-			fseek($this->getid3->fp, $thisfile_bonk['dataoffset'], SEEK_SET);
-			do {
-				$TagHeaderTest = fread($this->getid3->fp, 5);
-				switch ($TagHeaderTest) {
-					case "\x00".'BONK':
-						if (empty($info['audio']['encoder'])) {
-							$info['audio']['encoder'] = 'BONK v0.4';
-						}
-						break;
-
-					case "\x00".'INFO':
-						$info['audio']['encoder'] = 'Extended BONK v0.5';
-						break;
-
-					default:
-						break 2;
-				}
-				$BonkTagName = substr($TagHeaderTest, 1, 4);
-				$thisfile_bonk[$BonkTagName]['size']   = $thisfile_bonk['dataend'] - $thisfile_bonk['dataoffset'];
-				$thisfile_bonk[$BonkTagName]['offset'] = $thisfile_bonk['dataoffset'];
-				$this->HandleBonkTags($BonkTagName);
-
-			} while (true);
-		}
-
-		// parse META block for v0.6 - v0.8
-		if (empty($thisfile_bonk['INFO']) && isset($thisfile_bonk['META']['tags']['info'])) {
-			fseek($this->getid3->fp, $thisfile_bonk['META']['tags']['info'], SEEK_SET);
-			$TagHeaderTest = fread($this->getid3->fp, 5);
-			if ($TagHeaderTest == "\x00".'INFO') {
-				$info['audio']['encoder'] = 'Extended BONK v0.6 - v0.8';
-
-				$BonkTagName = substr($TagHeaderTest, 1, 4);
-				$thisfile_bonk[$BonkTagName]['size']   = $thisfile_bonk['dataend'] - $thisfile_bonk['dataoffset'];
-				$thisfile_bonk[$BonkTagName]['offset'] = $thisfile_bonk['dataoffset'];
-				$this->HandleBonkTags($BonkTagName);
-			}
-		}
-
-		if (empty($info['audio']['encoder'])) {
-			$info['audio']['encoder'] = 'Extended BONK v0.9+';
-		}
-		if (empty($thisfile_bonk['BONK'])) {
-			unset($info['bonk']);
-		}
-		return true;
-
-	}
-
-	function HandleBonkTags($BonkTagName) {
-		$info = &$this->getid3->info;
-		switch ($BonkTagName) {
-			case 'BONK':
-				// shortcut
-				$thisfile_bonk_BONK = &$info['bonk']['BONK'];
-
-				$BonkData = "\x00".'BONK'.fread($this->getid3->fp, 17);
-				$thisfile_bonk_BONK['version']            =        getid3_lib::LittleEndian2Int(substr($BonkData,  5, 1));
-				$thisfile_bonk_BONK['number_samples']     =        getid3_lib::LittleEndian2Int(substr($BonkData,  6, 4));
-				$thisfile_bonk_BONK['sample_rate']        =        getid3_lib::LittleEndian2Int(substr($BonkData, 10, 4));
-
-				$thisfile_bonk_BONK['channels']           =        getid3_lib::LittleEndian2Int(substr($BonkData, 14, 1));
-				$thisfile_bonk_BONK['lossless']           = (bool) getid3_lib::LittleEndian2Int(substr($BonkData, 15, 1));
-				$thisfile_bonk_BONK['joint_stereo']       = (bool) getid3_lib::LittleEndian2Int(substr($BonkData, 16, 1));
-				$thisfile_bonk_BONK['number_taps']        =        getid3_lib::LittleEndian2Int(substr($BonkData, 17, 2));
-				$thisfile_bonk_BONK['downsampling_ratio'] =        getid3_lib::LittleEndian2Int(substr($BonkData, 19, 1));
-				$thisfile_bonk_BONK['samples_per_packet'] =        getid3_lib::LittleEndian2Int(substr($BonkData, 20, 2));
-
-				$info['avdataoffset'] = $thisfile_bonk_BONK['offset'] + 5 + 17;
-				$info['avdataend']    = $thisfile_bonk_BONK['offset'] + $thisfile_bonk_BONK['size'];
-
-				$info['fileformat']               = 'bonk';
-				$info['audio']['dataformat']      = 'bonk';
-				$info['audio']['bitrate_mode']    = 'vbr'; // assumed
-				$info['audio']['channels']        = $thisfile_bonk_BONK['channels'];
-				$info['audio']['sample_rate']     = $thisfile_bonk_BONK['sample_rate'];
-				$info['audio']['channelmode']     = ($thisfile_bonk_BONK['joint_stereo'] ? 'joint stereo' : 'stereo');
-				$info['audio']['lossless']        = $thisfile_bonk_BONK['lossless'];
-				$info['audio']['codec']           = 'bonk';
-
-				$info['playtime_seconds'] = $thisfile_bonk_BONK['number_samples'] / ($thisfile_bonk_BONK['sample_rate'] * $thisfile_bonk_BONK['channels']);
-				if ($info['playtime_seconds'] > 0) {
-					$info['audio']['bitrate'] = (($info['bonk']['dataend'] - $info['bonk']['dataoffset']) * 8) / $info['playtime_seconds'];
-				}
-				break;
-
-			case 'INFO':
-				// shortcut
-				$thisfile_bonk_INFO = &$info['bonk']['INFO'];
-
-				$thisfile_bonk_INFO['version'] = getid3_lib::LittleEndian2Int(fread($this->getid3->fp, 1));
-				$thisfile_bonk_INFO['entries_count'] = 0;
-				$NextInfoDataPair = fread($this->getid3->fp, 5);
-				if (!$this->BonkIsValidTagName(substr($NextInfoDataPair, 1, 4))) {
-					while (!feof($this->getid3->fp)) {
-						//$CurrentSeekInfo['offset']  = getid3_lib::LittleEndian2Int(substr($NextInfoDataPair, 0, 4));
-						//$CurrentSeekInfo['nextbit'] = getid3_lib::LittleEndian2Int(substr($NextInfoDataPair, 4, 1));
-						//$thisfile_bonk_INFO[] = $CurrentSeekInfo;
-
-						$NextInfoDataPair = fread($this->getid3->fp, 5);
-						if ($this->BonkIsValidTagName(substr($NextInfoDataPair, 1, 4))) {
-							fseek($this->getid3->fp, -5, SEEK_CUR);
-							break;
-						}
-						$thisfile_bonk_INFO['entries_count']++;
-					}
-				}
-				break;
-
-			case 'META':
-				$BonkData = "\x00".'META'.fread($this->getid3->fp, $info['bonk']['META']['size'] - 5);
-				$info['bonk']['META']['version'] = getid3_lib::LittleEndian2Int(substr($BonkData,  5, 1));
-
-				$MetaTagEntries = floor(((strlen($BonkData) - 8) - 6) / 8); // BonkData - xxxxmeta - �META
-				$offset = 6;
-				for ($i = 0; $i < $MetaTagEntries; $i++) {
-					$MetaEntryTagName   =                              substr($BonkData, $offset, 4);
-					$offset += 4;
-					$MetaEntryTagOffset = getid3_lib::LittleEndian2Int(substr($BonkData, $offset, 4));
-					$offset += 4;
-					$info['bonk']['META']['tags'][$MetaEntryTagName] = $MetaEntryTagOffset;
-				}
-				break;
-
-			case ' ID3':
-				$info['audio']['encoder'] = 'Extended BONK v0.9+';
-
-				// ID3v2 checking is optional
-				if (class_exists('getid3_id3v2')) {
-					$getid3_temp = new getID3();
-					$getid3_temp->openfile($this->getid3->filename);
-					$getid3_id3v2 = new getid3_id3v2($getid3_temp);
-					$getid3_id3v2->StartingOffset = $info['bonk'][' ID3']['offset'] + 2;
-					$info['bonk'][' ID3']['valid'] = $getid3_id3v2->Analyze();
-					if ($info['bonk'][' ID3']['valid']) {
-						$info['id3v2'] = $getid3_temp->info['id3v2'];
-					}
-					unset($getid3_temp, $getid3_id3v2);
-				}
-				break;
-
-			default:
-				$info['warning'][] = 'Unexpected Bonk tag "'.$BonkTagName.'" at offset '.$info['bonk'][$BonkTagName]['offset'];
-				break;
-
-		}
-	}
-
-	static function BonkIsValidTagName($PossibleBonkTag, $ignorecase=false) {
-		static $BonkIsValidTagName = array('BONK', 'INFO', ' ID3', 'META');
-		foreach ($BonkIsValidTagName as $validtagname) {
-			if ($validtagname == $PossibleBonkTag) {
-				return true;
-			} elseif ($ignorecase && (strtolower($validtagname) == strtolower($PossibleBonkTag))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.dss.php b/lib/getid3/getid3/module.audio.dss.php
deleted file mode 100644
index b7b436762..000000000
--- a/lib/getid3/getid3/module.audio.dss.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.dss.php                                        //
-// module for analyzing Digital Speech Standard (DSS) files    //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_dss extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$DSSheader  = fread($this->getid3->fp, 1256);
-
-		if (!preg_match('#^(\x02|\x03)dss#', $DSSheader)) {
-			$info['error'][] = 'Expecting "[02-03] 64 73 73" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($DSSheader, 0, 4)).'"';
-			return false;
-		}
-
-		// some structure information taken from http://cpansearch.perl.org/src/RGIBSON/Audio-DSS-0.02/lib/Audio/DSS.pm
-
-		// shortcut
-		$info['dss'] = array();
-		$thisfile_dss        = &$info['dss'];
-
-		$info['fileformat']            = 'dss';
-		$info['audio']['dataformat']   = 'dss';
-		$info['audio']['bitrate_mode'] = 'cbr';
-		//$thisfile_dss['encoding']              = 'ISO-8859-1';
-
-		$thisfile_dss['version']        =                            ord(substr($DSSheader,   0,   1));
-		$thisfile_dss['date_create']    = $this->DSSdateStringToUnixDate(substr($DSSheader,  38,  12));
-		$thisfile_dss['date_complete']  = $this->DSSdateStringToUnixDate(substr($DSSheader,  50,  12));
-		//$thisfile_dss['length']         =                         intval(substr($DSSheader,  62,   6)); // I thought time was in seconds, it's actually HHMMSS
-		$thisfile_dss['length']         = intval((substr($DSSheader,  62, 2) * 3600) + (substr($DSSheader,  64, 2) * 60) + substr($DSSheader,  66, 2));
-		$thisfile_dss['priority']       =                            ord(substr($DSSheader, 793,   1));
-		$thisfile_dss['comments']       =                           trim(substr($DSSheader, 798, 100));
-
-
-		//$info['audio']['bits_per_sample']  = ?;
-		//$info['audio']['sample_rate']      = ?;
-		$info['audio']['channels']     = 1;
-
-		$info['playtime_seconds'] = $thisfile_dss['length'];
-		$info['audio']['bitrate'] = ($info['filesize'] * 8) / $info['playtime_seconds'];
-
-		return true;
-	}
-
-	function DSSdateStringToUnixDate($datestring) {
-		$y = substr($datestring,  0, 2);
-		$m = substr($datestring,  2, 2);
-		$d = substr($datestring,  4, 2);
-		$h = substr($datestring,  6, 2);
-		$i = substr($datestring,  8, 2);
-		$s = substr($datestring, 10, 2);
-		$y += (($y < 95) ? 2000 : 1900);
-		return mktime($h, $i, $s, $m, $d, $y);
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.dts.php b/lib/getid3/getid3/module.audio.dts.php
deleted file mode 100644
index 8102ba8bf..000000000
--- a/lib/getid3/getid3/module.audio.dts.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.dts.php                                        //
-// module for analyzing DTS Audio files                        //
-// dependencies: NONE                                          //
-//                                                             //
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_dts extends getid3_handler
-{
-
-	public function Analyze() {
-		$info = &$this->getid3->info;
-
-		// Specs taken from "DTS Coherent Acoustics;Core and Extensions,  ETSI TS 102 114 V1.2.1 (2002-12)"
-		// (http://pda.etsi.org/pda/queryform.asp)
-		// With thanks to Gambit <macteam@users.sourceforge.net> http://mac.sourceforge.net/atl/
-
-		$info['fileformat'] = 'dts';
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$DTSheader = fread($this->getid3->fp, 16);
-		$info['dts']['raw']['magic'] = substr($DTSheader, 0, 4);
-
-		$magic = "\x7F\xFE\x80\x01";
-		if ($info['dts']['raw']['magic'] != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($info['dts']['raw']['magic']).'"';
-			unset($info['fileformat'], $info['dts']);
-			return false;
-		}
-
-		$fhBS = getid3_lib::BigEndian2Bin(substr($DTSheader,  4,  12));
-		$bsOffset = 0;
-		$info['dts']['raw']['frame_type']             =        $this->readBinData($fhBS, $bsOffset,  1);
-		$info['dts']['raw']['deficit_samples']        =        $this->readBinData($fhBS, $bsOffset,  5);
-		$info['dts']['flags']['crc_present']          = (bool) $this->readBinData($fhBS, $bsOffset,  1);
-		$info['dts']['raw']['pcm_sample_blocks']      =        $this->readBinData($fhBS, $bsOffset,  7);
-		$info['dts']['raw']['frame_byte_size']        =        $this->readBinData($fhBS, $bsOffset, 14);
-		$info['dts']['raw']['channel_arrangement']    =        $this->readBinData($fhBS, $bsOffset,  6);
-		$info['dts']['raw']['sample_frequency']       =        $this->readBinData($fhBS, $bsOffset,  4);
-		$info['dts']['raw']['bitrate']                =        $this->readBinData($fhBS, $bsOffset,  5);
-		$info['dts']['flags']['embedded_downmix']     = (bool) $this->readBinData($fhBS, $bsOffset,  1);
-		$info['dts']['flags']['dynamicrange']         = (bool) $this->readBinData($fhBS, $bsOffset,  1);
-		$info['dts']['flags']['timestamp']            = (bool) $this->readBinData($fhBS, $bsOffset,  1);
-		$info['dts']['flags']['auxdata']              = (bool) $this->readBinData($fhBS, $bsOffset,  1);
-		$info['dts']['flags']['hdcd']                 = (bool) $this->readBinData($fhBS, $bsOffset,  1);
-		$info['dts']['raw']['extension_audio']        =        $this->readBinData($fhBS, $bsOffset,  3);
-		$info['dts']['flags']['extended_coding']      = (bool) $this->readBinData($fhBS, $bsOffset,  1);
-		$info['dts']['flags']['audio_sync_insertion'] = (bool) $this->readBinData($fhBS, $bsOffset,  1);
-		$info['dts']['raw']['lfe_effects']            =        $this->readBinData($fhBS, $bsOffset,  2);
-		$info['dts']['flags']['predictor_history']    = (bool) $this->readBinData($fhBS, $bsOffset,  1);
-		if ($info['dts']['flags']['crc_present']) {
-			$info['dts']['raw']['crc16']              =        $this->readBinData($fhBS, $bsOffset, 16);
-		}
-		$info['dts']['flags']['mri_perfect_reconst']  = (bool) $this->readBinData($fhBS, $bsOffset,  1);
-		$info['dts']['raw']['encoder_soft_version']   =        $this->readBinData($fhBS, $bsOffset,  4);
-		$info['dts']['raw']['copy_history']           =        $this->readBinData($fhBS, $bsOffset,  2);
-		$info['dts']['raw']['bits_per_sample']        =        $this->readBinData($fhBS, $bsOffset,  2);
-		$info['dts']['flags']['surround_es']          = (bool) $this->readBinData($fhBS, $bsOffset,  1);
-		$info['dts']['flags']['front_sum_diff']       = (bool) $this->readBinData($fhBS, $bsOffset,  1);
-		$info['dts']['flags']['surround_sum_diff']    = (bool) $this->readBinData($fhBS, $bsOffset,  1);
-		$info['dts']['raw']['dialog_normalization']   =        $this->readBinData($fhBS, $bsOffset,  4);
-
-
-		$info['dts']['bitrate']              = self::DTSbitrateLookup($info['dts']['raw']['bitrate']);
-		$info['dts']['bits_per_sample']      = self::DTSbitPerSampleLookup($info['dts']['raw']['bits_per_sample']);
-		$info['dts']['sample_rate']          = self::DTSsampleRateLookup($info['dts']['raw']['sample_frequency']);
-		$info['dts']['dialog_normalization'] = self::DTSdialogNormalization($info['dts']['raw']['dialog_normalization'], $info['dts']['raw']['encoder_soft_version']);
-		$info['dts']['flags']['lossless']    = (($info['dts']['raw']['bitrate'] == 31) ? true  : false);
-		$info['dts']['bitrate_mode']         = (($info['dts']['raw']['bitrate'] == 30) ? 'vbr' : 'cbr');
-		$info['dts']['channels']             = self::DTSnumChannelsLookup($info['dts']['raw']['channel_arrangement']);
-		$info['dts']['channel_arrangement']  = self::DTSchannelArrangementLookup($info['dts']['raw']['channel_arrangement']);
-
-		$info['audio']['dataformat']          = 'dts';
-		$info['audio']['lossless']            = $info['dts']['flags']['lossless'];
-		$info['audio']['bitrate_mode']        = $info['dts']['bitrate_mode'];
-		$info['audio']['bits_per_sample']     = $info['dts']['bits_per_sample'];
-		$info['audio']['sample_rate']         = $info['dts']['sample_rate'];
-		$info['audio']['channels']            = $info['dts']['channels'];
-		$info['audio']['bitrate']             = $info['dts']['bitrate'];
-		if (isset($info['avdataend'])) {
-			$info['playtime_seconds']         = ($info['avdataend'] - $info['avdataoffset']) / ($info['dts']['bitrate'] / 8);
-		}
-
-		return true;
-	}
-
-	private function readBinData($bin, &$offset, $length) {
-		$data = substr($bin, $offset, $length);
-		$offset += $length;
-		return bindec($data);
-	}
-
-	private static function DTSbitrateLookup($index) {
-		$DTSbitrateLookup = array(
-			0  => 32000,
-			1  => 56000,
-			2  => 64000,
-			3  => 96000,
-			4  => 112000,
-			5  => 128000,
-			6  => 192000,
-			7  => 224000,
-			8  => 256000,
-			9  => 320000,
-			10 => 384000,
-			11 => 448000,
-			12 => 512000,
-			13 => 576000,
-			14 => 640000,
-			15 => 768000,
-			16 => 960000,
-			17 => 1024000,
-			18 => 1152000,
-			19 => 1280000,
-			20 => 1344000,
-			21 => 1408000,
-			22 => 1411200,
-			23 => 1472000,
-			24 => 1536000,
-			25 => 1920000,
-			26 => 2048000,
-			27 => 3072000,
-			28 => 3840000,
-			29 => 'open',
-			30 => 'variable',
-			31 => 'lossless'
-		);
-		return (isset($DTSbitrateLookup[$index]) ? $DTSbitrateLookup[$index] : false);
-	}
-
-	private static function DTSsampleRateLookup($index) {
-		$DTSsampleRateLookup = array(
-			0  => 'invalid',
-			1  => 8000,
-			2  => 16000,
-			3  => 32000,
-			4  => 'invalid',
-			5  => 'invalid',
-			6  => 11025,
-			7  => 22050,
-			8  => 44100,
-			9  => 'invalid',
-			10 => 'invalid',
-			11 => 12000,
-			12 => 24000,
-			13 => 48000,
-			14 => 'invalid',
-			15 => 'invalid'
-		);
-		return (isset($DTSsampleRateLookup[$index]) ? $DTSsampleRateLookup[$index] : false);
-	}
-
-	private static function DTSbitPerSampleLookup($index) {
-		$DTSbitPerSampleLookup = array(
-			0  => 16,
-			1  => 20,
-			2  => 24,
-			3  => 24,
-		);
-		return (isset($DTSbitPerSampleLookup[$index]) ? $DTSbitPerSampleLookup[$index] : false);
-	}
-
-	private static function DTSnumChannelsLookup($index) {
-		switch ($index) {
-			case 0:
-				return 1;
-				break;
-			case 1:
-			case 2:
-			case 3:
-			case 4:
-				return 2;
-				break;
-			case 5:
-			case 6:
-				return 3;
-				break;
-			case 7:
-			case 8:
-				return 4;
-				break;
-			case 9:
-				return 5;
-				break;
-			case 10:
-			case 11:
-			case 12:
-				return 6;
-				break;
-			case 13:
-				return 7;
-				break;
-			case 14:
-			case 15:
-				return 8;
-				break;
-		}
-		return false;
-	}
-
-	private static function DTSchannelArrangementLookup($index) {
-		$DTSchannelArrangementLookup = array(
-			0  => 'A',
-			1  => 'A + B (dual mono)',
-			2  => 'L + R (stereo)',
-			3  => '(L+R) + (L-R) (sum-difference)',
-			4  => 'LT + RT (left and right total)',
-			5  => 'C + L + R',
-			6  => 'L + R + S',
-			7  => 'C + L + R + S',
-			8  => 'L + R + SL + SR',
-			9  => 'C + L + R + SL + SR',
-			10 => 'CL + CR + L + R + SL + SR',
-			11 => 'C + L + R+ LR + RR + OV',
-			12 => 'CF + CR + LF + RF + LR + RR',
-			13 => 'CL + C + CR + L + R + SL + SR',
-			14 => 'CL + CR + L + R + SL1 + SL2 + SR1 + SR2',
-			15 => 'CL + C+ CR + L + R + SL + S + SR',
-		);
-		return (isset($DTSchannelArrangementLookup[$index]) ? $DTSchannelArrangementLookup[$index] : 'user-defined');
-	}
-
-	private static function DTSdialogNormalization($index, $version) {
-		switch ($version) {
-			case 7:
-				return 0 - $index;
-				break;
-			case 6:
-				return 0 - 16 - $index;
-				break;
-		}
-		return false;
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.flac.php b/lib/getid3/getid3/module.audio.flac.php
deleted file mode 100644
index 98daec0fd..000000000
--- a/lib/getid3/getid3/module.audio.flac.php
+++ /dev/null
@@ -1,480 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.flac.php                                       //
-// module for analyzing FLAC and OggFLAC audio files           //
-// dependencies: module.audio.ogg.php                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ogg.php', __FILE__, true);
-
-class getid3_flac extends getid3_handler
-{
-	var $inline_attachments = true; // true: return full data for all attachments; false: return no data for all attachments; integer: return data for attachments <= than this; string: save as file to this directory
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		// http://flac.sourceforge.net/format.html
-
-		$this->fseek($info['avdataoffset'], SEEK_SET);
-		$StreamMarker = $this->fread(4);
-		$magic = 'fLaC';
-		if ($StreamMarker != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($StreamMarker).'"';
-			return false;
-		}
-		$info['fileformat']            = 'flac';
-		$info['audio']['dataformat']   = 'flac';
-		$info['audio']['bitrate_mode'] = 'vbr';
-		$info['audio']['lossless']     = true;
-
-		return $this->FLACparseMETAdata();
-	}
-
-
-	function FLACparseMETAdata() {
-		$info = &$this->getid3->info;
-		do {
-			$METAdataBlockOffset          = $this->ftell();
-			$METAdataBlockHeader          = $this->fread(4);
-			$METAdataLastBlockFlag        = (bool) (getid3_lib::BigEndian2Int(substr($METAdataBlockHeader, 0, 1)) & 0x80);
-			$METAdataBlockType            = getid3_lib::BigEndian2Int(substr($METAdataBlockHeader, 0, 1)) & 0x7F;
-			$METAdataBlockLength          = getid3_lib::BigEndian2Int(substr($METAdataBlockHeader, 1, 3));
-			$METAdataBlockTypeText        = getid3_flac::FLACmetaBlockTypeLookup($METAdataBlockType);
-
-			if ($METAdataBlockLength < 0) {
-				$info['error'][] = 'corrupt or invalid METADATA_BLOCK_HEADER.BLOCK_TYPE ('.$METAdataBlockType.') at offset '.$METAdataBlockOffset;
-				break;
-			}
-
-			$info['flac'][$METAdataBlockTypeText]['raw'] = array();
-			$ThisFileInfo_flac_METAdataBlockTypeText_raw = &$info['flac'][$METAdataBlockTypeText]['raw'];
-
-			$ThisFileInfo_flac_METAdataBlockTypeText_raw['offset']          = $METAdataBlockOffset;
-			$ThisFileInfo_flac_METAdataBlockTypeText_raw['last_meta_block'] = $METAdataLastBlockFlag;
-			$ThisFileInfo_flac_METAdataBlockTypeText_raw['block_type']      = $METAdataBlockType;
-			$ThisFileInfo_flac_METAdataBlockTypeText_raw['block_type_text'] = $METAdataBlockTypeText;
-			$ThisFileInfo_flac_METAdataBlockTypeText_raw['block_length']    = $METAdataBlockLength;
-			if (($METAdataBlockOffset + 4 + $METAdataBlockLength) > $info['avdataend']) {
-				$info['error'][] = 'METADATA_BLOCK_HEADER.BLOCK_TYPE ('.$METAdataBlockType.') at offset '.$METAdataBlockOffset.' extends beyond end of file';
-				break;
-			}
-			if ($METAdataBlockLength < 1) {
-				$info['error'][] = 'METADATA_BLOCK_HEADER.BLOCK_LENGTH ('.$METAdataBlockLength.') at offset '.$METAdataBlockOffset.' is invalid';
-				break;
-			}
-			$ThisFileInfo_flac_METAdataBlockTypeText_raw['block_data'] = $this->fread($METAdataBlockLength);
-			$info['avdataoffset'] = $this->ftell();
-
-			switch ($METAdataBlockTypeText) {
-				case 'STREAMINFO':     // 0x00
-					if (!$this->FLACparseSTREAMINFO($ThisFileInfo_flac_METAdataBlockTypeText_raw['block_data'])) {
-						return false;
-					}
-					break;
-
-				case 'PADDING':        // 0x01
-					// ignore
-					break;
-
-				case 'APPLICATION':    // 0x02
-					if (!$this->FLACparseAPPLICATION($ThisFileInfo_flac_METAdataBlockTypeText_raw['block_data'])) {
-						return false;
-					}
-					break;
-
-				case 'SEEKTABLE':      // 0x03
-					if (!$this->FLACparseSEEKTABLE($ThisFileInfo_flac_METAdataBlockTypeText_raw['block_data'])) {
-						return false;
-					}
-					break;
-
-				case 'VORBIS_COMMENT': // 0x04
-					$getid3_temp = new getID3();
-					$getid3_temp->openfile($this->getid3->filename);
-					$getid3_temp->info['avdataoffset'] = $this->ftell() - $METAdataBlockLength;
-					$getid3_temp->info['audio']['dataformat'] = 'flac';
-					$getid3_temp->info['flac'] = $info['flac'];
-					$getid3_ogg = new getid3_ogg($getid3_temp);
-					$getid3_ogg->ParseVorbisCommentsFilepointer();
-					$maybe_copy_keys = array('vendor', 'comments_raw', 'comments', 'replay_gain');
-					foreach ($maybe_copy_keys as $maybe_copy_key) {
-						if (!empty($getid3_temp->info['ogg'][$maybe_copy_key])) {
-							$info['ogg'][$maybe_copy_key] = $getid3_temp->info['ogg'][$maybe_copy_key];
-						}
-					}
-					if (!empty($getid3_temp->info['replay_gain'])) {
-						$info['replay_gain'] = $getid3_temp->info['replay_gain'];
-					}
-					unset($getid3_temp, $getid3_ogg);
-					break;
-
-				case 'CUESHEET':       // 0x05
-					if (!getid3_flac::FLACparseCUESHEET($ThisFileInfo_flac_METAdataBlockTypeText_raw['block_data'])) {
-						return false;
-					}
-					break;
-
-				case 'PICTURE':        // 0x06
-					if (!getid3_flac::FLACparsePICTURE($ThisFileInfo_flac_METAdataBlockTypeText_raw['block_data'])) {
-						return false;
-					}
-					break;
-
-				default:
-					$info['warning'][] = 'Unhandled METADATA_BLOCK_HEADER.BLOCK_TYPE ('.$METAdataBlockType.') at offset '.$METAdataBlockOffset;
-					break;
-			}
-
-		} while ($METAdataLastBlockFlag === false);
-
-		if (isset($info['flac']['PICTURE'])) {
-			foreach ($info['flac']['PICTURE'] as $key => $valuearray) {
-				if (!empty($valuearray['image_mime']) && !empty($valuearray['data'])) {
-					$info['ogg']['comments']['picture'][] = array('image_mime'=>$valuearray['image_mime'], 'data'=>$valuearray['data']);
-				}
-			}
-		}
-
-		if (isset($info['flac']['STREAMINFO'])) {
-			$info['flac']['compressed_audio_bytes']   = $info['avdataend'] - $info['avdataoffset'];
-			$info['flac']['uncompressed_audio_bytes'] = $info['flac']['STREAMINFO']['samples_stream'] * $info['flac']['STREAMINFO']['channels'] * ($info['flac']['STREAMINFO']['bits_per_sample'] / 8);
-			if ($info['flac']['uncompressed_audio_bytes'] == 0) {
-				$info['error'][] = 'Corrupt FLAC file: uncompressed_audio_bytes == zero';
-				return false;
-			}
-			$info['flac']['compression_ratio'] = $info['flac']['compressed_audio_bytes'] / $info['flac']['uncompressed_audio_bytes'];
-		}
-
-		// set md5_data_source - built into flac 0.5+
-		if (isset($info['flac']['STREAMINFO']['audio_signature'])) {
-
-			if ($info['flac']['STREAMINFO']['audio_signature'] === str_repeat("\x00", 16)) {
-
-				$info['warning'][] = 'FLAC STREAMINFO.audio_signature is null (known issue with libOggFLAC)';
-
-			} else {
-
-				$info['md5_data_source'] = '';
-				$md5 = $info['flac']['STREAMINFO']['audio_signature'];
-				for ($i = 0; $i < strlen($md5); $i++) {
-					$info['md5_data_source'] .= str_pad(dechex(ord($md5{$i})), 2, '00', STR_PAD_LEFT);
-				}
-				if (!preg_match('/^[0-9a-f]{32}$/', $info['md5_data_source'])) {
-					unset($info['md5_data_source']);
-				}
-
-			}
-
-		}
-
-		$info['audio']['bits_per_sample'] = $info['flac']['STREAMINFO']['bits_per_sample'];
-		if ($info['audio']['bits_per_sample'] == 8) {
-			// special case
-			// must invert sign bit on all data bytes before MD5'ing to match FLAC's calculated value
-			// MD5sum calculates on unsigned bytes, but FLAC calculated MD5 on 8-bit audio data as signed
-			$info['warning'][] = 'FLAC calculates MD5 data strangely on 8-bit audio, so the stored md5_data_source value will not match the decoded WAV file';
-		}
-		if (!empty($info['ogg']['vendor'])) {
-			$info['audio']['encoder'] = $info['ogg']['vendor'];
-		}
-
-		return true;
-	}
-
-	static function FLACmetaBlockTypeLookup($blocktype) {
-		static $FLACmetaBlockTypeLookup = array();
-		if (empty($FLACmetaBlockTypeLookup)) {
-			$FLACmetaBlockTypeLookup[0] = 'STREAMINFO';
-			$FLACmetaBlockTypeLookup[1] = 'PADDING';
-			$FLACmetaBlockTypeLookup[2] = 'APPLICATION';
-			$FLACmetaBlockTypeLookup[3] = 'SEEKTABLE';
-			$FLACmetaBlockTypeLookup[4] = 'VORBIS_COMMENT';
-			$FLACmetaBlockTypeLookup[5] = 'CUESHEET';
-			$FLACmetaBlockTypeLookup[6] = 'PICTURE';
-		}
-		return (isset($FLACmetaBlockTypeLookup[$blocktype]) ? $FLACmetaBlockTypeLookup[$blocktype] : 'reserved');
-	}
-
-	static function FLACapplicationIDLookup($applicationid) {
-		static $FLACapplicationIDLookup = array();
-		if (empty($FLACapplicationIDLookup)) {
-			// http://flac.sourceforge.net/id.html
-			$FLACapplicationIDLookup[0x46746F6C] = 'flac-tools';      // 'Ftol'
-			$FLACapplicationIDLookup[0x46746F6C] = 'Sound Font FLAC'; // 'SFFL'
-		}
-		return (isset($FLACapplicationIDLookup[$applicationid]) ? $FLACapplicationIDLookup[$applicationid] : 'reserved');
-	}
-
-	static function FLACpictureTypeLookup($type_id) {
-		static $lookup = array (
-			 0 => 'Other',
-			 1 => '32x32 pixels \'file icon\' (PNG only)',
-			 2 => 'Other file icon',
-			 3 => 'Cover (front)',
-			 4 => 'Cover (back)',
-			 5 => 'Leaflet page',
-			 6 => 'Media (e.g. label side of CD)',
-			 7 => 'Lead artist/lead performer/soloist',
-			 8 => 'Artist/performer',
-			 9 => 'Conductor',
-			10 => 'Band/Orchestra',
-			11 => 'Composer',
-			12 => 'Lyricist/text writer',
-			13 => 'Recording Location',
-			14 => 'During recording',
-			15 => 'During performance',
-			16 => 'Movie/video screen capture',
-			17 => 'A bright coloured fish',
-			18 => 'Illustration',
-			19 => 'Band/artist logotype',
-			20 => 'Publisher/Studio logotype',
-		);
-		return (isset($lookup[$type_id]) ? $lookup[$type_id] : 'reserved');
-	}
-
-	function FLACparseSTREAMINFO($METAdataBlockData) {
-		$info = &$this->getid3->info;
-
-		$offset = 0;
-		$info['flac']['STREAMINFO']['min_block_size']  = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 2));
-		$offset += 2;
-		$info['flac']['STREAMINFO']['max_block_size']  = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 2));
-		$offset += 2;
-		$info['flac']['STREAMINFO']['min_frame_size']  = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 3));
-		$offset += 3;
-		$info['flac']['STREAMINFO']['max_frame_size']  = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 3));
-		$offset += 3;
-
-		$SampleRateChannelsSampleBitsStreamSamples             = getid3_lib::BigEndian2Bin(substr($METAdataBlockData, $offset, 8));
-		$info['flac']['STREAMINFO']['sample_rate']     = getid3_lib::Bin2Dec(substr($SampleRateChannelsSampleBitsStreamSamples,  0, 20));
-		$info['flac']['STREAMINFO']['channels']        = getid3_lib::Bin2Dec(substr($SampleRateChannelsSampleBitsStreamSamples, 20,  3)) + 1;
-		$info['flac']['STREAMINFO']['bits_per_sample'] = getid3_lib::Bin2Dec(substr($SampleRateChannelsSampleBitsStreamSamples, 23,  5)) + 1;
-		$info['flac']['STREAMINFO']['samples_stream']  = getid3_lib::Bin2Dec(substr($SampleRateChannelsSampleBitsStreamSamples, 28, 36));
-		$offset += 8;
-
-		$info['flac']['STREAMINFO']['audio_signature'] =               substr($METAdataBlockData, $offset, 16);
-		$offset += 16;
-
-		if (!empty($info['flac']['STREAMINFO']['sample_rate'])) {
-
-			$info['audio']['bitrate_mode']     = 'vbr';
-			$info['audio']['sample_rate']      = $info['flac']['STREAMINFO']['sample_rate'];
-			$info['audio']['channels']         = $info['flac']['STREAMINFO']['channels'];
-			$info['audio']['bits_per_sample']  = $info['flac']['STREAMINFO']['bits_per_sample'];
-			$info['playtime_seconds']          = $info['flac']['STREAMINFO']['samples_stream'] / $info['flac']['STREAMINFO']['sample_rate'];
-			if ($info['playtime_seconds'] > 0) {
-				$info['audio']['bitrate']      = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-			}
-
-		} else {
-			$info['error'][] = 'Corrupt METAdata block: STREAMINFO';
-			return false;
-		}
-		unset($info['flac']['STREAMINFO']['raw']);
-		return true;
-	}
-
-
-	function FLACparseAPPLICATION($METAdataBlockData) {
-		$info = &$this->getid3->info;
-
-		$offset = 0;
-		$ApplicationID = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 4));
-		$offset += 4;
-		$info['flac']['APPLICATION'][$ApplicationID]['name'] = getid3_flac::FLACapplicationIDLookup($ApplicationID);
-		$info['flac']['APPLICATION'][$ApplicationID]['data'] = substr($METAdataBlockData, $offset);
-		$offset = $METAdataBlockLength;
-
-		unset($info['flac']['APPLICATION']['raw']);
-		return true;
-	}
-
-
-	function FLACparseSEEKTABLE($METAdataBlockData) {
-		$info = &$this->getid3->info;
-
-		$offset = 0;
-		$METAdataBlockLength = strlen($METAdataBlockData);
-		$placeholderpattern = str_repeat("\xFF", 8);
-		while ($offset < $METAdataBlockLength) {
-			$SampleNumberString = substr($METAdataBlockData, $offset, 8);
-			$offset += 8;
-			if ($SampleNumberString == $placeholderpattern) {
-
-				// placeholder point
-				getid3_lib::safe_inc($info['flac']['SEEKTABLE']['placeholders'], 1);
-				$offset += 10;
-
-			} else {
-
-				$SampleNumber                                                = getid3_lib::BigEndian2Int($SampleNumberString);
-				$info['flac']['SEEKTABLE'][$SampleNumber]['offset']  = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 8));
-				$offset += 8;
-				$info['flac']['SEEKTABLE'][$SampleNumber]['samples'] = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 2));
-				$offset += 2;
-
-			}
-		}
-
-		unset($info['flac']['SEEKTABLE']['raw']);
-
-		return true;
-	}
-
-	function FLACparseCUESHEET($METAdataBlockData) {
-		$info = &$this->getid3->info;
-		$offset = 0;
-		$info['flac']['CUESHEET']['media_catalog_number'] =                              trim(substr($METAdataBlockData, $offset, 128), "\0");
-		$offset += 128;
-		$info['flac']['CUESHEET']['lead_in_samples']      =         getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 8));
-		$offset += 8;
-		$info['flac']['CUESHEET']['flags']['is_cd']       = (bool) (getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 1)) & 0x80);
-		$offset += 1;
-
-		$offset += 258; // reserved
-
-		$info['flac']['CUESHEET']['number_tracks']        =         getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 1));
-		$offset += 1;
-
-		for ($track = 0; $track < $info['flac']['CUESHEET']['number_tracks']; $track++) {
-			$TrackSampleOffset = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 8));
-			$offset += 8;
-			$TrackNumber       = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 1));
-			$offset += 1;
-
-			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['sample_offset']         = $TrackSampleOffset;
-
-			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['isrc']                  =                           substr($METAdataBlockData, $offset, 12);
-			$offset += 12;
-
-			$TrackFlagsRaw                                                             = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 1));
-			$offset += 1;
-			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['flags']['is_audio']     = (bool) ($TrackFlagsRaw & 0x80);
-			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['flags']['pre_emphasis'] = (bool) ($TrackFlagsRaw & 0x40);
-
-			$offset += 13; // reserved
-
-			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['index_points']          = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 1));
-			$offset += 1;
-
-			for ($index = 0; $index < $info['flac']['CUESHEET']['tracks'][$TrackNumber]['index_points']; $index++) {
-				$IndexSampleOffset = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 8));
-				$offset += 8;
-				$IndexNumber       = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 1));
-				$offset += 1;
-
-				$offset += 3; // reserved
-
-				$info['flac']['CUESHEET']['tracks'][$TrackNumber]['indexes'][$IndexNumber] = $IndexSampleOffset;
-			}
-		}
-
-		unset($info['flac']['CUESHEET']['raw']);
-
-		return true;
-	}
-
-
-	function FLACparsePICTURE($meta_data_block_data) {
-		$info = &$this->getid3->info;
-		$picture = &$info['flac']['PICTURE'][sizeof($info['flac']['PICTURE']) - 1];
-		$picture['offset'] = $info['flac']['PICTURE']['raw']['offset'];
-		unset($info['flac']['PICTURE']['raw']);
-
-		$offset = 0;
-
-		$picture['typeid'] = getid3_lib::BigEndian2Int(substr($meta_data_block_data, $offset, 4));
-		$picture['type'] = getid3_flac::FLACpictureTypeLookup($picture['typeid']);
-		$offset += 4;
-
-		$length = getid3_lib::BigEndian2Int(substr($meta_data_block_data, $offset, 4));
-		$offset += 4;
-
-		$picture['image_mime'] = substr($meta_data_block_data, $offset, $length);
-		$offset += $length;
-
-		$length = getid3_lib::BigEndian2Int(substr($meta_data_block_data, $offset, 4));
-		$offset += 4;
-
-		$picture['description'] = substr($meta_data_block_data, $offset, $length);
-		$offset += $length;
-
-		$picture['width'] = getid3_lib::BigEndian2Int(substr($meta_data_block_data, $offset, 4));
-		$offset += 4;
-
-		$picture['height'] = getid3_lib::BigEndian2Int(substr($meta_data_block_data, $offset, 4));
-		$offset += 4;
-
-		$picture['color_depth'] = getid3_lib::BigEndian2Int(substr($meta_data_block_data, $offset, 4));
-		$offset += 4;
-
-		$picture['colors_indexed'] = getid3_lib::BigEndian2Int(substr($meta_data_block_data, $offset, 4));
-		$offset += 4;
-
-		$length = getid3_lib::BigEndian2Int(substr($meta_data_block_data, $offset, 4));
-		$offset += 4;
-
-		$picture['data'] = substr($meta_data_block_data, $offset, $length);
-		$offset += $length;
-		$picture['data_length'] = strlen($picture['data']);
-
-
-		do {
-			if ($this->inline_attachments === false) {
-				// skip entirely
-				unset($picture['data']);
-				break;
-			}
-			if ($this->inline_attachments === true) {
-				// great
-			} elseif (is_int($this->inline_attachments)) {
-				if ($this->inline_attachments < $picture['data_length']) {
-					// too big, skip
-					$info['warning'][] = 'attachment at '.$picture['offset'].' is too large to process inline ('.number_format($picture['data_length']).' bytes)';
-					unset($picture['data']);
-					break;
-				}
-			} elseif (is_string($this->inline_attachments)) {
-				$this->inline_attachments = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->inline_attachments), DIRECTORY_SEPARATOR);
-				if (!is_dir($this->inline_attachments) || !is_writable($this->inline_attachments)) {
-					// cannot write, skip
-					$info['warning'][] = 'attachment at '.$picture['offset'].' cannot be saved to "'.$this->inline_attachments.'" (not writable)';
-					unset($picture['data']);
-					break;
-				}
-			}
-			// if we get this far, must be OK
-			if (is_string($this->inline_attachments)) {
-				$destination_filename = $this->inline_attachments.DIRECTORY_SEPARATOR.md5($info['filenamepath']).'_'.$picture['offset'];
-				if (!file_exists($destination_filename) || is_writable($destination_filename)) {
-					file_put_contents($destination_filename, $picture['data']);
-				} else {
-					$info['warning'][] = 'attachment at '.$picture['offset'].' cannot be saved to "'.$destination_filename.'" (not writable)';
-				}
-				$picture['data_filename'] = $destination_filename;
-				unset($picture['data']);
-			} else {
-				if (!isset($info['flac']['comments']['picture'])) {
-					$info['flac']['comments']['picture'] = array();
-				}
-				$info['flac']['comments']['picture'][] = array('data'=>$picture['data'], 'image_mime'=>$picture['image_mime']);
-			}
-		} while (false);
-
-
-
-		return true;
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.la.php b/lib/getid3/getid3/module.audio.la.php
deleted file mode 100644
index 98d80a6dc..000000000
--- a/lib/getid3/getid3/module.audio.la.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.la.php                                         //
-// module for analyzing LA (LosslessAudio) audio files         //
-// dependencies: module.audio.riff.php                         //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
-
-class getid3_la extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$offset = 0;
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$rawdata = fread($this->getid3->fp, $this->getid3->fread_buffer_size());
-
-		switch (substr($rawdata, $offset, 4)) {
-			case 'LA02':
-			case 'LA03':
-			case 'LA04':
-				$info['fileformat']          = 'la';
-				$info['audio']['dataformat'] = 'la';
-				$info['audio']['lossless']   = true;
-
-				$info['la']['version_major'] = (int) substr($rawdata, $offset + 2, 1);
-				$info['la']['version_minor'] = (int) substr($rawdata, $offset + 3, 1);
-				$info['la']['version']       = (float) $info['la']['version_major'] + ($info['la']['version_minor'] / 10);
-				$offset += 4;
-
-				$info['la']['uncompressed_size'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
-				$offset += 4;
-				if ($info['la']['uncompressed_size'] == 0) {
-					$info['error'][] = 'Corrupt LA file: uncompressed_size == zero';
-					return false;
-				}
-
-				$WAVEchunk = substr($rawdata, $offset, 4);
-				if ($WAVEchunk !== 'WAVE') {
-					$info['error'][] = 'Expected "WAVE" ('.getid3_lib::PrintHexBytes('WAVE').') at offset '.$offset.', found "'.$WAVEchunk.'" ('.getid3_lib::PrintHexBytes($WAVEchunk).') instead.';
-					return false;
-				}
-				$offset += 4;
-
-				$info['la']['fmt_size'] = 24;
-				if ($info['la']['version'] >= 0.3) {
-
-					$info['la']['fmt_size']    = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
-					$info['la']['header_size'] = 49 + $info['la']['fmt_size'] - 24;
-					$offset += 4;
-
-				} else {
-
-					// version 0.2 didn't support additional data blocks
-					$info['la']['header_size'] = 41;
-
-				}
-
-				$fmt_chunk = substr($rawdata, $offset, 4);
-				if ($fmt_chunk !== 'fmt ') {
-					$info['error'][] = 'Expected "fmt " ('.getid3_lib::PrintHexBytes('fmt ').') at offset '.$offset.', found "'.$fmt_chunk.'" ('.getid3_lib::PrintHexBytes($fmt_chunk).') instead.';
-					return false;
-				}
-				$offset += 4;
-				$fmt_size = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
-				$offset += 4;
-
-				$info['la']['raw']['format']  = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 2));
-				$offset += 2;
-
-				$info['la']['channels']       = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 2));
-				$offset += 2;
-				if ($info['la']['channels'] == 0) {
-					$info['error'][] = 'Corrupt LA file: channels == zero';
-						return false;
-				}
-
-				$info['la']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
-				$offset += 4;
-				if ($info['la']['sample_rate'] == 0) {
-					$info['error'][] = 'Corrupt LA file: sample_rate == zero';
-						return false;
-				}
-
-				$info['la']['bytes_per_second']     = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
-				$offset += 4;
-				$info['la']['bytes_per_sample']     = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 2));
-				$offset += 2;
-				$info['la']['bits_per_sample']      = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 2));
-				$offset += 2;
-
-				$info['la']['samples']              = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
-				$offset += 4;
-
-				$info['la']['raw']['flags']         = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 1));
-				$offset += 1;
-				$info['la']['flags']['seekable']             = (bool) ($info['la']['raw']['flags'] & 0x01);
-				if ($info['la']['version'] >= 0.4) {
-					$info['la']['flags']['high_compression'] = (bool) ($info['la']['raw']['flags'] & 0x02);
-				}
-
-				$info['la']['original_crc']         = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
-				$offset += 4;
-
-				// mike�bevin*de
-				// Basically, the blocksize/seekevery are 61440/19 in La0.4 and 73728/16
-				// in earlier versions. A seekpoint is added every blocksize * seekevery
-				// samples, so 4 * int(totalSamples / (blockSize * seekEvery)) should
-				// give the number of bytes used for the seekpoints. Of course, if seeking
-				// is disabled, there are no seekpoints stored.
-				if ($info['la']['version'] >= 0.4) {
-					$info['la']['blocksize'] = 61440;
-					$info['la']['seekevery'] = 19;
-				} else {
-					$info['la']['blocksize'] = 73728;
-					$info['la']['seekevery'] = 16;
-				}
-
-				$info['la']['seekpoint_count'] = 0;
-				if ($info['la']['flags']['seekable']) {
-					$info['la']['seekpoint_count'] = floor($info['la']['samples'] / ($info['la']['blocksize'] * $info['la']['seekevery']));
-
-					for ($i = 0; $i < $info['la']['seekpoint_count']; $i++) {
-						$info['la']['seekpoints'][] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
-						$offset += 4;
-					}
-				}
-
-				if ($info['la']['version'] >= 0.3) {
-
-					// Following the main header information, the program outputs all of the
-					// seekpoints. Following these is what I called the 'footer start',
-					// i.e. the position immediately after the La audio data is finished.
-					$info['la']['footerstart'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
-					$offset += 4;
-
-					if ($info['la']['footerstart'] > $info['filesize']) {
-						$info['warning'][] = 'FooterStart value points to offset '.$info['la']['footerstart'].' which is beyond end-of-file ('.$info['filesize'].')';
-						$info['la']['footerstart'] = $info['filesize'];
-					}
-
-				} else {
-
-					// La v0.2 didn't have FooterStart value
-					$info['la']['footerstart'] = $info['avdataend'];
-
-				}
-
-				if ($info['la']['footerstart'] < $info['avdataend']) {
-					if ($RIFFtempfilename = tempnam(GETID3_TEMP_DIR, 'id3')) {
-						if ($RIFF_fp = fopen($RIFFtempfilename, 'w+b')) {
-							$RIFFdata = 'WAVE';
-							if ($info['la']['version'] == 0.2) {
-								$RIFFdata .= substr($rawdata, 12, 24);
-							} else {
-								$RIFFdata .= substr($rawdata, 16, 24);
-							}
-							if ($info['la']['footerstart'] < $info['avdataend']) {
-								fseek($this->getid3->fp, $info['la']['footerstart'], SEEK_SET);
-								$RIFFdata .= fread($this->getid3->fp, $info['avdataend'] - $info['la']['footerstart']);
-							}
-							$RIFFdata = 'RIFF'.getid3_lib::LittleEndian2String(strlen($RIFFdata), 4, false).$RIFFdata;
-							fwrite($RIFF_fp, $RIFFdata, strlen($RIFFdata));
-							fclose($RIFF_fp);
-
-							$getid3_temp = new getID3();
-							$getid3_temp->openfile($RIFFtempfilename);
-							$getid3_riff = new getid3_riff($getid3_temp);
-							$getid3_riff->Analyze();
-
-							if (empty($getid3_temp->info['error'])) {
-								$info['riff'] = $getid3_temp->info['riff'];
-							} else {
-								$info['warning'][] = 'Error parsing RIFF portion of La file: '.implode($getid3_temp->info['error']);
-							}
-							unset($getid3_temp, $getid3_riff);
-						}
-						unlink($RIFFtempfilename);
-					}
-				}
-
-				// $info['avdataoffset'] should be zero to begin with, but just in case it's not, include the addition anyway
-				$info['avdataend']    = $info['avdataoffset'] + $info['la']['footerstart'];
-				$info['avdataoffset'] = $info['avdataoffset'] + $offset;
-
-				//$info['la']['codec']                = RIFFwFormatTagLookup($info['la']['raw']['format']);
-				$info['la']['compression_ratio']    = (float) (($info['avdataend'] - $info['avdataoffset']) / $info['la']['uncompressed_size']);
-				$info['playtime_seconds']           = (float) ($info['la']['samples'] / $info['la']['sample_rate']) / $info['la']['channels'];
-				if ($info['playtime_seconds'] == 0) {
-					$info['error'][] = 'Corrupt LA file: playtime_seconds == zero';
-					return false;
-				}
-
-				$info['audio']['bitrate']            = ($info['avdataend'] - $info['avdataoffset']) * 8 / $info['playtime_seconds'];
-				//$info['audio']['codec']              = $info['la']['codec'];
-				$info['audio']['bits_per_sample']    = $info['la']['bits_per_sample'];
-				break;
-
-			default:
-				if (substr($rawdata, $offset, 2) == 'LA') {
-					$info['error'][] = 'This version of getID3() ['.$this->getid3->version().'] does not support LA version '.substr($rawdata, $offset + 2, 1).'.'.substr($rawdata, $offset + 3, 1).' which this appears to be - check http://getid3.sourceforge.net for updates.';
-				} else {
-					$info['error'][] = 'Not a LA (Lossless-Audio) file';
-				}
-				return false;
-				break;
-		}
-
-		$info['audio']['channels']    = $info['la']['channels'];
-		$info['audio']['sample_rate'] = (int) $info['la']['sample_rate'];
-		$info['audio']['encoder']     = 'LA v'.$info['la']['version'];
-
-		return true;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.lpac.php b/lib/getid3/getid3/module.audio.lpac.php
deleted file mode 100644
index 6ef0fb8ac..000000000
--- a/lib/getid3/getid3/module.audio.lpac.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.lpac.php                                       //
-// module for analyzing LPAC Audio files                       //
-// dependencies: module.audio-video.riff.php                   //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
-
-class getid3_lpac extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$LPACheader = fread($this->getid3->fp, 14);
-		if (substr($LPACheader, 0, 4) != 'LPAC') {
-			$info['error'][] = 'Expected "LPAC" at offset '.$info['avdataoffset'].', found "'.$StreamMarker.'"';
-			return false;
-		}
-		$info['avdataoffset'] += 14;
-
-		$info['fileformat']            = 'lpac';
-		$info['audio']['dataformat']   = 'lpac';
-		$info['audio']['lossless']     = true;
-		$info['audio']['bitrate_mode'] = 'vbr';
-
-		$info['lpac']['file_version'] = getid3_lib::BigEndian2Int(substr($LPACheader,  4, 1));
-		$flags['audio_type']                  = getid3_lib::BigEndian2Int(substr($LPACheader,  5, 1));
-		$info['lpac']['total_samples']= getid3_lib::BigEndian2Int(substr($LPACheader,  6, 4));
-		$flags['parameters']                  = getid3_lib::BigEndian2Int(substr($LPACheader, 10, 4));
-
-		$info['lpac']['flags']['is_wave'] = (bool) ($flags['audio_type'] & 0x40);
-		$info['lpac']['flags']['stereo']  = (bool) ($flags['audio_type'] & 0x04);
-		$info['lpac']['flags']['24_bit']  = (bool) ($flags['audio_type'] & 0x02);
-		$info['lpac']['flags']['16_bit']  = (bool) ($flags['audio_type'] & 0x01);
-
-		if ($info['lpac']['flags']['24_bit'] && $info['lpac']['flags']['16_bit']) {
-			$info['warning'][] = '24-bit and 16-bit flags cannot both be set';
-		}
-
-		$info['lpac']['flags']['fast_compress']             =  (bool) ($flags['parameters'] & 0x40000000);
-		$info['lpac']['flags']['random_access']             =  (bool) ($flags['parameters'] & 0x08000000);
-		$info['lpac']['block_length']                       = pow(2, (($flags['parameters'] & 0x07000000) >> 24)) * 256;
-		$info['lpac']['flags']['adaptive_prediction_order'] =  (bool) ($flags['parameters'] & 0x00800000);
-		$info['lpac']['flags']['adaptive_quantization']     =  (bool) ($flags['parameters'] & 0x00400000);
-		$info['lpac']['flags']['joint_stereo']              =  (bool) ($flags['parameters'] & 0x00040000);
-		$info['lpac']['quantization']                       =         ($flags['parameters'] & 0x00001F00) >> 8;
-		$info['lpac']['max_prediction_order']               =         ($flags['parameters'] & 0x0000003F);
-
-		if ($info['lpac']['flags']['fast_compress'] && ($info['lpac']['max_prediction_order'] != 3)) {
-			$info['warning'][] = 'max_prediction_order expected to be "3" if fast_compress is true, actual value is "'.$info['lpac']['max_prediction_order'].'"';
-		}
-		switch ($info['lpac']['file_version']) {
-			case 6:
-				if ($info['lpac']['flags']['adaptive_quantization']) {
-					$info['warning'][] = 'adaptive_quantization expected to be false in LPAC file stucture v6, actually true';
-				}
-				if ($info['lpac']['quantization'] != 20) {
-					$info['warning'][] = 'Quantization expected to be 20 in LPAC file stucture v6, actually '.$info['lpac']['flags']['Q'];
-				}
-				break;
-
-			default:
-				//$info['warning'][] = 'This version of getID3() ['.$this->getid3->version().'] only supports LPAC file format version 6, this file is version '.$info['lpac']['file_version'].' - please report to info@getid3.org';
-				break;
-		}
-
-		$getid3_temp = new getID3();
-		$getid3_temp->openfile($this->getid3->filename);
-		$getid3_temp->info = $info;
-		$getid3_riff = new getid3_riff($getid3_temp);
-		$getid3_riff->Analyze();
-		$info['avdataoffset']                = $getid3_temp->info['avdataoffset'];
-		$info['riff']                        = $getid3_temp->info['riff'];
-		$info['error']                       = $getid3_temp->info['error'];
-		$info['warning']                     = $getid3_temp->info['warning'];
-		$info['lpac']['comments']['comment'] = $getid3_temp->info['comments'];
-		$info['audio']['sample_rate']        = $getid3_temp->info['audio']['sample_rate'];
-		unset($getid3_temp, $getid3_riff);
-
-		$info['audio']['channels']    = ($info['lpac']['flags']['stereo'] ? 2 : 1);
-
-		if ($info['lpac']['flags']['24_bit']) {
-			$info['audio']['bits_per_sample'] = $info['riff']['audio'][0]['bits_per_sample'];
-		} elseif ($info['lpac']['flags']['16_bit']) {
-			$info['audio']['bits_per_sample'] = 16;
-		} else {
-			$info['audio']['bits_per_sample'] = 8;
-		}
-
-		if ($info['lpac']['flags']['fast_compress']) {
-			 // fast
-			$info['audio']['encoder_options'] = '-1';
-		} else {
-			switch ($info['lpac']['max_prediction_order']) {
-				case 20: // simple
-					$info['audio']['encoder_options'] = '-2';
-					break;
-				case 30: // medium
-					$info['audio']['encoder_options'] = '-3';
-					break;
-				case 40: // high
-					$info['audio']['encoder_options'] = '-4';
-					break;
-				case 60: // extrahigh
-					$info['audio']['encoder_options'] = '-5';
-					break;
-			}
-		}
-
-		$info['playtime_seconds'] = $info['lpac']['total_samples'] / $info['audio']['sample_rate'];
-		$info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-
-		return true;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.midi.php b/lib/getid3/getid3/module.audio.midi.php
deleted file mode 100644
index 7b839cf14..000000000
--- a/lib/getid3/getid3/module.audio.midi.php
+++ /dev/null
@@ -1,526 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.midi.php                                       //
-// module for Midi Audio files                                 //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-define('GETID3_MIDI_MAGIC_MTHD', 'MThd'); // MIDI file header magic
-define('GETID3_MIDI_MAGIC_MTRK', 'MTrk'); // MIDI track header magic
-
-class getid3_midi extends getid3_handler
-{
-	var $scanwholefile = true;
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		// shortcut
-		$info['midi']['raw'] = array();
-		$thisfile_midi               = &$info['midi'];
-		$thisfile_midi_raw           = &$thisfile_midi['raw'];
-
-		$info['fileformat']          = 'midi';
-		$info['audio']['dataformat'] = 'midi';
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$MIDIdata = fread($this->getid3->fp, $this->getid3->fread_buffer_size());
-		$offset = 0;
-		$MIDIheaderID = substr($MIDIdata, $offset, 4); // 'MThd'
-		if ($MIDIheaderID != GETID3_MIDI_MAGIC_MTHD) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes(GETID3_MIDI_MAGIC_MTHD).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($MIDIheaderID).'"';
-			unset($info['fileformat']);
-			return false;
-		}
-		$offset += 4;
-		$thisfile_midi_raw['headersize']    = getid3_lib::BigEndian2Int(substr($MIDIdata, $offset, 4));
-		$offset += 4;
-		$thisfile_midi_raw['fileformat']    = getid3_lib::BigEndian2Int(substr($MIDIdata, $offset, 2));
-		$offset += 2;
-		$thisfile_midi_raw['tracks']        = getid3_lib::BigEndian2Int(substr($MIDIdata, $offset, 2));
-		$offset += 2;
-		$thisfile_midi_raw['ticksperqnote'] = getid3_lib::BigEndian2Int(substr($MIDIdata, $offset, 2));
-		$offset += 2;
-
-		for ($i = 0; $i < $thisfile_midi_raw['tracks']; $i++) {
-			while ((strlen($MIDIdata) - $offset) < 8) {
-				$MIDIdata .= fread($this->getid3->fp, $this->getid3->fread_buffer_size());
-			}
-			$trackID = substr($MIDIdata, $offset, 4);
-			$offset += 4;
-			if ($trackID == GETID3_MIDI_MAGIC_MTRK) {
-				$tracksize = getid3_lib::BigEndian2Int(substr($MIDIdata, $offset, 4));
-				$offset += 4;
-				// $thisfile_midi['tracks'][$i]['size'] = $tracksize;
-				$trackdataarray[$i] = substr($MIDIdata, $offset, $tracksize);
-				$offset += $tracksize;
-			} else {
-				$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes(GETID3_MIDI_MAGIC_MTRK).'" at '.($offset - 4).', found "'.getid3_lib::PrintHexBytes($trackID).'" instead';
-				return false;
-			}
-		}
-
-		if (!isset($trackdataarray) || !is_array($trackdataarray)) {
-			$info['error'][] = 'Cannot find MIDI track information';
-			unset($thisfile_midi);
-			unset($info['fileformat']);
-			return false;
-		}
-
-		if ($this->scanwholefile) { // this can take quite a long time, so have the option to bypass it if speed is very important
-			$thisfile_midi['totalticks']      = 0;
-			$info['playtime_seconds'] = 0;
-			$CurrentMicroSecondsPerBeat       = 500000; // 120 beats per minute;  60,000,000 microseconds per minute -> 500,000 microseconds per beat
-			$CurrentBeatsPerMinute            = 120;    // 120 beats per minute;  60,000,000 microseconds per minute -> 500,000 microseconds per beat
-			$MicroSecondsPerQuarterNoteAfter  = array ();
-
-			foreach ($trackdataarray as $tracknumber => $trackdata) {
-
-				$eventsoffset               = 0;
-				$LastIssuedMIDIcommand      = 0;
-				$LastIssuedMIDIchannel      = 0;
-				$CumulativeDeltaTime        = 0;
-				$TicksAtCurrentBPM = 0;
-				while ($eventsoffset < strlen($trackdata)) {
-					$eventid = 0;
-					if (isset($MIDIevents[$tracknumber]) && is_array($MIDIevents[$tracknumber])) {
-						$eventid = count($MIDIevents[$tracknumber]);
-					}
-					$deltatime = 0;
-					for ($i = 0; $i < 4; $i++) {
-						$deltatimebyte = ord(substr($trackdata, $eventsoffset++, 1));
-						$deltatime = ($deltatime << 7) + ($deltatimebyte & 0x7F);
-						if ($deltatimebyte & 0x80) {
-							// another byte follows
-						} else {
-							break;
-						}
-					}
-					$CumulativeDeltaTime += $deltatime;
-					$TicksAtCurrentBPM   += $deltatime;
-					$MIDIevents[$tracknumber][$eventid]['deltatime'] = $deltatime;
-					$MIDI_event_channel                                  = ord(substr($trackdata, $eventsoffset++, 1));
-					if ($MIDI_event_channel & 0x80) {
-						// OK, normal event - MIDI command has MSB set
-						$LastIssuedMIDIcommand = $MIDI_event_channel >> 4;
-						$LastIssuedMIDIchannel = $MIDI_event_channel & 0x0F;
-					} else {
-						// running event - assume last command
-						$eventsoffset--;
-					}
-					$MIDIevents[$tracknumber][$eventid]['eventid']   = $LastIssuedMIDIcommand;
-					$MIDIevents[$tracknumber][$eventid]['channel']   = $LastIssuedMIDIchannel;
-					if ($MIDIevents[$tracknumber][$eventid]['eventid'] == 0x08) { // Note off (key is released)
-
-						$notenumber = ord(substr($trackdata, $eventsoffset++, 1));
-						$velocity   = ord(substr($trackdata, $eventsoffset++, 1));
-
-					} elseif ($MIDIevents[$tracknumber][$eventid]['eventid'] == 0x09) { // Note on (key is pressed)
-
-						$notenumber = ord(substr($trackdata, $eventsoffset++, 1));
-						$velocity   = ord(substr($trackdata, $eventsoffset++, 1));
-
-					} elseif ($MIDIevents[$tracknumber][$eventid]['eventid'] == 0x0A) { // Key after-touch
-
-						$notenumber = ord(substr($trackdata, $eventsoffset++, 1));
-						$velocity   = ord(substr($trackdata, $eventsoffset++, 1));
-
-					} elseif ($MIDIevents[$tracknumber][$eventid]['eventid'] == 0x0B) { // Control Change
-
-						$controllernum = ord(substr($trackdata, $eventsoffset++, 1));
-						$newvalue      = ord(substr($trackdata, $eventsoffset++, 1));
-
-					} elseif ($MIDIevents[$tracknumber][$eventid]['eventid'] == 0x0C) { // Program (patch) change
-
-						$newprogramnum = ord(substr($trackdata, $eventsoffset++, 1));
-
-						$thisfile_midi_raw['track'][$tracknumber]['instrumentid'] = $newprogramnum;
-						if ($tracknumber == 10) {
-							$thisfile_midi_raw['track'][$tracknumber]['instrument'] = $this->GeneralMIDIpercussionLookup($newprogramnum);
-						} else {
-							$thisfile_midi_raw['track'][$tracknumber]['instrument'] = $this->GeneralMIDIinstrumentLookup($newprogramnum);
-						}
-
-					} elseif ($MIDIevents[$tracknumber][$eventid]['eventid'] == 0x0D) { // Channel after-touch
-
-						$channelnumber = ord(substr($trackdata, $eventsoffset++, 1));
-
-					} elseif ($MIDIevents[$tracknumber][$eventid]['eventid'] == 0x0E) { // Pitch wheel change (2000H is normal or no change)
-
-						$changeLSB = ord(substr($trackdata, $eventsoffset++, 1));
-						$changeMSB = ord(substr($trackdata, $eventsoffset++, 1));
-						$pitchwheelchange = (($changeMSB & 0x7F) << 7) & ($changeLSB & 0x7F);
-
-					} elseif (($MIDIevents[$tracknumber][$eventid]['eventid'] == 0x0F) && ($MIDIevents[$tracknumber][$eventid]['channel'] == 0x0F)) {
-
-						$METAeventCommand = ord(substr($trackdata, $eventsoffset++, 1));
-						$METAeventLength  = ord(substr($trackdata, $eventsoffset++, 1));
-						$METAeventData    = substr($trackdata, $eventsoffset, $METAeventLength);
-						$eventsoffset += $METAeventLength;
-						switch ($METAeventCommand) {
-							case 0x00: // Set track sequence number
-								$track_sequence_number = getid3_lib::BigEndian2Int(substr($METAeventData, 0, $METAeventLength));
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['seqno'] = $track_sequence_number;
-								break;
-
-							case 0x01: // Text: generic
-								$text_generic = substr($METAeventData, 0, $METAeventLength);
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['text'] = $text_generic;
-								$thisfile_midi['comments']['comment'][] = $text_generic;
-								break;
-
-							case 0x02: // Text: copyright
-								$text_copyright = substr($METAeventData, 0, $METAeventLength);
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['copyright'] = $text_copyright;
-								$thisfile_midi['comments']['copyright'][] = $text_copyright;
-								break;
-
-							case 0x03: // Text: track name
-								$text_trackname = substr($METAeventData, 0, $METAeventLength);
-								$thisfile_midi_raw['track'][$tracknumber]['name'] = $text_trackname;
-								break;
-
-							case 0x04: // Text: track instrument name
-								$text_instrument = substr($METAeventData, 0, $METAeventLength);
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['instrument'] = $text_instrument;
-								break;
-
-							case 0x05: // Text: lyrics
-								$text_lyrics  = substr($METAeventData, 0, $METAeventLength);
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['lyrics'] = $text_lyrics;
-								if (!isset($thisfile_midi['lyrics'])) {
-									$thisfile_midi['lyrics'] = '';
-								}
-								$thisfile_midi['lyrics'] .= $text_lyrics."\n";
-								break;
-
-							case 0x06: // Text: marker
-								$text_marker = substr($METAeventData, 0, $METAeventLength);
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['marker'] = $text_marker;
-								break;
-
-							case 0x07: // Text: cue point
-								$text_cuepoint = substr($METAeventData, 0, $METAeventLength);
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['cuepoint'] = $text_cuepoint;
-								break;
-
-							case 0x2F: // End Of Track
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['EOT'] = $CumulativeDeltaTime;
-								break;
-
-							case 0x51: // Tempo: microseconds / quarter note
-								$CurrentMicroSecondsPerBeat = getid3_lib::BigEndian2Int(substr($METAeventData, 0, $METAeventLength));
-								if ($CurrentMicroSecondsPerBeat == 0) {
-									$info['error'][] = 'Corrupt MIDI file: CurrentMicroSecondsPerBeat == zero';
-									return false;
-								}
-								$thisfile_midi_raw['events'][$tracknumber][$CumulativeDeltaTime]['us_qnote'] = $CurrentMicroSecondsPerBeat;
-								$CurrentBeatsPerMinute = (1000000 / $CurrentMicroSecondsPerBeat) * 60;
-								$MicroSecondsPerQuarterNoteAfter[$CumulativeDeltaTime] = $CurrentMicroSecondsPerBeat;
-								$TicksAtCurrentBPM = 0;
-								break;
-
-							case 0x58: // Time signature
-								$timesig_numerator   = getid3_lib::BigEndian2Int($METAeventData{0});
-								$timesig_denominator = pow(2, getid3_lib::BigEndian2Int($METAeventData{1})); // $02 -> x/4, $03 -> x/8, etc
-								$timesig_32inqnote   = getid3_lib::BigEndian2Int($METAeventData{2});         // number of 32nd notes to the quarter note
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['timesig_32inqnote']   = $timesig_32inqnote;
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['timesig_numerator']   = $timesig_numerator;
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['timesig_denominator'] = $timesig_denominator;
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['timesig_text']        = $timesig_numerator.'/'.$timesig_denominator;
-								$thisfile_midi['timesignature'][] = $timesig_numerator.'/'.$timesig_denominator;
-								break;
-
-							case 0x59: // Keysignature
-								$keysig_sharpsflats = getid3_lib::BigEndian2Int($METAeventData{0});
-								if ($keysig_sharpsflats & 0x80) {
-									// (-7 -> 7 flats, 0 ->key of C, 7 -> 7 sharps)
-									$keysig_sharpsflats -= 256;
-								}
-
-								$keysig_majorminor  = getid3_lib::BigEndian2Int($METAeventData{1}); // 0 -> major, 1 -> minor
-								$keysigs = array(-7=>'Cb', -6=>'Gb', -5=>'Db', -4=>'Ab', -3=>'Eb', -2=>'Bb', -1=>'F', 0=>'C', 1=>'G', 2=>'D', 3=>'A', 4=>'E', 5=>'B', 6=>'F#', 7=>'C#');
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['keysig_sharps'] = (($keysig_sharpsflats > 0) ? abs($keysig_sharpsflats) : 0);
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['keysig_flats']  = (($keysig_sharpsflats < 0) ? abs($keysig_sharpsflats) : 0);
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['keysig_minor']  = (bool) $keysig_majorminor;
-								//$thisfile_midi_raw['events'][$tracknumber][$eventid]['keysig_text']   = $keysigs[$keysig_sharpsflats].' '.($thisfile_midi_raw['events'][$tracknumber][$eventid]['keysig_minor'] ? 'minor' : 'major');
-
-								// $keysigs[$keysig_sharpsflats] gets an int key (correct) - $keysigs["$keysig_sharpsflats"] gets a string key (incorrect)
-								$thisfile_midi['keysignature'][] = $keysigs[$keysig_sharpsflats].' '.((bool) $keysig_majorminor ? 'minor' : 'major');
-								break;
-
-							case 0x7F: // Sequencer specific information
-								$custom_data = substr($METAeventData, 0, $METAeventLength);
-								break;
-
-							default:
-								$info['warning'][] = 'Unhandled META Event Command: '.$METAeventCommand;
-								break;
-						}
-
-					} else {
-
-						$info['warning'][] = 'Unhandled MIDI Event ID: '.$MIDIevents[$tracknumber][$eventid]['eventid'].' + Channel ID: '.$MIDIevents[$tracknumber][$eventid]['channel'];
-
-					}
-				}
-				if (($tracknumber > 0) || (count($trackdataarray) == 1)) {
-					$thisfile_midi['totalticks'] = max($thisfile_midi['totalticks'], $CumulativeDeltaTime);
-				}
-			}
-			$previoustickoffset = null;
-
-			ksort($MicroSecondsPerQuarterNoteAfter);
-			foreach ($MicroSecondsPerQuarterNoteAfter as $tickoffset => $microsecondsperbeat) {
-				if (is_null($previoustickoffset)) {
-					$prevmicrosecondsperbeat = $microsecondsperbeat;
-					$previoustickoffset = $tickoffset;
-					continue;
-				}
-				if ($thisfile_midi['totalticks'] > $tickoffset) {
-
-					if ($thisfile_midi_raw['ticksperqnote'] == 0) {
-						$info['error'][] = 'Corrupt MIDI file: ticksperqnote == zero';
-						return false;
-					}
-
-					$info['playtime_seconds'] += (($tickoffset - $previoustickoffset) / $thisfile_midi_raw['ticksperqnote']) * ($prevmicrosecondsperbeat / 1000000);
-
-					$prevmicrosecondsperbeat = $microsecondsperbeat;
-					$previoustickoffset = $tickoffset;
-				}
-			}
-			if ($thisfile_midi['totalticks'] > $previoustickoffset) {
-
-				if ($thisfile_midi_raw['ticksperqnote'] == 0) {
-					$info['error'][] = 'Corrupt MIDI file: ticksperqnote == zero';
-					return false;
-				}
-
-				$info['playtime_seconds'] += (($thisfile_midi['totalticks'] - $previoustickoffset) / $thisfile_midi_raw['ticksperqnote']) * ($microsecondsperbeat / 1000000);
-
-			}
-		}
-
-
-		if (!empty($info['playtime_seconds'])) {
-			$info['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-		}
-
-		if (!empty($thisfile_midi['lyrics'])) {
-			$thisfile_midi['comments']['lyrics'][] = $thisfile_midi['lyrics'];
-		}
-
-		return true;
-	}
-
-	function GeneralMIDIinstrumentLookup($instrumentid) {
-
-		$begin = __LINE__;
-
-		/** This is not a comment!
-
-			0	Acoustic Grand
-			1	Bright Acoustic
-			2	Electric Grand
-			3	Honky-Tonk
-			4	Electric Piano 1
-			5	Electric Piano 2
-			6	Harpsichord
-			7	Clavier
-			8	Celesta
-			9	Glockenspiel
-			10	Music Box
-			11	Vibraphone
-			12	Marimba
-			13	Xylophone
-			14	Tubular Bells
-			15	Dulcimer
-			16	Drawbar Organ
-			17	Percussive Organ
-			18	Rock Organ
-			19	Church Organ
-			20	Reed Organ
-			21	Accordian
-			22	Harmonica
-			23	Tango Accordian
-			24	Acoustic Guitar (nylon)
-			25	Acoustic Guitar (steel)
-			26	Electric Guitar (jazz)
-			27	Electric Guitar (clean)
-			28	Electric Guitar (muted)
-			29	Overdriven Guitar
-			30	Distortion Guitar
-			31	Guitar Harmonics
-			32	Acoustic Bass
-			33	Electric Bass (finger)
-			34	Electric Bass (pick)
-			35	Fretless Bass
-			36	Slap Bass 1
-			37	Slap Bass 2
-			38	Synth Bass 1
-			39	Synth Bass 2
-			40	Violin
-			41	Viola
-			42	Cello
-			43	Contrabass
-			44	Tremolo Strings
-			45	Pizzicato Strings
-			46	Orchestral Strings
-			47	Timpani
-			48	String Ensemble 1
-			49	String Ensemble 2
-			50	SynthStrings 1
-			51	SynthStrings 2
-			52	Choir Aahs
-			53	Voice Oohs
-			54	Synth Voice
-			55	Orchestra Hit
-			56	Trumpet
-			57	Trombone
-			58	Tuba
-			59	Muted Trumpet
-			60	French Horn
-			61	Brass Section
-			62	SynthBrass 1
-			63	SynthBrass 2
-			64	Soprano Sax
-			65	Alto Sax
-			66	Tenor Sax
-			67	Baritone Sax
-			68	Oboe
-			69	English Horn
-			70	Bassoon
-			71	Clarinet
-			72	Piccolo
-			73	Flute
-			74	Recorder
-			75	Pan Flute
-			76	Blown Bottle
-			77	Shakuhachi
-			78	Whistle
-			79	Ocarina
-			80	Lead 1 (square)
-			81	Lead 2 (sawtooth)
-			82	Lead 3 (calliope)
-			83	Lead 4 (chiff)
-			84	Lead 5 (charang)
-			85	Lead 6 (voice)
-			86	Lead 7 (fifths)
-			87	Lead 8 (bass + lead)
-			88	Pad 1 (new age)
-			89	Pad 2 (warm)
-			90	Pad 3 (polysynth)
-			91	Pad 4 (choir)
-			92	Pad 5 (bowed)
-			93	Pad 6 (metallic)
-			94	Pad 7 (halo)
-			95	Pad 8 (sweep)
-			96	FX 1 (rain)
-			97	FX 2 (soundtrack)
-			98	FX 3 (crystal)
-			99	FX 4 (atmosphere)
-			100	FX 5 (brightness)
-			101	FX 6 (goblins)
-			102	FX 7 (echoes)
-			103	FX 8 (sci-fi)
-			104	Sitar
-			105	Banjo
-			106	Shamisen
-			107	Koto
-			108	Kalimba
-			109	Bagpipe
-			110	Fiddle
-			111	Shanai
-			112	Tinkle Bell
-			113	Agogo
-			114	Steel Drums
-			115	Woodblock
-			116	Taiko Drum
-			117	Melodic Tom
-			118	Synth Drum
-			119	Reverse Cymbal
-			120	Guitar Fret Noise
-			121	Breath Noise
-			122	Seashore
-			123	Bird Tweet
-			124	Telephone Ring
-			125	Helicopter
-			126	Applause
-			127	Gunshot
-
-		*/
-
-		return getid3_lib::EmbeddedLookup($instrumentid, $begin, __LINE__, __FILE__, 'GeneralMIDIinstrument');
-	}
-
-	function GeneralMIDIpercussionLookup($instrumentid) {
-
-		$begin = __LINE__;
-
-		/** This is not a comment!
-
-			35	Acoustic Bass Drum
-			36	Bass Drum 1
-			37	Side Stick
-			38	Acoustic Snare
-			39	Hand Clap
-			40	Electric Snare
-			41	Low Floor Tom
-			42	Closed Hi-Hat
-			43	High Floor Tom
-			44	Pedal Hi-Hat
-			45	Low Tom
-			46	Open Hi-Hat
-			47	Low-Mid Tom
-			48	Hi-Mid Tom
-			49	Crash Cymbal 1
-			50	High Tom
-			51	Ride Cymbal 1
-			52	Chinese Cymbal
-			53	Ride Bell
-			54	Tambourine
-			55	Splash Cymbal
-			56	Cowbell
-			57	Crash Cymbal 2
-			59	Ride Cymbal 2
-			60	Hi Bongo
-			61	Low Bongo
-			62	Mute Hi Conga
-			63	Open Hi Conga
-			64	Low Conga
-			65	High Timbale
-			66	Low Timbale
-			67	High Agogo
-			68	Low Agogo
-			69	Cabasa
-			70	Maracas
-			71	Short Whistle
-			72	Long Whistle
-			73	Short Guiro
-			74	Long Guiro
-			75	Claves
-			76	Hi Wood Block
-			77	Low Wood Block
-			78	Mute Cuica
-			79	Open Cuica
-			80	Mute Triangle
-			81	Open Triangle
-
-		*/
-
-		return getid3_lib::EmbeddedLookup($instrumentid, $begin, __LINE__, __FILE__, 'GeneralMIDIpercussion');
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.mod.php b/lib/getid3/getid3/module.audio.mod.php
deleted file mode 100644
index b88176942..000000000
--- a/lib/getid3/getid3/module.audio.mod.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.mod.php                                        //
-// module for analyzing MOD Audio files                        //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_mod extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$fileheader = fread($this->getid3->fp, 1088);
-		if (preg_match('#^IMPM#', $fileheader)) {
-			return $this->getITheaderFilepointer();
-		} elseif (preg_match('#^Extended Module#', $fileheader)) {
-			return $this->getXMheaderFilepointer();
-		} elseif (preg_match('#^.{44}SCRM#', $fileheader)) {
-			return $this->getS3MheaderFilepointer();
-		} elseif (preg_match('#^.{1080}(M\\.K\\.|M!K!|FLT4|FLT8|[5-9]CHN|[1-3][0-9]CH)#', $fileheader)) {
-			return $this->getMODheaderFilepointer();
-		}
-		$info['error'][] = 'This is not a known type of MOD file';
-		return false;
-	}
-
-
-	function getMODheaderFilepointer() {
-		$info = &$this->getid3->info;
-		fseek($this->getid3->fp, $info['avdataoffset'] + 1080);
-		$FormatID = fread($this->getid3->fp, 4);
-		if (!preg_match('#^(M.K.|[5-9]CHN|[1-3][0-9]CH)$#', $FormatID)) {
-			$info['error'][] = 'This is not a known type of MOD file';
-			return false;
-		}
-
-		$info['fileformat'] = 'mod';
-
-		$info['error'][] = 'MOD parsing not enabled in this version of getID3() ['.$this->getid3->version().']';
-		return false;
-	}
-
-	function getXMheaderFilepointer() {
-		$info = &$this->getid3->info;
-		fseek($this->getid3->fp, $info['avdataoffset']);
-		$FormatID = fread($this->getid3->fp, 15);
-		if (!preg_match('#^Extended Module$#', $FormatID)) {
-			$info['error'][] = 'This is not a known type of XM-MOD file';
-			return false;
-		}
-
-		$info['fileformat'] = 'xm';
-
-		$info['error'][] = 'XM-MOD parsing not enabled in this version of getID3() ['.$this->getid3->version().']';
-		return false;
-	}
-
-	function getS3MheaderFilepointer() {
-		$info = &$this->getid3->info;
-		fseek($this->getid3->fp, $info['avdataoffset'] + 44);
-		$FormatID = fread($this->getid3->fp, 4);
-		if (!preg_match('#^SCRM$#', $FormatID)) {
-			$info['error'][] = 'This is not a ScreamTracker MOD file';
-			return false;
-		}
-
-		$info['fileformat'] = 's3m';
-
-		$info['error'][] = 'ScreamTracker parsing not enabled in this version of getID3() ['.$this->getid3->version().']';
-		return false;
-	}
-
-	function getITheaderFilepointer() {
-		$info = &$this->getid3->info;
-		fseek($this->getid3->fp, $info['avdataoffset']);
-		$FormatID = fread($this->getid3->fp, 4);
-		if (!preg_match('#^IMPM$#', $FormatID)) {
-			$info['error'][] = 'This is not an ImpulseTracker MOD file';
-			return false;
-		}
-
-		$info['fileformat'] = 'it';
-
-		$info['error'][] = 'ImpulseTracker parsing not enabled in this version of getID3() ['.$this->getid3->version().']';
-		return false;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.monkey.php b/lib/getid3/getid3/module.audio.monkey.php
deleted file mode 100644
index ffaeae9f0..000000000
--- a/lib/getid3/getid3/module.audio.monkey.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.monkey.php                                     //
-// module for analyzing Monkey's Audio files                   //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_monkey extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		// based loosely on code from TMonkey by Jurgen Faul <jfaul�gmx*de>
-		// http://jfaul.de/atl  or  http://j-faul.virtualave.net/atl/atl.html
-
-		$info['fileformat']            = 'mac';
-		$info['audio']['dataformat']   = 'mac';
-		$info['audio']['bitrate_mode'] = 'vbr';
-		$info['audio']['lossless']     = true;
-
-		$info['monkeys_audio']['raw'] = array();
-		$thisfile_monkeysaudio                = &$info['monkeys_audio'];
-		$thisfile_monkeysaudio_raw            = &$thisfile_monkeysaudio['raw'];
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$MACheaderData = fread($this->getid3->fp, 74);
-
-		$thisfile_monkeysaudio_raw['magic'] = substr($MACheaderData, 0, 4);
-		$magic = 'MAC ';
-		if ($thisfile_monkeysaudio_raw['magic'] != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($thisfile_monkeysaudio_raw['magic']).'"';
-			unset($info['fileformat']);
-			return false;
-		}
-		$thisfile_monkeysaudio_raw['nVersion']             = getid3_lib::LittleEndian2Int(substr($MACheaderData, 4, 2)); // appears to be uint32 in 3.98+
-
-		if ($thisfile_monkeysaudio_raw['nVersion'] < 3980) {
-			$thisfile_monkeysaudio_raw['nCompressionLevel']    = getid3_lib::LittleEndian2Int(substr($MACheaderData, 6, 2));
-			$thisfile_monkeysaudio_raw['nFormatFlags']         = getid3_lib::LittleEndian2Int(substr($MACheaderData, 8, 2));
-			$thisfile_monkeysaudio_raw['nChannels']            = getid3_lib::LittleEndian2Int(substr($MACheaderData, 10, 2));
-			$thisfile_monkeysaudio_raw['nSampleRate']          = getid3_lib::LittleEndian2Int(substr($MACheaderData, 12, 4));
-			$thisfile_monkeysaudio_raw['nHeaderDataBytes']     = getid3_lib::LittleEndian2Int(substr($MACheaderData, 16, 4));
-			$thisfile_monkeysaudio_raw['nWAVTerminatingBytes'] = getid3_lib::LittleEndian2Int(substr($MACheaderData, 20, 4));
-			$thisfile_monkeysaudio_raw['nTotalFrames']         = getid3_lib::LittleEndian2Int(substr($MACheaderData, 24, 4));
-			$thisfile_monkeysaudio_raw['nFinalFrameSamples']   = getid3_lib::LittleEndian2Int(substr($MACheaderData, 28, 4));
-			$thisfile_monkeysaudio_raw['nPeakLevel']           = getid3_lib::LittleEndian2Int(substr($MACheaderData, 32, 4));
-			$thisfile_monkeysaudio_raw['nSeekElements']        = getid3_lib::LittleEndian2Int(substr($MACheaderData, 38, 2));
-			$offset = 8;
-		} else {
-			$offset = 8;
-			// APE_DESCRIPTOR
-			$thisfile_monkeysaudio_raw['nDescriptorBytes']       = getid3_lib::LittleEndian2Int(substr($MACheaderData, $offset,  4));
-			$offset += 4;
-			$thisfile_monkeysaudio_raw['nHeaderBytes']           = getid3_lib::LittleEndian2Int(substr($MACheaderData, $offset,  4));
-			$offset += 4;
-			$thisfile_monkeysaudio_raw['nSeekTableBytes']        = getid3_lib::LittleEndian2Int(substr($MACheaderData, $offset,  4));
-			$offset += 4;
-			$thisfile_monkeysaudio_raw['nHeaderDataBytes']       = getid3_lib::LittleEndian2Int(substr($MACheaderData, $offset,  4));
-			$offset += 4;
-			$thisfile_monkeysaudio_raw['nAPEFrameDataBytes']     = getid3_lib::LittleEndian2Int(substr($MACheaderData, $offset,  4));
-			$offset += 4;
-			$thisfile_monkeysaudio_raw['nAPEFrameDataBytesHigh'] = getid3_lib::LittleEndian2Int(substr($MACheaderData, $offset,  4));
-			$offset += 4;
-			$thisfile_monkeysaudio_raw['nTerminatingDataBytes']  = getid3_lib::LittleEndian2Int(substr($MACheaderData, $offset,  4));
-			$offset += 4;
-			$thisfile_monkeysaudio_raw['cFileMD5']               =                              substr($MACheaderData, $offset, 16);
-			$offset += 16;
-
-			// APE_HEADER
-			$thisfile_monkeysaudio_raw['nCompressionLevel']    = getid3_lib::LittleEndian2Int(substr($MACheaderData, $offset, 2));
-			$offset += 2;
-			$thisfile_monkeysaudio_raw['nFormatFlags']         = getid3_lib::LittleEndian2Int(substr($MACheaderData, $offset, 2));
-			$offset += 2;
-			$thisfile_monkeysaudio_raw['nBlocksPerFrame']      = getid3_lib::LittleEndian2Int(substr($MACheaderData, $offset, 4));
-			$offset += 4;
-			$thisfile_monkeysaudio_raw['nFinalFrameBlocks']    = getid3_lib::LittleEndian2Int(substr($MACheaderData, $offset, 4));
-			$offset += 4;
-			$thisfile_monkeysaudio_raw['nTotalFrames']         = getid3_lib::LittleEndian2Int(substr($MACheaderData, $offset, 4));
-			$offset += 4;
-			$thisfile_monkeysaudio_raw['nBitsPerSample']       = getid3_lib::LittleEndian2Int(substr($MACheaderData, $offset, 2));
-			$offset += 2;
-			$thisfile_monkeysaudio_raw['nChannels']            = getid3_lib::LittleEndian2Int(substr($MACheaderData, $offset, 2));
-			$offset += 2;
-			$thisfile_monkeysaudio_raw['nSampleRate']          = getid3_lib::LittleEndian2Int(substr($MACheaderData, $offset, 4));
-			$offset += 4;
-		}
-
-		$thisfile_monkeysaudio['flags']['8-bit']         = (bool) ($thisfile_monkeysaudio_raw['nFormatFlags'] & 0x0001);
-		$thisfile_monkeysaudio['flags']['crc-32']        = (bool) ($thisfile_monkeysaudio_raw['nFormatFlags'] & 0x0002);
-		$thisfile_monkeysaudio['flags']['peak_level']    = (bool) ($thisfile_monkeysaudio_raw['nFormatFlags'] & 0x0004);
-		$thisfile_monkeysaudio['flags']['24-bit']        = (bool) ($thisfile_monkeysaudio_raw['nFormatFlags'] & 0x0008);
-		$thisfile_monkeysaudio['flags']['seek_elements'] = (bool) ($thisfile_monkeysaudio_raw['nFormatFlags'] & 0x0010);
-		$thisfile_monkeysaudio['flags']['no_wav_header'] = (bool) ($thisfile_monkeysaudio_raw['nFormatFlags'] & 0x0020);
-		$thisfile_monkeysaudio['version']                = $thisfile_monkeysaudio_raw['nVersion'] / 1000;
-		$thisfile_monkeysaudio['compression']            = $this->MonkeyCompressionLevelNameLookup($thisfile_monkeysaudio_raw['nCompressionLevel']);
-		if ($thisfile_monkeysaudio_raw['nVersion'] < 3980) {
-			$thisfile_monkeysaudio['samples_per_frame']      = $this->MonkeySamplesPerFrame($thisfile_monkeysaudio_raw['nVersion'], $thisfile_monkeysaudio_raw['nCompressionLevel']);
-		}
-		$thisfile_monkeysaudio['bits_per_sample']        = ($thisfile_monkeysaudio['flags']['24-bit'] ? 24 : ($thisfile_monkeysaudio['flags']['8-bit'] ? 8 : 16));
-		$thisfile_monkeysaudio['channels']               = $thisfile_monkeysaudio_raw['nChannels'];
-		$info['audio']['channels']               = $thisfile_monkeysaudio['channels'];
-		$thisfile_monkeysaudio['sample_rate']            = $thisfile_monkeysaudio_raw['nSampleRate'];
-		if ($thisfile_monkeysaudio['sample_rate'] == 0) {
-			$info['error'][] = 'Corrupt MAC file: frequency == zero';
-			return false;
-		}
-		$info['audio']['sample_rate']            = $thisfile_monkeysaudio['sample_rate'];
-		if ($thisfile_monkeysaudio['flags']['peak_level']) {
-			$thisfile_monkeysaudio['peak_level']         = $thisfile_monkeysaudio_raw['nPeakLevel'];
-			$thisfile_monkeysaudio['peak_ratio']         = $thisfile_monkeysaudio['peak_level'] / pow(2, $thisfile_monkeysaudio['bits_per_sample'] - 1);
-		}
-		if ($thisfile_monkeysaudio_raw['nVersion'] >= 3980) {
-			$thisfile_monkeysaudio['samples']            = (($thisfile_monkeysaudio_raw['nTotalFrames'] - 1) * $thisfile_monkeysaudio_raw['nBlocksPerFrame']) + $thisfile_monkeysaudio_raw['nFinalFrameBlocks'];
-		} else {
-			$thisfile_monkeysaudio['samples']            = (($thisfile_monkeysaudio_raw['nTotalFrames'] - 1) * $thisfile_monkeysaudio['samples_per_frame']) + $thisfile_monkeysaudio_raw['nFinalFrameSamples'];
-		}
-		$thisfile_monkeysaudio['playtime']               = $thisfile_monkeysaudio['samples'] / $thisfile_monkeysaudio['sample_rate'];
-		if ($thisfile_monkeysaudio['playtime'] == 0) {
-			$info['error'][] = 'Corrupt MAC file: playtime == zero';
-			return false;
-		}
-		$info['playtime_seconds']                = $thisfile_monkeysaudio['playtime'];
-		$thisfile_monkeysaudio['compressed_size']        = $info['avdataend'] - $info['avdataoffset'];
-		$thisfile_monkeysaudio['uncompressed_size']      = $thisfile_monkeysaudio['samples'] * $thisfile_monkeysaudio['channels'] * ($thisfile_monkeysaudio['bits_per_sample'] / 8);
-		if ($thisfile_monkeysaudio['uncompressed_size'] == 0) {
-			$info['error'][] = 'Corrupt MAC file: uncompressed_size == zero';
-			return false;
-		}
-		$thisfile_monkeysaudio['compression_ratio']      = $thisfile_monkeysaudio['compressed_size'] / ($thisfile_monkeysaudio['uncompressed_size'] + $thisfile_monkeysaudio_raw['nHeaderDataBytes']);
-		$thisfile_monkeysaudio['bitrate']                = (($thisfile_monkeysaudio['samples'] * $thisfile_monkeysaudio['channels'] * $thisfile_monkeysaudio['bits_per_sample']) / $thisfile_monkeysaudio['playtime']) * $thisfile_monkeysaudio['compression_ratio'];
-		$info['audio']['bitrate']                = $thisfile_monkeysaudio['bitrate'];
-
-		// add size of MAC header to avdataoffset
-		if ($thisfile_monkeysaudio_raw['nVersion'] >= 3980) {
-			$info['avdataoffset'] += $thisfile_monkeysaudio_raw['nDescriptorBytes'];
-			$info['avdataoffset'] += $thisfile_monkeysaudio_raw['nHeaderBytes'];
-			$info['avdataoffset'] += $thisfile_monkeysaudio_raw['nSeekTableBytes'];
-			$info['avdataoffset'] += $thisfile_monkeysaudio_raw['nHeaderDataBytes'];
-
-			$info['avdataend'] -= $thisfile_monkeysaudio_raw['nTerminatingDataBytes'];
-		} else {
-			$info['avdataoffset'] += $offset;
-		}
-
-		if ($thisfile_monkeysaudio_raw['nVersion'] >= 3980) {
-			if ($thisfile_monkeysaudio_raw['cFileMD5'] === str_repeat("\x00", 16)) {
-				//$info['warning'][] = 'cFileMD5 is null';
-			} else {
-				$info['md5_data_source'] = '';
-				$md5 = $thisfile_monkeysaudio_raw['cFileMD5'];
-				for ($i = 0; $i < strlen($md5); $i++) {
-					$info['md5_data_source'] .= str_pad(dechex(ord($md5{$i})), 2, '00', STR_PAD_LEFT);
-				}
-				if (!preg_match('/^[0-9a-f]{32}$/', $info['md5_data_source'])) {
-					unset($info['md5_data_source']);
-				}
-			}
-		}
-
-
-
-		$info['audio']['bits_per_sample'] = $thisfile_monkeysaudio['bits_per_sample'];
-		$info['audio']['encoder']         = 'MAC v'.number_format($thisfile_monkeysaudio['version'], 2);
-		$info['audio']['encoder_options'] = ucfirst($thisfile_monkeysaudio['compression']).' compression';
-
-		return true;
-	}
-
-	function MonkeyCompressionLevelNameLookup($compressionlevel) {
-		static $MonkeyCompressionLevelNameLookup = array(
-			0     => 'unknown',
-			1000  => 'fast',
-			2000  => 'normal',
-			3000  => 'high',
-			4000  => 'extra-high',
-			5000  => 'insane'
-		);
-		return (isset($MonkeyCompressionLevelNameLookup[$compressionlevel]) ? $MonkeyCompressionLevelNameLookup[$compressionlevel] : 'invalid');
-	}
-
-	function MonkeySamplesPerFrame($versionid, $compressionlevel) {
-		if ($versionid >= 3950) {
-			return 73728 * 4;
-		} elseif ($versionid >= 3900) {
-			return 73728;
-		} elseif (($versionid >= 3800) && ($compressionlevel == 4000)) {
-			return 73728;
-		} else {
-			return 9216;
-		}
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.mp3.php b/lib/getid3/getid3/module.audio.mp3.php
deleted file mode 100644
index 909646e1a..000000000
--- a/lib/getid3/getid3/module.audio.mp3.php
+++ /dev/null
@@ -1,2011 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.mp3.php                                        //
-// module for analyzing MP3 files                              //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-// number of frames to scan to determine if MPEG-audio sequence is valid
-// Lower this number to 5-20 for faster scanning
-// Increase this number to 50+ for most accurate detection of valid VBR/CBR
-// mpeg-audio streams
-define('GETID3_MP3_VALID_CHECK_FRAMES', 35);
-
-
-class getid3_mp3 extends getid3_handler
-{
-
-	var $allow_bruteforce = false; // forces getID3() to scan the file byte-by-byte and log all the valid audio frame headers - extremely slow, unrecommended, but may provide data from otherwise-unusuable files
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$initialOffset = $info['avdataoffset'];
-
-		if (!$this->getOnlyMPEGaudioInfo($info['avdataoffset'])) {
-			if ($this->allow_bruteforce) {
-				$info['error'][] = 'Rescanning file in BruteForce mode';
-				$this->getOnlyMPEGaudioInfoBruteForce($this->getid3->fp, $info);
-			}
-		}
-
-
-		if (isset($info['mpeg']['audio']['bitrate_mode'])) {
-			$info['audio']['bitrate_mode'] = strtolower($info['mpeg']['audio']['bitrate_mode']);
-		}
-
-		if (((isset($info['id3v2']['headerlength']) && ($info['avdataoffset'] > $info['id3v2']['headerlength'])) || (!isset($info['id3v2']) && ($info['avdataoffset'] > 0) && ($info['avdataoffset'] != $initialOffset)))) {
-
-			$synchoffsetwarning = 'Unknown data before synch ';
-			if (isset($info['id3v2']['headerlength'])) {
-				$synchoffsetwarning .= '(ID3v2 header ends at '.$info['id3v2']['headerlength'].', then '.($info['avdataoffset'] - $info['id3v2']['headerlength']).' bytes garbage, ';
-			} elseif ($initialOffset > 0) {
-				$synchoffsetwarning .= '(should be at '.$initialOffset.', ';
-			} else {
-				$synchoffsetwarning .= '(should be at beginning of file, ';
-			}
-			$synchoffsetwarning .= 'synch detected at '.$info['avdataoffset'].')';
-			if (isset($info['audio']['bitrate_mode']) && ($info['audio']['bitrate_mode'] == 'cbr')) {
-
-				if (!empty($info['id3v2']['headerlength']) && (($info['avdataoffset'] - $info['id3v2']['headerlength']) == $info['mpeg']['audio']['framelength'])) {
-
-					$synchoffsetwarning .= '. This is a known problem with some versions of LAME (3.90-3.92) DLL in CBR mode.';
-					$info['audio']['codec'] = 'LAME';
-					$CurrentDataLAMEversionString = 'LAME3.';
-
-				} elseif (empty($info['id3v2']['headerlength']) && ($info['avdataoffset'] == $info['mpeg']['audio']['framelength'])) {
-
-					$synchoffsetwarning .= '. This is a known problem with some versions of LAME (3.90 - 3.92) DLL in CBR mode.';
-					$info['audio']['codec'] = 'LAME';
-					$CurrentDataLAMEversionString = 'LAME3.';
-
-				}
-
-			}
-			$info['warning'][] = $synchoffsetwarning;
-
-		}
-
-		if (isset($info['mpeg']['audio']['LAME'])) {
-			$info['audio']['codec'] = 'LAME';
-			if (!empty($info['mpeg']['audio']['LAME']['long_version'])) {
-				$info['audio']['encoder'] = rtrim($info['mpeg']['audio']['LAME']['long_version'], "\x00");
-			} elseif (!empty($info['mpeg']['audio']['LAME']['short_version'])) {
-				$info['audio']['encoder'] = rtrim($info['mpeg']['audio']['LAME']['short_version'], "\x00");
-			}
-		}
-
-		$CurrentDataLAMEversionString = (!empty($CurrentDataLAMEversionString) ? $CurrentDataLAMEversionString : (isset($info['audio']['encoder']) ? $info['audio']['encoder'] : ''));
-		if (!empty($CurrentDataLAMEversionString) && (substr($CurrentDataLAMEversionString, 0, 6) == 'LAME3.') && !preg_match('[0-9\)]', substr($CurrentDataLAMEversionString, -1))) {
-			// a version number of LAME that does not end with a number like "LAME3.92"
-			// or with a closing parenthesis like "LAME3.88 (alpha)"
-			// or a version of LAME with the LAMEtag-not-filled-in-DLL-mode bug (3.90-3.92)
-
-			// not sure what the actual last frame length will be, but will be less than or equal to 1441
-			$PossiblyLongerLAMEversion_FrameLength = 1441;
-
-			// Not sure what version of LAME this is - look in padding of last frame for longer version string
-			$PossibleLAMEversionStringOffset = $info['avdataend'] - $PossiblyLongerLAMEversion_FrameLength;
-			fseek($this->getid3->fp, $PossibleLAMEversionStringOffset);
-			$PossiblyLongerLAMEversion_Data = fread($this->getid3->fp, $PossiblyLongerLAMEversion_FrameLength);
-			switch (substr($CurrentDataLAMEversionString, -1)) {
-				case 'a':
-				case 'b':
-					// "LAME3.94a" will have a longer version string of "LAME3.94 (alpha)" for example
-					// need to trim off "a" to match longer string
-					$CurrentDataLAMEversionString = substr($CurrentDataLAMEversionString, 0, -1);
-					break;
-			}
-			if (($PossiblyLongerLAMEversion_String = strstr($PossiblyLongerLAMEversion_Data, $CurrentDataLAMEversionString)) !== false) {
-				if (substr($PossiblyLongerLAMEversion_String, 0, strlen($CurrentDataLAMEversionString)) == $CurrentDataLAMEversionString) {
-					$PossiblyLongerLAMEversion_NewString = substr($PossiblyLongerLAMEversion_String, 0, strspn($PossiblyLongerLAMEversion_String, 'LAME0123456789., (abcdefghijklmnopqrstuvwxyzJFSOND)')); //"LAME3.90.3"  "LAME3.87 (beta 1, Sep 27 2000)" "LAME3.88 (beta)"
-					if (empty($info['audio']['encoder']) || (strlen($PossiblyLongerLAMEversion_NewString) > strlen($info['audio']['encoder']))) {
-						$info['audio']['encoder'] = $PossiblyLongerLAMEversion_NewString;
-					}
-				}
-			}
-		}
-		if (!empty($info['audio']['encoder'])) {
-			$info['audio']['encoder'] = rtrim($info['audio']['encoder'], "\x00 ");
-		}
-
-		switch (isset($info['mpeg']['audio']['layer']) ? $info['mpeg']['audio']['layer'] : '') {
-			case 1:
-			case 2:
-				$info['audio']['dataformat'] = 'mp'.$info['mpeg']['audio']['layer'];
-				break;
-		}
-		if (isset($info['fileformat']) && ($info['fileformat'] == 'mp3')) {
-			switch ($info['audio']['dataformat']) {
-				case 'mp1':
-				case 'mp2':
-				case 'mp3':
-					$info['fileformat'] = $info['audio']['dataformat'];
-					break;
-
-				default:
-					$info['warning'][] = 'Expecting [audio][dataformat] to be mp1/mp2/mp3 when fileformat == mp3, [audio][dataformat] actually "'.$info['audio']['dataformat'].'"';
-					break;
-			}
-		}
-
-		if (empty($info['fileformat'])) {
-			unset($info['fileformat']);
-			unset($info['audio']['bitrate_mode']);
-			unset($info['avdataoffset']);
-			unset($info['avdataend']);
-			return false;
-		}
-
-		$info['mime_type']         = 'audio/mpeg';
-		$info['audio']['lossless'] = false;
-
-		// Calculate playtime
-		if (!isset($info['playtime_seconds']) && isset($info['audio']['bitrate']) && ($info['audio']['bitrate'] > 0)) {
-			$info['playtime_seconds'] = ($info['avdataend'] - $info['avdataoffset']) * 8 / $info['audio']['bitrate'];
-		}
-
-		$info['audio']['encoder_options'] = $this->GuessEncoderOptions();
-
-		return true;
-	}
-
-
-	function GuessEncoderOptions() {
-		// shortcuts
-		$info = &$this->getid3->info;
-		if (!empty($info['mpeg']['audio'])) {
-			$thisfile_mpeg_audio = &$info['mpeg']['audio'];
-			if (!empty($thisfile_mpeg_audio['LAME'])) {
-				$thisfile_mpeg_audio_lame = &$thisfile_mpeg_audio['LAME'];
-			}
-		}
-
-		$encoder_options = '';
-		static $NamedPresetBitrates = array(16, 24, 40, 56, 112, 128, 160, 192, 256);
-
-		if (isset($thisfile_mpeg_audio['VBR_method']) && ($thisfile_mpeg_audio['VBR_method'] == 'Fraunhofer') && !empty($thisfile_mpeg_audio['VBR_quality'])) {
-
-			$encoder_options = 'VBR q'.$thisfile_mpeg_audio['VBR_quality'];
-
-		} elseif (!empty($thisfile_mpeg_audio_lame['preset_used']) && (!in_array($thisfile_mpeg_audio_lame['preset_used_id'], $NamedPresetBitrates))) {
-
-			$encoder_options = $thisfile_mpeg_audio_lame['preset_used'];
-
-		} elseif (!empty($thisfile_mpeg_audio_lame['vbr_quality'])) {
-
-			static $KnownEncoderValues = array();
-			if (empty($KnownEncoderValues)) {
-
-				//$KnownEncoderValues[abrbitrate_minbitrate][vbr_quality][raw_vbr_method][raw_noise_shaping][raw_stereo_mode][ath_type][lowpass_frequency] = 'preset name';
-				$KnownEncoderValues[0xFF][58][1][1][3][2][20500] = '--alt-preset insane';        // 3.90,   3.90.1, 3.92
-				$KnownEncoderValues[0xFF][58][1][1][3][2][20600] = '--alt-preset insane';        // 3.90.2, 3.90.3, 3.91
-				$KnownEncoderValues[0xFF][57][1][1][3][4][20500] = '--alt-preset insane';        // 3.94,   3.95
-				$KnownEncoderValues['**'][78][3][2][3][2][19500] = '--alt-preset extreme';       // 3.90,   3.90.1, 3.92
-				$KnownEncoderValues['**'][78][3][2][3][2][19600] = '--alt-preset extreme';       // 3.90.2, 3.91
-				$KnownEncoderValues['**'][78][3][1][3][2][19600] = '--alt-preset extreme';       // 3.90.3
-				$KnownEncoderValues['**'][78][4][2][3][2][19500] = '--alt-preset fast extreme';  // 3.90,   3.90.1, 3.92
-				$KnownEncoderValues['**'][78][4][2][3][2][19600] = '--alt-preset fast extreme';  // 3.90.2, 3.90.3, 3.91
-				$KnownEncoderValues['**'][78][3][2][3][4][19000] = '--alt-preset standard';      // 3.90,   3.90.1, 3.90.2, 3.91, 3.92
-				$KnownEncoderValues['**'][78][3][1][3][4][19000] = '--alt-preset standard';      // 3.90.3
-				$KnownEncoderValues['**'][78][4][2][3][4][19000] = '--alt-preset fast standard'; // 3.90,   3.90.1, 3.90.2, 3.91, 3.92
-				$KnownEncoderValues['**'][78][4][1][3][4][19000] = '--alt-preset fast standard'; // 3.90.3
-				$KnownEncoderValues['**'][88][4][1][3][3][19500] = '--r3mix';                    // 3.90,   3.90.1, 3.92
-				$KnownEncoderValues['**'][88][4][1][3][3][19600] = '--r3mix';                    // 3.90.2, 3.90.3, 3.91
-				$KnownEncoderValues['**'][67][4][1][3][4][18000] = '--r3mix';                    // 3.94,   3.95
-				$KnownEncoderValues['**'][68][3][2][3][4][18000] = '--alt-preset medium';        // 3.90.3
-				$KnownEncoderValues['**'][68][4][2][3][4][18000] = '--alt-preset fast medium';   // 3.90.3
-
-				$KnownEncoderValues[0xFF][99][1][1][1][2][0]     = '--preset studio';            // 3.90,   3.90.1, 3.90.2, 3.91, 3.92
-				$KnownEncoderValues[0xFF][58][2][1][3][2][20600] = '--preset studio';            // 3.90.3, 3.93.1
-				$KnownEncoderValues[0xFF][58][2][1][3][2][20500] = '--preset studio';            // 3.93
-				$KnownEncoderValues[0xFF][57][2][1][3][4][20500] = '--preset studio';            // 3.94,   3.95
-				$KnownEncoderValues[0xC0][88][1][1][1][2][0]     = '--preset cd';                // 3.90,   3.90.1, 3.90.2,   3.91, 3.92
-				$KnownEncoderValues[0xC0][58][2][2][3][2][19600] = '--preset cd';                // 3.90.3, 3.93.1
-				$KnownEncoderValues[0xC0][58][2][2][3][2][19500] = '--preset cd';                // 3.93
-				$KnownEncoderValues[0xC0][57][2][1][3][4][19500] = '--preset cd';                // 3.94,   3.95
-				$KnownEncoderValues[0xA0][78][1][1][3][2][18000] = '--preset hifi';              // 3.90,   3.90.1, 3.90.2,   3.91, 3.92
-				$KnownEncoderValues[0xA0][58][2][2][3][2][18000] = '--preset hifi';              // 3.90.3, 3.93,   3.93.1
-				$KnownEncoderValues[0xA0][57][2][1][3][4][18000] = '--preset hifi';              // 3.94,   3.95
-				$KnownEncoderValues[0x80][67][1][1][3][2][18000] = '--preset tape';              // 3.90,   3.90.1, 3.90.2,   3.91, 3.92
-				$KnownEncoderValues[0x80][67][1][1][3][2][15000] = '--preset radio';             // 3.90,   3.90.1, 3.90.2,   3.91, 3.92
-				$KnownEncoderValues[0x70][67][1][1][3][2][15000] = '--preset fm';                // 3.90,   3.90.1, 3.90.2,   3.91, 3.92
-				$KnownEncoderValues[0x70][58][2][2][3][2][16000] = '--preset tape/radio/fm';     // 3.90.3, 3.93,   3.93.1
-				$KnownEncoderValues[0x70][57][2][1][3][4][16000] = '--preset tape/radio/fm';     // 3.94,   3.95
-				$KnownEncoderValues[0x38][58][2][2][0][2][10000] = '--preset voice';             // 3.90.3, 3.93,   3.93.1
-				$KnownEncoderValues[0x38][57][2][1][0][4][15000] = '--preset voice';             // 3.94,   3.95
-				$KnownEncoderValues[0x38][57][2][1][0][4][16000] = '--preset voice';             // 3.94a14
-				$KnownEncoderValues[0x28][65][1][1][0][2][7500]  = '--preset mw-us';             // 3.90,   3.90.1, 3.92
-				$KnownEncoderValues[0x28][65][1][1][0][2][7600]  = '--preset mw-us';             // 3.90.2, 3.91
-				$KnownEncoderValues[0x28][58][2][2][0][2][7000]  = '--preset mw-us';             // 3.90.3, 3.93,   3.93.1
-				$KnownEncoderValues[0x28][57][2][1][0][4][10500] = '--preset mw-us';             // 3.94,   3.95
-				$KnownEncoderValues[0x28][57][2][1][0][4][11200] = '--preset mw-us';             // 3.94a14
-				$KnownEncoderValues[0x28][57][2][1][0][4][8800]  = '--preset mw-us';             // 3.94a15
-				$KnownEncoderValues[0x18][58][2][2][0][2][4000]  = '--preset phon+/lw/mw-eu/sw'; // 3.90.3, 3.93.1
-				$KnownEncoderValues[0x18][58][2][2][0][2][3900]  = '--preset phon+/lw/mw-eu/sw'; // 3.93
-				$KnownEncoderValues[0x18][57][2][1][0][4][5900]  = '--preset phon+/lw/mw-eu/sw'; // 3.94,   3.95
-				$KnownEncoderValues[0x18][57][2][1][0][4][6200]  = '--preset phon+/lw/mw-eu/sw'; // 3.94a14
-				$KnownEncoderValues[0x18][57][2][1][0][4][3200]  = '--preset phon+/lw/mw-eu/sw'; // 3.94a15
-				$KnownEncoderValues[0x10][58][2][2][0][2][3800]  = '--preset phone';             // 3.90.3, 3.93.1
-				$KnownEncoderValues[0x10][58][2][2][0][2][3700]  = '--preset phone';             // 3.93
-				$KnownEncoderValues[0x10][57][2][1][0][4][5600]  = '--preset phone';             // 3.94,   3.95
-			}
-
-			if (isset($KnownEncoderValues[$thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate']][$thisfile_mpeg_audio_lame['vbr_quality']][$thisfile_mpeg_audio_lame['raw']['vbr_method']][$thisfile_mpeg_audio_lame['raw']['noise_shaping']][$thisfile_mpeg_audio_lame['raw']['stereo_mode']][$thisfile_mpeg_audio_lame['ath_type']][$thisfile_mpeg_audio_lame['lowpass_frequency']])) {
-
-				$encoder_options = $KnownEncoderValues[$thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate']][$thisfile_mpeg_audio_lame['vbr_quality']][$thisfile_mpeg_audio_lame['raw']['vbr_method']][$thisfile_mpeg_audio_lame['raw']['noise_shaping']][$thisfile_mpeg_audio_lame['raw']['stereo_mode']][$thisfile_mpeg_audio_lame['ath_type']][$thisfile_mpeg_audio_lame['lowpass_frequency']];
-
-			} elseif (isset($KnownEncoderValues['**'][$thisfile_mpeg_audio_lame['vbr_quality']][$thisfile_mpeg_audio_lame['raw']['vbr_method']][$thisfile_mpeg_audio_lame['raw']['noise_shaping']][$thisfile_mpeg_audio_lame['raw']['stereo_mode']][$thisfile_mpeg_audio_lame['ath_type']][$thisfile_mpeg_audio_lame['lowpass_frequency']])) {
-
-				$encoder_options = $KnownEncoderValues['**'][$thisfile_mpeg_audio_lame['vbr_quality']][$thisfile_mpeg_audio_lame['raw']['vbr_method']][$thisfile_mpeg_audio_lame['raw']['noise_shaping']][$thisfile_mpeg_audio_lame['raw']['stereo_mode']][$thisfile_mpeg_audio_lame['ath_type']][$thisfile_mpeg_audio_lame['lowpass_frequency']];
-
-			} elseif ($info['audio']['bitrate_mode'] == 'vbr') {
-
-				// http://gabriel.mp3-tech.org/mp3infotag.html
-				// int    Quality = (100 - 10 * gfp->VBR_q - gfp->quality)h
-
-
-				$LAME_V_value = 10 - ceil($thisfile_mpeg_audio_lame['vbr_quality'] / 10);
-				$LAME_q_value = 100 - $thisfile_mpeg_audio_lame['vbr_quality'] - ($LAME_V_value * 10);
-				$encoder_options = '-V'.$LAME_V_value.' -q'.$LAME_q_value;
-
-			} elseif ($info['audio']['bitrate_mode'] == 'cbr') {
-
-				$encoder_options = strtoupper($info['audio']['bitrate_mode']).ceil($info['audio']['bitrate'] / 1000);
-
-			} else {
-
-				$encoder_options = strtoupper($info['audio']['bitrate_mode']);
-
-			}
-
-		} elseif (!empty($thisfile_mpeg_audio_lame['bitrate_abr'])) {
-
-			$encoder_options = 'ABR'.$thisfile_mpeg_audio_lame['bitrate_abr'];
-
-		} elseif (!empty($info['audio']['bitrate'])) {
-
-			if ($info['audio']['bitrate_mode'] == 'cbr') {
-				$encoder_options = strtoupper($info['audio']['bitrate_mode']).ceil($info['audio']['bitrate'] / 1000);
-			} else {
-				$encoder_options = strtoupper($info['audio']['bitrate_mode']);
-			}
-
-		}
-		if (!empty($thisfile_mpeg_audio_lame['bitrate_min'])) {
-			$encoder_options .= ' -b'.$thisfile_mpeg_audio_lame['bitrate_min'];
-		}
-
-		if (!empty($thisfile_mpeg_audio_lame['encoding_flags']['nogap_prev']) || !empty($thisfile_mpeg_audio_lame['encoding_flags']['nogap_next'])) {
-			$encoder_options .= ' --nogap';
-		}
-
-		if (!empty($thisfile_mpeg_audio_lame['lowpass_frequency'])) {
-			$ExplodedOptions = explode(' ', $encoder_options, 4);
-			if ($ExplodedOptions[0] == '--r3mix') {
-				$ExplodedOptions[1] = 'r3mix';
-			}
-			switch ($ExplodedOptions[0]) {
-				case '--preset':
-				case '--alt-preset':
-				case '--r3mix':
-					if ($ExplodedOptions[1] == 'fast') {
-						$ExplodedOptions[1] .= ' '.$ExplodedOptions[2];
-					}
-					switch ($ExplodedOptions[1]) {
-						case 'portable':
-						case 'medium':
-						case 'standard':
-						case 'extreme':
-						case 'insane':
-						case 'fast portable':
-						case 'fast medium':
-						case 'fast standard':
-						case 'fast extreme':
-						case 'fast insane':
-						case 'r3mix':
-							static $ExpectedLowpass = array(
-									'insane|20500'        => 20500,
-									'insane|20600'        => 20600,  // 3.90.2, 3.90.3, 3.91
-									'medium|18000'        => 18000,
-									'fast medium|18000'   => 18000,
-									'extreme|19500'       => 19500,  // 3.90,   3.90.1, 3.92, 3.95
-									'extreme|19600'       => 19600,  // 3.90.2, 3.90.3, 3.91, 3.93.1
-									'fast extreme|19500'  => 19500,  // 3.90,   3.90.1, 3.92, 3.95
-									'fast extreme|19600'  => 19600,  // 3.90.2, 3.90.3, 3.91, 3.93.1
-									'standard|19000'      => 19000,
-									'fast standard|19000' => 19000,
-									'r3mix|19500'         => 19500,  // 3.90,   3.90.1, 3.92
-									'r3mix|19600'         => 19600,  // 3.90.2, 3.90.3, 3.91
-									'r3mix|18000'         => 18000,  // 3.94,   3.95
-								);
-							if (!isset($ExpectedLowpass[$ExplodedOptions[1].'|'.$thisfile_mpeg_audio_lame['lowpass_frequency']]) && ($thisfile_mpeg_audio_lame['lowpass_frequency'] < 22050) && (round($thisfile_mpeg_audio_lame['lowpass_frequency'] / 1000) < round($thisfile_mpeg_audio['sample_rate'] / 2000))) {
-								$encoder_options .= ' --lowpass '.$thisfile_mpeg_audio_lame['lowpass_frequency'];
-							}
-							break;
-
-						default:
-							break;
-					}
-					break;
-			}
-		}
-
-		if (isset($thisfile_mpeg_audio_lame['raw']['source_sample_freq'])) {
-			if (($thisfile_mpeg_audio['sample_rate'] == 44100) && ($thisfile_mpeg_audio_lame['raw']['source_sample_freq'] != 1)) {
-				$encoder_options .= ' --resample 44100';
-			} elseif (($thisfile_mpeg_audio['sample_rate'] == 48000) && ($thisfile_mpeg_audio_lame['raw']['source_sample_freq'] != 2)) {
-				$encoder_options .= ' --resample 48000';
-			} elseif ($thisfile_mpeg_audio['sample_rate'] < 44100) {
-				switch ($thisfile_mpeg_audio_lame['raw']['source_sample_freq']) {
-					case 0: // <= 32000
-						// may or may not be same as source frequency - ignore
-						break;
-					case 1: // 44100
-					case 2: // 48000
-					case 3: // 48000+
-						$ExplodedOptions = explode(' ', $encoder_options, 4);
-						switch ($ExplodedOptions[0]) {
-							case '--preset':
-							case '--alt-preset':
-								switch ($ExplodedOptions[1]) {
-									case 'fast':
-									case 'portable':
-									case 'medium':
-									case 'standard':
-									case 'extreme':
-									case 'insane':
-										$encoder_options .= ' --resample '.$thisfile_mpeg_audio['sample_rate'];
-										break;
-
-									default:
-										static $ExpectedResampledRate = array(
-												'phon+/lw/mw-eu/sw|16000' => 16000,
-												'mw-us|24000'             => 24000, // 3.95
-												'mw-us|32000'             => 32000, // 3.93
-												'mw-us|16000'             => 16000, // 3.92
-												'phone|16000'             => 16000,
-												'phone|11025'             => 11025, // 3.94a15
-												'radio|32000'             => 32000, // 3.94a15
-												'fm/radio|32000'          => 32000, // 3.92
-												'fm|32000'                => 32000, // 3.90
-												'voice|32000'             => 32000);
-										if (!isset($ExpectedResampledRate[$ExplodedOptions[1].'|'.$thisfile_mpeg_audio['sample_rate']])) {
-											$encoder_options .= ' --resample '.$thisfile_mpeg_audio['sample_rate'];
-										}
-										break;
-								}
-								break;
-
-							case '--r3mix':
-							default:
-								$encoder_options .= ' --resample '.$thisfile_mpeg_audio['sample_rate'];
-								break;
-						}
-						break;
-				}
-			}
-		}
-		if (empty($encoder_options) && !empty($info['audio']['bitrate']) && !empty($info['audio']['bitrate_mode'])) {
-			//$encoder_options = strtoupper($info['audio']['bitrate_mode']).ceil($info['audio']['bitrate'] / 1000);
-			$encoder_options = strtoupper($info['audio']['bitrate_mode']);
-		}
-
-		return $encoder_options;
-	}
-
-
-	function decodeMPEGaudioHeader($offset, &$info, $recursivesearch=true, $ScanAsCBR=false, $FastMPEGheaderScan=false) {
-		static $MPEGaudioVersionLookup;
-		static $MPEGaudioLayerLookup;
-		static $MPEGaudioBitrateLookup;
-		static $MPEGaudioFrequencyLookup;
-		static $MPEGaudioChannelModeLookup;
-		static $MPEGaudioModeExtensionLookup;
-		static $MPEGaudioEmphasisLookup;
-		if (empty($MPEGaudioVersionLookup)) {
-			$MPEGaudioVersionLookup       = getid3_mp3::MPEGaudioVersionArray();
-			$MPEGaudioLayerLookup         = getid3_mp3::MPEGaudioLayerArray();
-			$MPEGaudioBitrateLookup       = getid3_mp3::MPEGaudioBitrateArray();
-			$MPEGaudioFrequencyLookup     = getid3_mp3::MPEGaudioFrequencyArray();
-			$MPEGaudioChannelModeLookup   = getid3_mp3::MPEGaudioChannelModeArray();
-			$MPEGaudioModeExtensionLookup = getid3_mp3::MPEGaudioModeExtensionArray();
-			$MPEGaudioEmphasisLookup      = getid3_mp3::MPEGaudioEmphasisArray();
-		}
-
-		if (fseek($this->getid3->fp, $offset, SEEK_SET) != 0) {
-			$info['error'][] = 'decodeMPEGaudioHeader() failed to seek to next offset at '.$offset;
-			return false;
-		}
-		//$headerstring = fread($this->getid3->fp, 1441); // worst-case max length = 32kHz @ 320kbps layer 3 = 1441 bytes/frame
-		$headerstring = fread($this->getid3->fp, 226); // LAME header at offset 36 + 190 bytes of Xing/LAME data
-
-		// MP3 audio frame structure:
-		// $aa $aa $aa $aa [$bb $bb] $cc...
-		// where $aa..$aa is the four-byte mpeg-audio header (below)
-		// $bb $bb is the optional 2-byte CRC
-		// and $cc... is the audio data
-
-		$head4 = substr($headerstring, 0, 4);
-
-		static $MPEGaudioHeaderDecodeCache = array();
-		if (isset($MPEGaudioHeaderDecodeCache[$head4])) {
-			$MPEGheaderRawArray = $MPEGaudioHeaderDecodeCache[$head4];
-		} else {
-			$MPEGheaderRawArray = getid3_mp3::MPEGaudioHeaderDecode($head4);
-			$MPEGaudioHeaderDecodeCache[$head4] = $MPEGheaderRawArray;
-		}
-
-		static $MPEGaudioHeaderValidCache = array();
-		if (!isset($MPEGaudioHeaderValidCache[$head4])) { // Not in cache
-			//$MPEGaudioHeaderValidCache[$head4] = getid3_mp3::MPEGaudioHeaderValid($MPEGheaderRawArray, false, true);  // allow badly-formatted freeformat (from LAME 3.90 - 3.93.1)
-			$MPEGaudioHeaderValidCache[$head4] = getid3_mp3::MPEGaudioHeaderValid($MPEGheaderRawArray, false, false);
-		}
-
-		// shortcut
-		if (!isset($info['mpeg']['audio'])) {
-			$info['mpeg']['audio'] = array();
-		}
-		$thisfile_mpeg_audio = &$info['mpeg']['audio'];
-
-
-		if ($MPEGaudioHeaderValidCache[$head4]) {
-			$thisfile_mpeg_audio['raw'] = $MPEGheaderRawArray;
-		} else {
-			$info['error'][] = 'Invalid MPEG audio header ('.getid3_lib::PrintHexBytes($head4).') at offset '.$offset;
-			return false;
-		}
-
-		if (!$FastMPEGheaderScan) {
-			$thisfile_mpeg_audio['version']       = $MPEGaudioVersionLookup[$thisfile_mpeg_audio['raw']['version']];
-			$thisfile_mpeg_audio['layer']         = $MPEGaudioLayerLookup[$thisfile_mpeg_audio['raw']['layer']];
-
-			$thisfile_mpeg_audio['channelmode']   = $MPEGaudioChannelModeLookup[$thisfile_mpeg_audio['raw']['channelmode']];
-			$thisfile_mpeg_audio['channels']      = (($thisfile_mpeg_audio['channelmode'] == 'mono') ? 1 : 2);
-			$thisfile_mpeg_audio['sample_rate']   = $MPEGaudioFrequencyLookup[$thisfile_mpeg_audio['version']][$thisfile_mpeg_audio['raw']['sample_rate']];
-			$thisfile_mpeg_audio['protection']    = !$thisfile_mpeg_audio['raw']['protection'];
-			$thisfile_mpeg_audio['private']       = (bool) $thisfile_mpeg_audio['raw']['private'];
-			$thisfile_mpeg_audio['modeextension'] = $MPEGaudioModeExtensionLookup[$thisfile_mpeg_audio['layer']][$thisfile_mpeg_audio['raw']['modeextension']];
-			$thisfile_mpeg_audio['copyright']     = (bool) $thisfile_mpeg_audio['raw']['copyright'];
-			$thisfile_mpeg_audio['original']      = (bool) $thisfile_mpeg_audio['raw']['original'];
-			$thisfile_mpeg_audio['emphasis']      = $MPEGaudioEmphasisLookup[$thisfile_mpeg_audio['raw']['emphasis']];
-
-			$info['audio']['channels']    = $thisfile_mpeg_audio['channels'];
-			$info['audio']['sample_rate'] = $thisfile_mpeg_audio['sample_rate'];
-
-			if ($thisfile_mpeg_audio['protection']) {
-				$thisfile_mpeg_audio['crc'] = getid3_lib::BigEndian2Int(substr($headerstring, 4, 2));
-			}
-		}
-
-		if ($thisfile_mpeg_audio['raw']['bitrate'] == 15) {
-			// http://www.hydrogenaudio.org/?act=ST&f=16&t=9682&st=0
-			$info['warning'][] = 'Invalid bitrate index (15), this is a known bug in free-format MP3s encoded by LAME v3.90 - 3.93.1';
-			$thisfile_mpeg_audio['raw']['bitrate'] = 0;
-		}
-		$thisfile_mpeg_audio['padding'] = (bool) $thisfile_mpeg_audio['raw']['padding'];
-		$thisfile_mpeg_audio['bitrate'] = $MPEGaudioBitrateLookup[$thisfile_mpeg_audio['version']][$thisfile_mpeg_audio['layer']][$thisfile_mpeg_audio['raw']['bitrate']];
-
-		if (($thisfile_mpeg_audio['bitrate'] == 'free') && ($offset == $info['avdataoffset'])) {
-			// only skip multiple frame check if free-format bitstream found at beginning of file
-			// otherwise is quite possibly simply corrupted data
-			$recursivesearch = false;
-		}
-
-		// For Layer 2 there are some combinations of bitrate and mode which are not allowed.
-		if (!$FastMPEGheaderScan && ($thisfile_mpeg_audio['layer'] == '2')) {
-
-			$info['audio']['dataformat'] = 'mp2';
-			switch ($thisfile_mpeg_audio['channelmode']) {
-
-				case 'mono':
-					if (($thisfile_mpeg_audio['bitrate'] == 'free') || ($thisfile_mpeg_audio['bitrate'] <= 192000)) {
-						// these are ok
-					} else {
-						$info['error'][] = $thisfile_mpeg_audio['bitrate'].'kbps not allowed in Layer 2, '.$thisfile_mpeg_audio['channelmode'].'.';
-						return false;
-					}
-					break;
-
-				case 'stereo':
-				case 'joint stereo':
-				case 'dual channel':
-					if (($thisfile_mpeg_audio['bitrate'] == 'free') || ($thisfile_mpeg_audio['bitrate'] == 64000) || ($thisfile_mpeg_audio['bitrate'] >= 96000)) {
-						// these are ok
-					} else {
-						$info['error'][] = intval(round($thisfile_mpeg_audio['bitrate'] / 1000)).'kbps not allowed in Layer 2, '.$thisfile_mpeg_audio['channelmode'].'.';
-						return false;
-					}
-					break;
-
-			}
-
-		}
-
-
-		if ($info['audio']['sample_rate'] > 0) {
-			$thisfile_mpeg_audio['framelength'] = getid3_mp3::MPEGaudioFrameLength($thisfile_mpeg_audio['bitrate'], $thisfile_mpeg_audio['version'], $thisfile_mpeg_audio['layer'], (int) $thisfile_mpeg_audio['padding'], $info['audio']['sample_rate']);
-		}
-
-		$nextframetestoffset = $offset + 1;
-		if ($thisfile_mpeg_audio['bitrate'] != 'free') {
-
-			$info['audio']['bitrate'] = $thisfile_mpeg_audio['bitrate'];
-
-			if (isset($thisfile_mpeg_audio['framelength'])) {
-				$nextframetestoffset = $offset + $thisfile_mpeg_audio['framelength'];
-			} else {
-				$info['error'][] = 'Frame at offset('.$offset.') is has an invalid frame length.';
-				return false;
-			}
-
-		}
-
-		$ExpectedNumberOfAudioBytes = 0;
-
-		////////////////////////////////////////////////////////////////////////////////////
-		// Variable-bitrate headers
-
-		if (substr($headerstring, 4 + 32, 4) == 'VBRI') {
-			// Fraunhofer VBR header is hardcoded 'VBRI' at offset 0x24 (36)
-			// specs taken from http://minnie.tuhs.org/pipermail/mp3encoder/2001-January/001800.html
-
-			$thisfile_mpeg_audio['bitrate_mode'] = 'vbr';
-			$thisfile_mpeg_audio['VBR_method']   = 'Fraunhofer';
-			$info['audio']['codec']                = 'Fraunhofer';
-
-			$SideInfoData = substr($headerstring, 4 + 2, 32);
-
-			$FraunhoferVBROffset = 36;
-
-			$thisfile_mpeg_audio['VBR_encoder_version']     = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset +  4, 2)); // VbriVersion
-			$thisfile_mpeg_audio['VBR_encoder_delay']       = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset +  6, 2)); // VbriDelay
-			$thisfile_mpeg_audio['VBR_quality']             = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset +  8, 2)); // VbriQuality
-			$thisfile_mpeg_audio['VBR_bytes']               = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 10, 4)); // VbriStreamBytes
-			$thisfile_mpeg_audio['VBR_frames']              = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 14, 4)); // VbriStreamFrames
-			$thisfile_mpeg_audio['VBR_seek_offsets']        = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 18, 2)); // VbriTableSize
-			$thisfile_mpeg_audio['VBR_seek_scale']          = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 20, 2)); // VbriTableScale
-			$thisfile_mpeg_audio['VBR_entry_bytes']         = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 22, 2)); // VbriEntryBytes
-			$thisfile_mpeg_audio['VBR_entry_frames']        = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 24, 2)); // VbriEntryFrames
-
-			$ExpectedNumberOfAudioBytes = $thisfile_mpeg_audio['VBR_bytes'];
-
-			$previousbyteoffset = $offset;
-			for ($i = 0; $i < $thisfile_mpeg_audio['VBR_seek_offsets']; $i++) {
-				$Fraunhofer_OffsetN = getid3_lib::BigEndian2Int(substr($headerstring, $FraunhoferVBROffset, $thisfile_mpeg_audio['VBR_entry_bytes']));
-				$FraunhoferVBROffset += $thisfile_mpeg_audio['VBR_entry_bytes'];
-				$thisfile_mpeg_audio['VBR_offsets_relative'][$i] = ($Fraunhofer_OffsetN * $thisfile_mpeg_audio['VBR_seek_scale']);
-				$thisfile_mpeg_audio['VBR_offsets_absolute'][$i] = ($Fraunhofer_OffsetN * $thisfile_mpeg_audio['VBR_seek_scale']) + $previousbyteoffset;
-				$previousbyteoffset += $Fraunhofer_OffsetN;
-			}
-
-
-		} else {
-
-			// Xing VBR header is hardcoded 'Xing' at a offset 0x0D (13), 0x15 (21) or 0x24 (36)
-			// depending on MPEG layer and number of channels
-
-			$VBRidOffset = getid3_mp3::XingVBRidOffset($thisfile_mpeg_audio['version'], $thisfile_mpeg_audio['channelmode']);
-			$SideInfoData = substr($headerstring, 4 + 2, $VBRidOffset - 4);
-
-			if ((substr($headerstring, $VBRidOffset, strlen('Xing')) == 'Xing') || (substr($headerstring, $VBRidOffset, strlen('Info')) == 'Info')) {
-				// 'Xing' is traditional Xing VBR frame
-				// 'Info' is LAME-encoded CBR (This was done to avoid CBR files to be recognized as traditional Xing VBR files by some decoders.)
-				// 'Info' *can* legally be used to specify a VBR file as well, however.
-
-				// http://www.multiweb.cz/twoinches/MP3inside.htm
-				//00..03 = "Xing" or "Info"
-				//04..07 = Flags:
-				//  0x01  Frames Flag     set if value for number of frames in file is stored
-				//  0x02  Bytes Flag      set if value for filesize in bytes is stored
-				//  0x04  TOC Flag        set if values for TOC are stored
-				//  0x08  VBR Scale Flag  set if values for VBR scale is stored
-				//08..11  Frames: Number of frames in file (including the first Xing/Info one)
-				//12..15  Bytes:  File length in Bytes
-				//16..115  TOC (Table of Contents):
-				//  Contains of 100 indexes (one Byte length) for easier lookup in file. Approximately solves problem with moving inside file.
-				//  Each Byte has a value according this formula:
-				//  (TOC[i] / 256) * fileLenInBytes
-				//  So if song lasts eg. 240 sec. and you want to jump to 60. sec. (and file is 5 000 000 Bytes length) you can use:
-				//  TOC[(60/240)*100] = TOC[25]
-				//  and corresponding Byte in file is then approximately at:
-				//  (TOC[25]/256) * 5000000
-				//116..119  VBR Scale
-
-
-				// should be safe to leave this at 'vbr' and let it be overriden to 'cbr' if a CBR preset/mode is used by LAME
-//				if (substr($headerstring, $VBRidOffset, strlen('Info')) == 'Xing') {
-					$thisfile_mpeg_audio['bitrate_mode'] = 'vbr';
-					$thisfile_mpeg_audio['VBR_method']   = 'Xing';
-//				} else {
-//					$ScanAsCBR = true;
-//					$thisfile_mpeg_audio['bitrate_mode'] = 'cbr';
-//				}
-
-				$thisfile_mpeg_audio['xing_flags_raw'] = getid3_lib::BigEndian2Int(substr($headerstring, $VBRidOffset + 4, 4));
-
-				$thisfile_mpeg_audio['xing_flags']['frames']    = (bool) ($thisfile_mpeg_audio['xing_flags_raw'] & 0x00000001);
-				$thisfile_mpeg_audio['xing_flags']['bytes']     = (bool) ($thisfile_mpeg_audio['xing_flags_raw'] & 0x00000002);
-				$thisfile_mpeg_audio['xing_flags']['toc']       = (bool) ($thisfile_mpeg_audio['xing_flags_raw'] & 0x00000004);
-				$thisfile_mpeg_audio['xing_flags']['vbr_scale'] = (bool) ($thisfile_mpeg_audio['xing_flags_raw'] & 0x00000008);
-
-				if ($thisfile_mpeg_audio['xing_flags']['frames']) {
-					$thisfile_mpeg_audio['VBR_frames'] = getid3_lib::BigEndian2Int(substr($headerstring, $VBRidOffset +  8, 4));
-					//$thisfile_mpeg_audio['VBR_frames']--; // don't count header Xing/Info frame
-				}
-				if ($thisfile_mpeg_audio['xing_flags']['bytes']) {
-					$thisfile_mpeg_audio['VBR_bytes']  = getid3_lib::BigEndian2Int(substr($headerstring, $VBRidOffset + 12, 4));
-				}
-
-				//if (($thisfile_mpeg_audio['bitrate'] == 'free') && !empty($thisfile_mpeg_audio['VBR_frames']) && !empty($thisfile_mpeg_audio['VBR_bytes'])) {
-				if (!empty($thisfile_mpeg_audio['VBR_frames']) && !empty($thisfile_mpeg_audio['VBR_bytes'])) {
-
-					$framelengthfloat = $thisfile_mpeg_audio['VBR_bytes'] / $thisfile_mpeg_audio['VBR_frames'];
-
-					if ($thisfile_mpeg_audio['layer'] == '1') {
-						// BitRate = (((FrameLengthInBytes / 4) - Padding) * SampleRate) / 12
-						//$info['audio']['bitrate'] = ((($framelengthfloat / 4) - intval($thisfile_mpeg_audio['padding'])) * $thisfile_mpeg_audio['sample_rate']) / 12;
-						$info['audio']['bitrate'] = ($framelengthfloat / 4) * $thisfile_mpeg_audio['sample_rate'] * (2 / $info['audio']['channels']) / 12;
-					} else {
-						// Bitrate = ((FrameLengthInBytes - Padding) * SampleRate) / 144
-						//$info['audio']['bitrate'] = (($framelengthfloat - intval($thisfile_mpeg_audio['padding'])) * $thisfile_mpeg_audio['sample_rate']) / 144;
-						$info['audio']['bitrate'] = $framelengthfloat * $thisfile_mpeg_audio['sample_rate'] * (2 / $info['audio']['channels']) / 144;
-					}
-					$thisfile_mpeg_audio['framelength'] = floor($framelengthfloat);
-				}
-
-				if ($thisfile_mpeg_audio['xing_flags']['toc']) {
-					$LAMEtocData = substr($headerstring, $VBRidOffset + 16, 100);
-					for ($i = 0; $i < 100; $i++) {
-						$thisfile_mpeg_audio['toc'][$i] = ord($LAMEtocData{$i});
-					}
-				}
-				if ($thisfile_mpeg_audio['xing_flags']['vbr_scale']) {
-					$thisfile_mpeg_audio['VBR_scale'] = getid3_lib::BigEndian2Int(substr($headerstring, $VBRidOffset + 116, 4));
-				}
-
-
-				// http://gabriel.mp3-tech.org/mp3infotag.html
-				if (substr($headerstring, $VBRidOffset + 120, 4) == 'LAME') {
-
-					// shortcut
-					$thisfile_mpeg_audio['LAME'] = array();
-					$thisfile_mpeg_audio_lame    = &$thisfile_mpeg_audio['LAME'];
-
-
-					$thisfile_mpeg_audio_lame['long_version']  = substr($headerstring, $VBRidOffset + 120, 20);
-					$thisfile_mpeg_audio_lame['short_version'] = substr($thisfile_mpeg_audio_lame['long_version'], 0, 9);
-
-					if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.90') {
-
-						// extra 11 chars are not part of version string when LAMEtag present
-						unset($thisfile_mpeg_audio_lame['long_version']);
-
-						// It the LAME tag was only introduced in LAME v3.90
-						// http://www.hydrogenaudio.org/?act=ST&f=15&t=9933
-
-						// Offsets of various bytes in http://gabriel.mp3-tech.org/mp3infotag.html
-						// are assuming a 'Xing' identifier offset of 0x24, which is the case for
-						// MPEG-1 non-mono, but not for other combinations
-						$LAMEtagOffsetContant = $VBRidOffset - 0x24;
-
-						// shortcuts
-						$thisfile_mpeg_audio_lame['RGAD']    = array('track'=>array(), 'album'=>array());
-						$thisfile_mpeg_audio_lame_RGAD       = &$thisfile_mpeg_audio_lame['RGAD'];
-						$thisfile_mpeg_audio_lame_RGAD_track = &$thisfile_mpeg_audio_lame_RGAD['track'];
-						$thisfile_mpeg_audio_lame_RGAD_album = &$thisfile_mpeg_audio_lame_RGAD['album'];
-						$thisfile_mpeg_audio_lame['raw'] = array();
-						$thisfile_mpeg_audio_lame_raw    = &$thisfile_mpeg_audio_lame['raw'];
-
-						// byte $9B  VBR Quality
-						// This field is there to indicate a quality level, although the scale was not precised in the original Xing specifications.
-						// Actually overwrites original Xing bytes
-						unset($thisfile_mpeg_audio['VBR_scale']);
-						$thisfile_mpeg_audio_lame['vbr_quality'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0x9B, 1));
-
-						// bytes $9C-$A4  Encoder short VersionString
-						$thisfile_mpeg_audio_lame['short_version'] = substr($headerstring, $LAMEtagOffsetContant + 0x9C, 9);
-
-						// byte $A5  Info Tag revision + VBR method
-						$LAMEtagRevisionVBRmethod = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA5, 1));
-
-						$thisfile_mpeg_audio_lame['tag_revision']   = ($LAMEtagRevisionVBRmethod & 0xF0) >> 4;
-						$thisfile_mpeg_audio_lame_raw['vbr_method'] =  $LAMEtagRevisionVBRmethod & 0x0F;
-						$thisfile_mpeg_audio_lame['vbr_method']     = getid3_mp3::LAMEvbrMethodLookup($thisfile_mpeg_audio_lame_raw['vbr_method']);
-						$thisfile_mpeg_audio['bitrate_mode']        = substr($thisfile_mpeg_audio_lame['vbr_method'], 0, 3); // usually either 'cbr' or 'vbr', but truncates 'vbr-old / vbr-rh' to 'vbr'
-
-						// byte $A6  Lowpass filter value
-						$thisfile_mpeg_audio_lame['lowpass_frequency'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA6, 1)) * 100;
-
-						// bytes $A7-$AE  Replay Gain
-						// http://privatewww.essex.ac.uk/~djmrob/replaygain/rg_data_format.html
-						// bytes $A7-$AA : 32 bit floating point "Peak signal amplitude"
-						if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.94b') {
-							// LAME 3.94a16 and later - 9.23 fixed point
-							// ie 0x0059E2EE / (2^23) = 5890798 / 8388608 = 0.7022378444671630859375
-							$thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] = (float) ((getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA7, 4))) / 8388608);
-						} else {
-							// LAME 3.94a15 and earlier - 32-bit floating point
-							// Actually 3.94a16 will fall in here too and be WRONG, but is hard to detect 3.94a16 vs 3.94a15
-							$thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] = getid3_lib::LittleEndian2Float(substr($headerstring, $LAMEtagOffsetContant + 0xA7, 4));
-						}
-						if ($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'] == 0) {
-							unset($thisfile_mpeg_audio_lame_RGAD['peak_amplitude']);
-						} else {
-							$thisfile_mpeg_audio_lame_RGAD['peak_db'] = getid3_lib::RGADamplitude2dB($thisfile_mpeg_audio_lame_RGAD['peak_amplitude']);
-						}
-
-						$thisfile_mpeg_audio_lame_raw['RGAD_track']      =   getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAB, 2));
-						$thisfile_mpeg_audio_lame_raw['RGAD_album']      =   getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAD, 2));
-
-
-						if ($thisfile_mpeg_audio_lame_raw['RGAD_track'] != 0) {
-
-							$thisfile_mpeg_audio_lame_RGAD_track['raw']['name']        = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0xE000) >> 13;
-							$thisfile_mpeg_audio_lame_RGAD_track['raw']['originator']  = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x1C00) >> 10;
-							$thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit']    = ($thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x0200) >> 9;
-							$thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'] =  $thisfile_mpeg_audio_lame_raw['RGAD_track'] & 0x01FF;
-							$thisfile_mpeg_audio_lame_RGAD_track['name']       = getid3_lib::RGADnameLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['name']);
-							$thisfile_mpeg_audio_lame_RGAD_track['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['originator']);
-							$thisfile_mpeg_audio_lame_RGAD_track['gain_db']    = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit']);
-
-							if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
-								$info['replay_gain']['track']['peak']   = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
-							}
-							$info['replay_gain']['track']['originator'] = $thisfile_mpeg_audio_lame_RGAD_track['originator'];
-							$info['replay_gain']['track']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_track['gain_db'];
-						} else {
-							unset($thisfile_mpeg_audio_lame_RGAD['track']);
-						}
-						if ($thisfile_mpeg_audio_lame_raw['RGAD_album'] != 0) {
-
-							$thisfile_mpeg_audio_lame_RGAD_album['raw']['name']        = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0xE000) >> 13;
-							$thisfile_mpeg_audio_lame_RGAD_album['raw']['originator']  = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x1C00) >> 10;
-							$thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit']    = ($thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x0200) >> 9;
-							$thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'] = $thisfile_mpeg_audio_lame_raw['RGAD_album'] & 0x01FF;
-							$thisfile_mpeg_audio_lame_RGAD_album['name']       = getid3_lib::RGADnameLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['name']);
-							$thisfile_mpeg_audio_lame_RGAD_album['originator'] = getid3_lib::RGADoriginatorLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['originator']);
-							$thisfile_mpeg_audio_lame_RGAD_album['gain_db']    = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit']);
-
-							if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
-								$info['replay_gain']['album']['peak']   = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
-							}
-							$info['replay_gain']['album']['originator'] = $thisfile_mpeg_audio_lame_RGAD_album['originator'];
-							$info['replay_gain']['album']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_album['gain_db'];
-						} else {
-							unset($thisfile_mpeg_audio_lame_RGAD['album']);
-						}
-						if (empty($thisfile_mpeg_audio_lame_RGAD)) {
-							unset($thisfile_mpeg_audio_lame['RGAD']);
-						}
-
-
-						// byte $AF  Encoding flags + ATH Type
-						$EncodingFlagsATHtype = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAF, 1));
-						$thisfile_mpeg_audio_lame['encoding_flags']['nspsytune']   = (bool) ($EncodingFlagsATHtype & 0x10);
-						$thisfile_mpeg_audio_lame['encoding_flags']['nssafejoint'] = (bool) ($EncodingFlagsATHtype & 0x20);
-						$thisfile_mpeg_audio_lame['encoding_flags']['nogap_next']  = (bool) ($EncodingFlagsATHtype & 0x40);
-						$thisfile_mpeg_audio_lame['encoding_flags']['nogap_prev']  = (bool) ($EncodingFlagsATHtype & 0x80);
-						$thisfile_mpeg_audio_lame['ath_type']                      =         $EncodingFlagsATHtype & 0x0F;
-
-						// byte $B0  if ABR {specified bitrate} else {minimal bitrate}
-						$thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB0, 1));
-						if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 2) { // Average BitRate (ABR)
-							$thisfile_mpeg_audio_lame['bitrate_abr'] = $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'];
-						} elseif ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) { // Constant BitRate (CBR)
-							// ignore
-						} elseif ($thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'] > 0) { // Variable BitRate (VBR) - minimum bitrate
-							$thisfile_mpeg_audio_lame['bitrate_min'] = $thisfile_mpeg_audio_lame['raw']['abrbitrate_minbitrate'];
-						}
-
-						// bytes $B1-$B3  Encoder delays
-						$EncoderDelays = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB1, 3));
-						$thisfile_mpeg_audio_lame['encoder_delay'] = ($EncoderDelays & 0xFFF000) >> 12;
-						$thisfile_mpeg_audio_lame['end_padding']   =  $EncoderDelays & 0x000FFF;
-
-						// byte $B4  Misc
-						$MiscByte = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB4, 1));
-						$thisfile_mpeg_audio_lame_raw['noise_shaping']       = ($MiscByte & 0x03);
-						$thisfile_mpeg_audio_lame_raw['stereo_mode']         = ($MiscByte & 0x1C) >> 2;
-						$thisfile_mpeg_audio_lame_raw['not_optimal_quality'] = ($MiscByte & 0x20) >> 5;
-						$thisfile_mpeg_audio_lame_raw['source_sample_freq']  = ($MiscByte & 0xC0) >> 6;
-						$thisfile_mpeg_audio_lame['noise_shaping']       = $thisfile_mpeg_audio_lame_raw['noise_shaping'];
-						$thisfile_mpeg_audio_lame['stereo_mode']         = getid3_mp3::LAMEmiscStereoModeLookup($thisfile_mpeg_audio_lame_raw['stereo_mode']);
-						$thisfile_mpeg_audio_lame['not_optimal_quality'] = (bool) $thisfile_mpeg_audio_lame_raw['not_optimal_quality'];
-						$thisfile_mpeg_audio_lame['source_sample_freq']  = getid3_mp3::LAMEmiscSourceSampleFrequencyLookup($thisfile_mpeg_audio_lame_raw['source_sample_freq']);
-
-						// byte $B5  MP3 Gain
-						$thisfile_mpeg_audio_lame_raw['mp3_gain'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB5, 1), false, true);
-						$thisfile_mpeg_audio_lame['mp3_gain_db']     = (getid3_lib::RGADamplitude2dB(2) / 4) * $thisfile_mpeg_audio_lame_raw['mp3_gain'];
-						$thisfile_mpeg_audio_lame['mp3_gain_factor'] = pow(2, ($thisfile_mpeg_audio_lame['mp3_gain_db'] / 6));
-
-						// bytes $B6-$B7  Preset and surround info
-						$PresetSurroundBytes = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB6, 2));
-						// Reserved                                                    = ($PresetSurroundBytes & 0xC000);
-						$thisfile_mpeg_audio_lame_raw['surround_info'] = ($PresetSurroundBytes & 0x3800);
-						$thisfile_mpeg_audio_lame['surround_info']     = getid3_mp3::LAMEsurroundInfoLookup($thisfile_mpeg_audio_lame_raw['surround_info']);
-						$thisfile_mpeg_audio_lame['preset_used_id']    = ($PresetSurroundBytes & 0x07FF);
-						$thisfile_mpeg_audio_lame['preset_used']       = getid3_mp3::LAMEpresetUsedLookup($thisfile_mpeg_audio_lame);
-						if (!empty($thisfile_mpeg_audio_lame['preset_used_id']) && empty($thisfile_mpeg_audio_lame['preset_used'])) {
-							$info['warning'][] = 'Unknown LAME preset used ('.$thisfile_mpeg_audio_lame['preset_used_id'].') - please report to info@getid3.org';
-						}
-						if (($thisfile_mpeg_audio_lame['short_version'] == 'LAME3.90.') && !empty($thisfile_mpeg_audio_lame['preset_used_id'])) {
-							// this may change if 3.90.4 ever comes out
-							$thisfile_mpeg_audio_lame['short_version'] = 'LAME3.90.3';
-						}
-
-						// bytes $B8-$BB  MusicLength
-						$thisfile_mpeg_audio_lame['audio_bytes'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB8, 4));
-						$ExpectedNumberOfAudioBytes = (($thisfile_mpeg_audio_lame['audio_bytes'] > 0) ? $thisfile_mpeg_audio_lame['audio_bytes'] : $thisfile_mpeg_audio['VBR_bytes']);
-
-						// bytes $BC-$BD  MusicCRC
-						$thisfile_mpeg_audio_lame['music_crc']    = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBC, 2));
-
-						// bytes $BE-$BF  CRC-16 of Info Tag
-						$thisfile_mpeg_audio_lame['lame_tag_crc'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBE, 2));
-
-
-						// LAME CBR
-						if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) {
-
-							$thisfile_mpeg_audio['bitrate_mode'] = 'cbr';
-							$thisfile_mpeg_audio['bitrate'] = getid3_mp3::ClosestStandardMP3Bitrate($thisfile_mpeg_audio['bitrate']);
-							$info['audio']['bitrate'] = $thisfile_mpeg_audio['bitrate'];
-							//if (empty($thisfile_mpeg_audio['bitrate']) || (!empty($thisfile_mpeg_audio_lame['bitrate_min']) && ($thisfile_mpeg_audio_lame['bitrate_min'] != 255))) {
-							//	$thisfile_mpeg_audio['bitrate'] = $thisfile_mpeg_audio_lame['bitrate_min'];
-							//}
-
-						}
-
-					}
-				}
-
-			} else {
-
-				// not Fraunhofer or Xing VBR methods, most likely CBR (but could be VBR with no header)
-				$thisfile_mpeg_audio['bitrate_mode'] = 'cbr';
-				if ($recursivesearch) {
-					$thisfile_mpeg_audio['bitrate_mode'] = 'vbr';
-					if ($this->RecursiveFrameScanning($offset, $nextframetestoffset, true)) {
-						$recursivesearch = false;
-						$thisfile_mpeg_audio['bitrate_mode'] = 'cbr';
-					}
-					if ($thisfile_mpeg_audio['bitrate_mode'] == 'vbr') {
-						$info['warning'][] = 'VBR file with no VBR header. Bitrate values calculated from actual frame bitrates.';
-					}
-				}
-
-			}
-
-		}
-
-		if (($ExpectedNumberOfAudioBytes > 0) && ($ExpectedNumberOfAudioBytes != ($info['avdataend'] - $info['avdataoffset']))) {
-			if ($ExpectedNumberOfAudioBytes > ($info['avdataend'] - $info['avdataoffset'])) {
-				if (isset($info['fileformat']) && ($info['fileformat'] == 'riff')) {
-					// ignore, audio data is broken into chunks so will always be data "missing"
-				} elseif (($ExpectedNumberOfAudioBytes - ($info['avdataend'] - $info['avdataoffset'])) == 1) {
-					$info['warning'][] = 'Last byte of data truncated (this is a known bug in Meracl ID3 Tag Writer before v1.3.5)';
-				} else {
-					$info['warning'][] = 'Probable truncated file: expecting '.$ExpectedNumberOfAudioBytes.' bytes of audio data, only found '.($info['avdataend'] - $info['avdataoffset']).' (short by '.($ExpectedNumberOfAudioBytes - ($info['avdataend'] - $info['avdataoffset'])).' bytes)';
-				}
-			} else {
-				if ((($info['avdataend'] - $info['avdataoffset']) - $ExpectedNumberOfAudioBytes) == 1) {
-				//	$prenullbytefileoffset = ftell($this->getid3->fp);
-				//	fseek($this->getid3->fp, $info['avdataend'], SEEK_SET);
-				//	$PossibleNullByte = fread($this->getid3->fp, 1);
-				//	fseek($this->getid3->fp, $prenullbytefileoffset, SEEK_SET);
-				//	if ($PossibleNullByte === "\x00") {
-						$info['avdataend']--;
-				//		$info['warning'][] = 'Extra null byte at end of MP3 data assumed to be RIFF padding and therefore ignored';
-				//	} else {
-				//		$info['warning'][] = 'Too much data in file: expecting '.$ExpectedNumberOfAudioBytes.' bytes of audio data, found '.($info['avdataend'] - $info['avdataoffset']).' ('.(($info['avdataend'] - $info['avdataoffset']) - $ExpectedNumberOfAudioBytes).' bytes too many)';
-				//	}
-				} else {
-					$info['warning'][] = 'Too much data in file: expecting '.$ExpectedNumberOfAudioBytes.' bytes of audio data, found '.($info['avdataend'] - $info['avdataoffset']).' ('.(($info['avdataend'] - $info['avdataoffset']) - $ExpectedNumberOfAudioBytes).' bytes too many)';
-				}
-			}
-		}
-
-		if (($thisfile_mpeg_audio['bitrate'] == 'free') && empty($info['audio']['bitrate'])) {
-			if (($offset == $info['avdataoffset']) && empty($thisfile_mpeg_audio['VBR_frames'])) {
-				$framebytelength = $this->FreeFormatFrameLength($offset, true);
-				if ($framebytelength > 0) {
-					$thisfile_mpeg_audio['framelength'] = $framebytelength;
-					if ($thisfile_mpeg_audio['layer'] == '1') {
-						// BitRate = (((FrameLengthInBytes / 4) - Padding) * SampleRate) / 12
-						$info['audio']['bitrate'] = ((($framebytelength / 4) - intval($thisfile_mpeg_audio['padding'])) * $thisfile_mpeg_audio['sample_rate']) / 12;
-					} else {
-						// Bitrate = ((FrameLengthInBytes - Padding) * SampleRate) / 144
-						$info['audio']['bitrate'] = (($framebytelength - intval($thisfile_mpeg_audio['padding'])) * $thisfile_mpeg_audio['sample_rate']) / 144;
-					}
-				} else {
-					$info['error'][] = 'Error calculating frame length of free-format MP3 without Xing/LAME header';
-				}
-			}
-		}
-
-		if (isset($thisfile_mpeg_audio['VBR_frames']) ? $thisfile_mpeg_audio['VBR_frames'] : '') {
-			switch ($thisfile_mpeg_audio['bitrate_mode']) {
-				case 'vbr':
-				case 'abr':
-					$bytes_per_frame = 1152;
-					if (($thisfile_mpeg_audio['version'] == '1') && ($thisfile_mpeg_audio['layer'] == 1)) {
-						$bytes_per_frame = 384;
-					} elseif ((($thisfile_mpeg_audio['version'] == '2') || ($thisfile_mpeg_audio['version'] == '2.5')) && ($thisfile_mpeg_audio['layer'] == 3)) {
-						$bytes_per_frame = 576;
-					}
-					$thisfile_mpeg_audio['VBR_bitrate'] = (isset($thisfile_mpeg_audio['VBR_bytes']) ? (($thisfile_mpeg_audio['VBR_bytes'] / $thisfile_mpeg_audio['VBR_frames']) * 8) * ($info['audio']['sample_rate'] / $bytes_per_frame) : 0);
-					if ($thisfile_mpeg_audio['VBR_bitrate'] > 0) {
-						$info['audio']['bitrate']         = $thisfile_mpeg_audio['VBR_bitrate'];
-						$thisfile_mpeg_audio['bitrate'] = $thisfile_mpeg_audio['VBR_bitrate']; // to avoid confusion
-					}
-					break;
-			}
-		}
-
-		// End variable-bitrate headers
-		////////////////////////////////////////////////////////////////////////////////////
-
-		if ($recursivesearch) {
-
-			if (!$this->RecursiveFrameScanning($offset, $nextframetestoffset, $ScanAsCBR)) {
-				return false;
-			}
-
-		}
-
-
-		//if (false) {
-		//    // experimental side info parsing section - not returning anything useful yet
-		//
-		//    $SideInfoBitstream = getid3_lib::BigEndian2Bin($SideInfoData);
-		//    $SideInfoOffset = 0;
-		//
-		//    if ($thisfile_mpeg_audio['version'] == '1') {
-		//        if ($thisfile_mpeg_audio['channelmode'] == 'mono') {
-		//            // MPEG-1 (mono)
-		//            $thisfile_mpeg_audio['side_info']['main_data_begin'] = substr($SideInfoBitstream, $SideInfoOffset, 9);
-		//            $SideInfoOffset += 9;
-		//            $SideInfoOffset += 5;
-		//        } else {
-		//            // MPEG-1 (stereo, joint-stereo, dual-channel)
-		//            $thisfile_mpeg_audio['side_info']['main_data_begin'] = substr($SideInfoBitstream, $SideInfoOffset, 9);
-		//            $SideInfoOffset += 9;
-		//            $SideInfoOffset += 3;
-		//        }
-		//    } else { // 2 or 2.5
-		//        if ($thisfile_mpeg_audio['channelmode'] == 'mono') {
-		//            // MPEG-2, MPEG-2.5 (mono)
-		//            $thisfile_mpeg_audio['side_info']['main_data_begin'] = substr($SideInfoBitstream, $SideInfoOffset, 8);
-		//            $SideInfoOffset += 8;
-		//            $SideInfoOffset += 1;
-		//        } else {
-		//            // MPEG-2, MPEG-2.5 (stereo, joint-stereo, dual-channel)
-		//            $thisfile_mpeg_audio['side_info']['main_data_begin'] = substr($SideInfoBitstream, $SideInfoOffset, 8);
-		//            $SideInfoOffset += 8;
-		//            $SideInfoOffset += 2;
-		//        }
-		//    }
-		//
-		//    if ($thisfile_mpeg_audio['version'] == '1') {
-		//        for ($channel = 0; $channel < $info['audio']['channels']; $channel++) {
-		//            for ($scfsi_band = 0; $scfsi_band < 4; $scfsi_band++) {
-		//                $thisfile_mpeg_audio['scfsi'][$channel][$scfsi_band] = substr($SideInfoBitstream, $SideInfoOffset, 1);
-		//                $SideInfoOffset += 2;
-		//            }
-		//        }
-		//    }
-		//    for ($granule = 0; $granule < (($thisfile_mpeg_audio['version'] == '1') ? 2 : 1); $granule++) {
-		//        for ($channel = 0; $channel < $info['audio']['channels']; $channel++) {
-		//            $thisfile_mpeg_audio['part2_3_length'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 12);
-		//            $SideInfoOffset += 12;
-		//            $thisfile_mpeg_audio['big_values'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 9);
-		//            $SideInfoOffset += 9;
-		//            $thisfile_mpeg_audio['global_gain'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 8);
-		//            $SideInfoOffset += 8;
-		//            if ($thisfile_mpeg_audio['version'] == '1') {
-		//                $thisfile_mpeg_audio['scalefac_compress'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 4);
-		//                $SideInfoOffset += 4;
-		//            } else {
-		//                $thisfile_mpeg_audio['scalefac_compress'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 9);
-		//                $SideInfoOffset += 9;
-		//            }
-		//            $thisfile_mpeg_audio['window_switching_flag'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 1);
-		//            $SideInfoOffset += 1;
-		//
-		//            if ($thisfile_mpeg_audio['window_switching_flag'][$granule][$channel] == '1') {
-		//
-		//                $thisfile_mpeg_audio['block_type'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 2);
-		//                $SideInfoOffset += 2;
-		//                $thisfile_mpeg_audio['mixed_block_flag'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 1);
-		//                $SideInfoOffset += 1;
-		//
-		//                for ($region = 0; $region < 2; $region++) {
-		//                    $thisfile_mpeg_audio['table_select'][$granule][$channel][$region] = substr($SideInfoBitstream, $SideInfoOffset, 5);
-		//                    $SideInfoOffset += 5;
-		//                }
-		//                $thisfile_mpeg_audio['table_select'][$granule][$channel][2] = 0;
-		//
-		//                for ($window = 0; $window < 3; $window++) {
-		//                    $thisfile_mpeg_audio['subblock_gain'][$granule][$channel][$window] = substr($SideInfoBitstream, $SideInfoOffset, 3);
-		//                    $SideInfoOffset += 3;
-		//                }
-		//
-		//            } else {
-		//
-		//                for ($region = 0; $region < 3; $region++) {
-		//                    $thisfile_mpeg_audio['table_select'][$granule][$channel][$region] = substr($SideInfoBitstream, $SideInfoOffset, 5);
-		//                    $SideInfoOffset += 5;
-		//                }
-		//
-		//                $thisfile_mpeg_audio['region0_count'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 4);
-		//                $SideInfoOffset += 4;
-		//                $thisfile_mpeg_audio['region1_count'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 3);
-		//                $SideInfoOffset += 3;
-		//                $thisfile_mpeg_audio['block_type'][$granule][$channel] = 0;
-		//            }
-		//
-		//            if ($thisfile_mpeg_audio['version'] == '1') {
-		//                $thisfile_mpeg_audio['preflag'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 1);
-		//                $SideInfoOffset += 1;
-		//            }
-		//            $thisfile_mpeg_audio['scalefac_scale'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 1);
-		//            $SideInfoOffset += 1;
-		//            $thisfile_mpeg_audio['count1table_select'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 1);
-		//            $SideInfoOffset += 1;
-		//        }
-		//    }
-		//}
-
-		return true;
-	}
-
-	function RecursiveFrameScanning(&$offset, &$nextframetestoffset, $ScanAsCBR) {
-		$info = &$this->getid3->info;
-		$firstframetestarray = array('error'=>'', 'warning'=>'', 'avdataend'=>$info['avdataend'], 'avdataoffset'=>$info['avdataoffset']);
-		$this->decodeMPEGaudioHeader($offset, $firstframetestarray, false);
-
-		for ($i = 0; $i < GETID3_MP3_VALID_CHECK_FRAMES; $i++) {
-			// check next GETID3_MP3_VALID_CHECK_FRAMES frames for validity, to make sure we haven't run across a false synch
-			if (($nextframetestoffset + 4) >= $info['avdataend']) {
-				// end of file
-				return true;
-			}
-
-			$nextframetestarray = array('error'=>'', 'warning'=>'', 'avdataend'=>$info['avdataend'], 'avdataoffset'=>$info['avdataoffset']);
-			if ($this->decodeMPEGaudioHeader($nextframetestoffset, $nextframetestarray, false)) {
-				if ($ScanAsCBR) {
-					// force CBR mode, used for trying to pick out invalid audio streams with valid(?) VBR headers, or VBR streams with no VBR header
-					if (!isset($nextframetestarray['mpeg']['audio']['bitrate']) || !isset($firstframetestarray['mpeg']['audio']['bitrate']) || ($nextframetestarray['mpeg']['audio']['bitrate'] != $firstframetestarray['mpeg']['audio']['bitrate'])) {
-						return false;
-					}
-				}
-
-
-				// next frame is OK, get ready to check the one after that
-				if (isset($nextframetestarray['mpeg']['audio']['framelength']) && ($nextframetestarray['mpeg']['audio']['framelength'] > 0)) {
-					$nextframetestoffset += $nextframetestarray['mpeg']['audio']['framelength'];
-				} else {
-					$info['error'][] = 'Frame at offset ('.$offset.') is has an invalid frame length.';
-					return false;
-				}
-
-			} elseif (!empty($firstframetestarray['mpeg']['audio']['framelength']) && (($nextframetestoffset + $firstframetestarray['mpeg']['audio']['framelength']) > $info['avdataend'])) {
-
-				// it's not the end of the file, but there's not enough data left for another frame, so assume it's garbage/padding and return OK
-				return true;
-
-			} else {
-
-				// next frame is not valid, note the error and fail, so scanning can contiue for a valid frame sequence
-				$info['warning'][] = 'Frame at offset ('.$offset.') is valid, but the next one at ('.$nextframetestoffset.') is not.';
-
-				return false;
-			}
-		}
-		return true;
-	}
-
-	function FreeFormatFrameLength($offset, $deepscan=false) {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $offset, SEEK_SET);
-		$MPEGaudioData = fread($this->getid3->fp, 32768);
-
-		$SyncPattern1 = substr($MPEGaudioData, 0, 4);
-		// may be different pattern due to padding
-		$SyncPattern2 = $SyncPattern1{0}.$SyncPattern1{1}.chr(ord($SyncPattern1{2}) | 0x02).$SyncPattern1{3};
-		if ($SyncPattern2 === $SyncPattern1) {
-			$SyncPattern2 = $SyncPattern1{0}.$SyncPattern1{1}.chr(ord($SyncPattern1{2}) & 0xFD).$SyncPattern1{3};
-		}
-
-		$framelength = false;
-		$framelength1 = strpos($MPEGaudioData, $SyncPattern1, 4);
-		$framelength2 = strpos($MPEGaudioData, $SyncPattern2, 4);
-		if ($framelength1 > 4) {
-			$framelength = $framelength1;
-		}
-		if (($framelength2 > 4) && ($framelength2 < $framelength1)) {
-			$framelength = $framelength2;
-		}
-		if (!$framelength) {
-
-			// LAME 3.88 has a different value for modeextension on the first frame vs the rest
-			$framelength1 = strpos($MPEGaudioData, substr($SyncPattern1, 0, 3), 4);
-			$framelength2 = strpos($MPEGaudioData, substr($SyncPattern2, 0, 3), 4);
-
-			if ($framelength1 > 4) {
-				$framelength = $framelength1;
-			}
-			if (($framelength2 > 4) && ($framelength2 < $framelength1)) {
-				$framelength = $framelength2;
-			}
-			if (!$framelength) {
-				$info['error'][] = 'Cannot find next free-format synch pattern ('.getid3_lib::PrintHexBytes($SyncPattern1).' or '.getid3_lib::PrintHexBytes($SyncPattern2).') after offset '.$offset;
-				return false;
-			} else {
-				$info['warning'][] = 'ModeExtension varies between first frame and other frames (known free-format issue in LAME 3.88)';
-				$info['audio']['codec']   = 'LAME';
-				$info['audio']['encoder'] = 'LAME3.88';
-				$SyncPattern1 = substr($SyncPattern1, 0, 3);
-				$SyncPattern2 = substr($SyncPattern2, 0, 3);
-			}
-		}
-
-		if ($deepscan) {
-
-			$ActualFrameLengthValues = array();
-			$nextoffset = $offset + $framelength;
-			while ($nextoffset < ($info['avdataend'] - 6)) {
-				fseek($this->getid3->fp, $nextoffset - 1, SEEK_SET);
-				$NextSyncPattern = fread($this->getid3->fp, 6);
-				if ((substr($NextSyncPattern, 1, strlen($SyncPattern1)) == $SyncPattern1) || (substr($NextSyncPattern, 1, strlen($SyncPattern2)) == $SyncPattern2)) {
-					// good - found where expected
-					$ActualFrameLengthValues[] = $framelength;
-				} elseif ((substr($NextSyncPattern, 0, strlen($SyncPattern1)) == $SyncPattern1) || (substr($NextSyncPattern, 0, strlen($SyncPattern2)) == $SyncPattern2)) {
-					// ok - found one byte earlier than expected (last frame wasn't padded, first frame was)
-					$ActualFrameLengthValues[] = ($framelength - 1);
-					$nextoffset--;
-				} elseif ((substr($NextSyncPattern, 2, strlen($SyncPattern1)) == $SyncPattern1) || (substr($NextSyncPattern, 2, strlen($SyncPattern2)) == $SyncPattern2)) {
-					// ok - found one byte later than expected (last frame was padded, first frame wasn't)
-					$ActualFrameLengthValues[] = ($framelength + 1);
-					$nextoffset++;
-				} else {
-					$info['error'][] = 'Did not find expected free-format sync pattern at offset '.$nextoffset;
-					return false;
-				}
-				$nextoffset += $framelength;
-			}
-			if (count($ActualFrameLengthValues) > 0) {
-				$framelength = intval(round(array_sum($ActualFrameLengthValues) / count($ActualFrameLengthValues)));
-			}
-		}
-		return $framelength;
-	}
-
-	function getOnlyMPEGaudioInfoBruteForce() {
-		$MPEGaudioHeaderDecodeCache   = array();
-		$MPEGaudioHeaderValidCache    = array();
-		$MPEGaudioHeaderLengthCache   = array();
-		$MPEGaudioVersionLookup       = getid3_mp3::MPEGaudioVersionArray();
-		$MPEGaudioLayerLookup         = getid3_mp3::MPEGaudioLayerArray();
-		$MPEGaudioBitrateLookup       = getid3_mp3::MPEGaudioBitrateArray();
-		$MPEGaudioFrequencyLookup     = getid3_mp3::MPEGaudioFrequencyArray();
-		$MPEGaudioChannelModeLookup   = getid3_mp3::MPEGaudioChannelModeArray();
-		$MPEGaudioModeExtensionLookup = getid3_mp3::MPEGaudioModeExtensionArray();
-		$MPEGaudioEmphasisLookup      = getid3_mp3::MPEGaudioEmphasisArray();
-		$LongMPEGversionLookup        = array();
-		$LongMPEGlayerLookup          = array();
-		$LongMPEGbitrateLookup        = array();
-		$LongMPEGpaddingLookup        = array();
-		$LongMPEGfrequencyLookup      = array();
-		$Distribution['bitrate']      = array();
-		$Distribution['frequency']    = array();
-		$Distribution['layer']        = array();
-		$Distribution['version']      = array();
-		$Distribution['padding']      = array();
-
-		$info = &$this->getid3->info;
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-
-		$max_frames_scan = 5000;
-		$frames_scanned  = 0;
-
-		$previousvalidframe = $info['avdataoffset'];
-		while (ftell($this->getid3->fp) < $info['avdataend']) {
-			set_time_limit(30);
-			$head4 = fread($this->getid3->fp, 4);
-			if (strlen($head4) < 4) {
-				break;
-			}
-			if ($head4{0} != "\xFF") {
-				for ($i = 1; $i < 4; $i++) {
-					if ($head4{$i} == "\xFF") {
-						fseek($this->getid3->fp, $i - 4, SEEK_CUR);
-						continue 2;
-					}
-				}
-				continue;
-			}
-			if (!isset($MPEGaudioHeaderDecodeCache[$head4])) {
-				$MPEGaudioHeaderDecodeCache[$head4] = getid3_mp3::MPEGaudioHeaderDecode($head4);
-			}
-			if (!isset($MPEGaudioHeaderValidCache[$head4])) {
-				$MPEGaudioHeaderValidCache[$head4] = getid3_mp3::MPEGaudioHeaderValid($MPEGaudioHeaderDecodeCache[$head4], false, false);
-			}
-			if ($MPEGaudioHeaderValidCache[$head4]) {
-
-				if (!isset($MPEGaudioHeaderLengthCache[$head4])) {
-					$LongMPEGversionLookup[$head4]   = $MPEGaudioVersionLookup[$MPEGaudioHeaderDecodeCache[$head4]['version']];
-					$LongMPEGlayerLookup[$head4]     = $MPEGaudioLayerLookup[$MPEGaudioHeaderDecodeCache[$head4]['layer']];
-					$LongMPEGbitrateLookup[$head4]   = $MPEGaudioBitrateLookup[$LongMPEGversionLookup[$head4]][$LongMPEGlayerLookup[$head4]][$MPEGaudioHeaderDecodeCache[$head4]['bitrate']];
-					$LongMPEGpaddingLookup[$head4]   = (bool) $MPEGaudioHeaderDecodeCache[$head4]['padding'];
-					$LongMPEGfrequencyLookup[$head4] = $MPEGaudioFrequencyLookup[$LongMPEGversionLookup[$head4]][$MPEGaudioHeaderDecodeCache[$head4]['sample_rate']];
-					$MPEGaudioHeaderLengthCache[$head4] = getid3_mp3::MPEGaudioFrameLength(
-						$LongMPEGbitrateLookup[$head4],
-						$LongMPEGversionLookup[$head4],
-						$LongMPEGlayerLookup[$head4],
-						$LongMPEGpaddingLookup[$head4],
-						$LongMPEGfrequencyLookup[$head4]);
-				}
-				if ($MPEGaudioHeaderLengthCache[$head4] > 4) {
-					$WhereWeWere = ftell($this->getid3->fp);
-					fseek($this->getid3->fp, $MPEGaudioHeaderLengthCache[$head4] - 4, SEEK_CUR);
-					$next4 = fread($this->getid3->fp, 4);
-					if ($next4{0} == "\xFF") {
-						if (!isset($MPEGaudioHeaderDecodeCache[$next4])) {
-							$MPEGaudioHeaderDecodeCache[$next4] = getid3_mp3::MPEGaudioHeaderDecode($next4);
-						}
-						if (!isset($MPEGaudioHeaderValidCache[$next4])) {
-							$MPEGaudioHeaderValidCache[$next4] = getid3_mp3::MPEGaudioHeaderValid($MPEGaudioHeaderDecodeCache[$next4], false, false);
-						}
-						if ($MPEGaudioHeaderValidCache[$next4]) {
-							fseek($this->getid3->fp, -4, SEEK_CUR);
-
-							getid3_lib::safe_inc($Distribution['bitrate'][$LongMPEGbitrateLookup[$head4]]);
-							getid3_lib::safe_inc($Distribution['layer'][$LongMPEGlayerLookup[$head4]]);
-							getid3_lib::safe_inc($Distribution['version'][$LongMPEGversionLookup[$head4]]);
-							getid3_lib::safe_inc($Distribution['padding'][intval($LongMPEGpaddingLookup[$head4])]);
-							getid3_lib::safe_inc($Distribution['frequency'][$LongMPEGfrequencyLookup[$head4]]);
-							if ($max_frames_scan && (++$frames_scanned >= $max_frames_scan)) {
-								$pct_data_scanned = (ftell($this->getid3->fp) - $info['avdataoffset']) / ($info['avdataend'] - $info['avdataoffset']);
-								$info['warning'][] = 'too many MPEG audio frames to scan, only scanned first '.$max_frames_scan.' frames ('.number_format($pct_data_scanned * 100, 1).'% of file) and extrapolated distribution, playtime and bitrate may be incorrect.';
-								foreach ($Distribution as $key1 => $value1) {
-									foreach ($value1 as $key2 => $value2) {
-										$Distribution[$key1][$key2] = round($value2 / $pct_data_scanned);
-									}
-								}
-								break;
-							}
-							continue;
-						}
-					}
-					unset($next4);
-					fseek($this->getid3->fp, $WhereWeWere - 3, SEEK_SET);
-				}
-
-			}
-		}
-		foreach ($Distribution as $key => $value) {
-			ksort($Distribution[$key], SORT_NUMERIC);
-		}
-		ksort($Distribution['version'], SORT_STRING);
-		$info['mpeg']['audio']['bitrate_distribution']   = $Distribution['bitrate'];
-		$info['mpeg']['audio']['frequency_distribution'] = $Distribution['frequency'];
-		$info['mpeg']['audio']['layer_distribution']     = $Distribution['layer'];
-		$info['mpeg']['audio']['version_distribution']   = $Distribution['version'];
-		$info['mpeg']['audio']['padding_distribution']   = $Distribution['padding'];
-		if (count($Distribution['version']) > 1) {
-			$info['error'][] = 'Corrupt file - more than one MPEG version detected';
-		}
-		if (count($Distribution['layer']) > 1) {
-			$info['error'][] = 'Corrupt file - more than one MPEG layer detected';
-		}
-		if (count($Distribution['frequency']) > 1) {
-			$info['error'][] = 'Corrupt file - more than one MPEG sample rate detected';
-		}
-
-
-		$bittotal = 0;
-		foreach ($Distribution['bitrate'] as $bitratevalue => $bitratecount) {
-			if ($bitratevalue != 'free') {
-				$bittotal += ($bitratevalue * $bitratecount);
-			}
-		}
-		$info['mpeg']['audio']['frame_count']  = array_sum($Distribution['bitrate']);
-		if ($info['mpeg']['audio']['frame_count'] == 0) {
-			$info['error'][] = 'no MPEG audio frames found';
-			return false;
-		}
-		$info['mpeg']['audio']['bitrate']      = ($bittotal / $info['mpeg']['audio']['frame_count']);
-		$info['mpeg']['audio']['bitrate_mode'] = ((count($Distribution['bitrate']) > 0) ? 'vbr' : 'cbr');
-		$info['mpeg']['audio']['sample_rate']  = getid3_lib::array_max($Distribution['frequency'], true);
-
-		$info['audio']['bitrate']      = $info['mpeg']['audio']['bitrate'];
-		$info['audio']['bitrate_mode'] = $info['mpeg']['audio']['bitrate_mode'];
-		$info['audio']['sample_rate']  = $info['mpeg']['audio']['sample_rate'];
-		$info['audio']['dataformat']   = 'mp'.getid3_lib::array_max($Distribution['layer'], true);
-		$info['fileformat']            = $info['audio']['dataformat'];
-
-		return true;
-	}
-
-
-	function getOnlyMPEGaudioInfo($avdataoffset, $BitrateHistogram=false) {
-		// looks for synch, decodes MPEG audio header
-
-		$info = &$this->getid3->info;
-
-		static $MPEGaudioVersionLookup;
-		static $MPEGaudioLayerLookup;
-		static $MPEGaudioBitrateLookup;
-		if (empty($MPEGaudioVersionLookup)) {
-		   $MPEGaudioVersionLookup = getid3_mp3::MPEGaudioVersionArray();
-		   $MPEGaudioLayerLookup   = getid3_mp3::MPEGaudioLayerArray();
-		   $MPEGaudioBitrateLookup = getid3_mp3::MPEGaudioBitrateArray();
-
-		}
-
-		fseek($this->getid3->fp, $avdataoffset, SEEK_SET);
-		$sync_seek_buffer_size = min(128 * 1024, $info['avdataend'] - $avdataoffset);
-		if ($sync_seek_buffer_size <= 0) {
-			$info['error'][] = 'Invalid $sync_seek_buffer_size at offset '.$avdataoffset;
-			return false;
-		}
-		$header = fread($this->getid3->fp, $sync_seek_buffer_size);
-		$sync_seek_buffer_size = strlen($header);
-		$SynchSeekOffset = 0;
-		while ($SynchSeekOffset < $sync_seek_buffer_size) {
-			if ((($avdataoffset + $SynchSeekOffset)  < $info['avdataend']) && !feof($this->getid3->fp)) {
-
-				if ($SynchSeekOffset > $sync_seek_buffer_size) {
-					// if a synch's not found within the first 128k bytes, then give up
-					$info['error'][] = 'Could not find valid MPEG audio synch within the first '.round($sync_seek_buffer_size / 1024).'kB';
-					if (isset($info['audio']['bitrate'])) {
-						unset($info['audio']['bitrate']);
-					}
-					if (isset($info['mpeg']['audio'])) {
-						unset($info['mpeg']['audio']);
-					}
-					if (empty($info['mpeg'])) {
-						unset($info['mpeg']);
-					}
-					return false;
-
-				} elseif (feof($this->getid3->fp)) {
-
-					$info['error'][] = 'Could not find valid MPEG audio synch before end of file';
-					if (isset($info['audio']['bitrate'])) {
-						unset($info['audio']['bitrate']);
-					}
-					if (isset($info['mpeg']['audio'])) {
-						unset($info['mpeg']['audio']);
-					}
-					if (isset($info['mpeg']) && (!is_array($info['mpeg']) || (count($info['mpeg']) == 0))) {
-						unset($info['mpeg']);
-					}
-					return false;
-				}
-			}
-
-			if (($SynchSeekOffset + 1) >= strlen($header)) {
-				$info['error'][] = 'Could not find valid MPEG synch before end of file';
-				return false;
-			}
-
-			if (($header{$SynchSeekOffset} == "\xFF") && ($header{($SynchSeekOffset + 1)} > "\xE0")) { // synch detected
-				if (!isset($FirstFrameThisfileInfo) && !isset($info['mpeg']['audio'])) {
-					$FirstFrameThisfileInfo = $info;
-					$FirstFrameAVDataOffset = $avdataoffset + $SynchSeekOffset;
-					if (!$this->decodeMPEGaudioHeader($FirstFrameAVDataOffset, $FirstFrameThisfileInfo, false)) {
-						// if this is the first valid MPEG-audio frame, save it in case it's a VBR header frame and there's
-						// garbage between this frame and a valid sequence of MPEG-audio frames, to be restored below
-						unset($FirstFrameThisfileInfo);
-					}
-				}
-
-				$dummy = $info; // only overwrite real data if valid header found
-				if ($this->decodeMPEGaudioHeader($avdataoffset + $SynchSeekOffset, $dummy, true)) {
-					$info = $dummy;
-					$info['avdataoffset'] = $avdataoffset + $SynchSeekOffset;
-					switch (isset($info['fileformat']) ? $info['fileformat'] : '') {
-						case '':
-						case 'id3':
-						case 'ape':
-						case 'mp3':
-							$info['fileformat']          = 'mp3';
-							$info['audio']['dataformat'] = 'mp3';
-							break;
-					}
-					if (isset($FirstFrameThisfileInfo['mpeg']['audio']['bitrate_mode']) && ($FirstFrameThisfileInfo['mpeg']['audio']['bitrate_mode'] == 'vbr')) {
-						if (!(abs($info['audio']['bitrate'] - $FirstFrameThisfileInfo['audio']['bitrate']) <= 1)) {
-							// If there is garbage data between a valid VBR header frame and a sequence
-							// of valid MPEG-audio frames the VBR data is no longer discarded.
-							$info = $FirstFrameThisfileInfo;
-							$info['avdataoffset']        = $FirstFrameAVDataOffset;
-							$info['fileformat']          = 'mp3';
-							$info['audio']['dataformat'] = 'mp3';
-							$dummy                       = $info;
-							unset($dummy['mpeg']['audio']);
-							$GarbageOffsetStart = $FirstFrameAVDataOffset + $FirstFrameThisfileInfo['mpeg']['audio']['framelength'];
-							$GarbageOffsetEnd   = $avdataoffset + $SynchSeekOffset;
-							if ($this->decodeMPEGaudioHeader($GarbageOffsetEnd, $dummy, true, true)) {
-								$info = $dummy;
-								$info['avdataoffset'] = $GarbageOffsetEnd;
-								$info['warning'][] = 'apparently-valid VBR header not used because could not find '.GETID3_MP3_VALID_CHECK_FRAMES.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.'), but did find valid CBR stream starting at '.$GarbageOffsetEnd;
-							} else {
-								$info['warning'][] = 'using data from VBR header even though could not find '.GETID3_MP3_VALID_CHECK_FRAMES.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.')';
-							}
-						}
-					}
-					if (isset($info['mpeg']['audio']['bitrate_mode']) && ($info['mpeg']['audio']['bitrate_mode'] == 'vbr') && !isset($info['mpeg']['audio']['VBR_method'])) {
-						// VBR file with no VBR header
-						$BitrateHistogram = true;
-					}
-
-					if ($BitrateHistogram) {
-
-						$info['mpeg']['audio']['stereo_distribution']  = array('stereo'=>0, 'joint stereo'=>0, 'dual channel'=>0, 'mono'=>0);
-						$info['mpeg']['audio']['version_distribution'] = array('1'=>0, '2'=>0, '2.5'=>0);
-
-						if ($info['mpeg']['audio']['version'] == '1') {
-							if ($info['mpeg']['audio']['layer'] == 3) {
-								$info['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32000=>0, 40000=>0, 48000=>0, 56000=>0, 64000=>0, 80000=>0, 96000=>0, 112000=>0, 128000=>0, 160000=>0, 192000=>0, 224000=>0, 256000=>0, 320000=>0);
-							} elseif ($info['mpeg']['audio']['layer'] == 2) {
-								$info['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32000=>0, 48000=>0, 56000=>0, 64000=>0, 80000=>0, 96000=>0, 112000=>0, 128000=>0, 160000=>0, 192000=>0, 224000=>0, 256000=>0, 320000=>0, 384000=>0);
-							} elseif ($info['mpeg']['audio']['layer'] == 1) {
-								$info['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32000=>0, 64000=>0, 96000=>0, 128000=>0, 160000=>0, 192000=>0, 224000=>0, 256000=>0, 288000=>0, 320000=>0, 352000=>0, 384000=>0, 416000=>0, 448000=>0);
-							}
-						} elseif ($info['mpeg']['audio']['layer'] == 1) {
-							$info['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32000=>0, 48000=>0, 56000=>0, 64000=>0, 80000=>0, 96000=>0, 112000=>0, 128000=>0, 144000=>0, 160000=>0, 176000=>0, 192000=>0, 224000=>0, 256000=>0);
-						} else {
-							$info['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 8000=>0, 16000=>0, 24000=>0, 32000=>0, 40000=>0, 48000=>0, 56000=>0, 64000=>0, 80000=>0, 96000=>0, 112000=>0, 128000=>0, 144000=>0, 160000=>0);
-						}
-
-						$dummy = array('error'=>$info['error'], 'warning'=>$info['warning'], 'avdataend'=>$info['avdataend'], 'avdataoffset'=>$info['avdataoffset']);
-						$synchstartoffset = $info['avdataoffset'];
-						fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-
-						// you can play with these numbers:
-						$max_frames_scan  = 50000;
-						$max_scan_segments = 10;
-
-						// don't play with these numbers:
-						$FastMode = false;
-						$SynchErrorsFound = 0;
-						$frames_scanned   = 0;
-						$this_scan_segment = 0;
-						$frames_scan_per_segment = ceil($max_frames_scan / $max_scan_segments);
-						$pct_data_scanned = 0;
-						for ($current_segment = 0; $current_segment < $max_scan_segments; $current_segment++) {
-							$frames_scanned_this_segment = 0;
-							if (ftell($this->getid3->fp) >= $info['avdataend']) {
-								break;
-							}
-							$scan_start_offset[$current_segment] = max(ftell($this->getid3->fp), $info['avdataoffset'] + round($current_segment * (($info['avdataend'] - $info['avdataoffset']) / $max_scan_segments)));
-							if ($current_segment > 0) {
-								fseek($this->getid3->fp, $scan_start_offset[$current_segment], SEEK_SET);
-								$buffer_4k = fread($this->getid3->fp, 4096);
-								for ($j = 0; $j < (strlen($buffer_4k) - 4); $j++) {
-									if (($buffer_4k{$j} == "\xFF") && ($buffer_4k{($j + 1)} > "\xE0")) { // synch detected
-										if ($this->decodeMPEGaudioHeader($scan_start_offset[$current_segment] + $j, $dummy, false, false, $FastMode)) {
-											$calculated_next_offset = $scan_start_offset[$current_segment] + $j + $dummy['mpeg']['audio']['framelength'];
-											if ($this->decodeMPEGaudioHeader($calculated_next_offset, $dummy, false, false, $FastMode)) {
-												$scan_start_offset[$current_segment] += $j;
-												break;
-											}
-										}
-									}
-								}
-							}
-							$synchstartoffset = $scan_start_offset[$current_segment];
-							while ($this->decodeMPEGaudioHeader($synchstartoffset, $dummy, false, false, $FastMode)) {
-								$FastMode = true;
-								$thisframebitrate = $MPEGaudioBitrateLookup[$MPEGaudioVersionLookup[$dummy['mpeg']['audio']['raw']['version']]][$MPEGaudioLayerLookup[$dummy['mpeg']['audio']['raw']['layer']]][$dummy['mpeg']['audio']['raw']['bitrate']];
-
-								if (empty($dummy['mpeg']['audio']['framelength'])) {
-									$SynchErrorsFound++;
-									$synchstartoffset++;
-								} else {
-									getid3_lib::safe_inc($info['mpeg']['audio']['bitrate_distribution'][$thisframebitrate]);
-									getid3_lib::safe_inc($info['mpeg']['audio']['stereo_distribution'][$dummy['mpeg']['audio']['channelmode']]);
-									getid3_lib::safe_inc($info['mpeg']['audio']['version_distribution'][$dummy['mpeg']['audio']['version']]);
-									$synchstartoffset += $dummy['mpeg']['audio']['framelength'];
-								}
-								$frames_scanned++;
-								if ($frames_scan_per_segment && (++$frames_scanned_this_segment >= $frames_scan_per_segment)) {
-									$this_pct_scanned = (ftell($this->getid3->fp) - $scan_start_offset[$current_segment]) / ($info['avdataend'] - $info['avdataoffset']);
-									if (($current_segment == 0) && (($this_pct_scanned * $max_scan_segments) >= 1)) {
-										// file likely contains < $max_frames_scan, just scan as one segment
-										$max_scan_segments = 1;
-										$frames_scan_per_segment = $max_frames_scan;
-									} else {
-										$pct_data_scanned += $this_pct_scanned;
-										break;
-									}
-								}
-							}
-						}
-						if ($pct_data_scanned > 0) {
-							$info['warning'][] = 'too many MPEG audio frames to scan, only scanned '.$frames_scanned.' frames in '.$max_scan_segments.' segments ('.number_format($pct_data_scanned * 100, 1).'% of file) and extrapolated distribution, playtime and bitrate may be incorrect.';
-							foreach ($info['mpeg']['audio'] as $key1 => $value1) {
-								if (!preg_match('#_distribution$#i', $key1)) {
-									continue;
-								}
-								foreach ($value1 as $key2 => $value2) {
-									$info['mpeg']['audio'][$key1][$key2] = round($value2 / $pct_data_scanned);
-								}
-							}
-						}
-
-						if ($SynchErrorsFound > 0) {
-							$info['warning'][] = 'Found '.$SynchErrorsFound.' synch errors in histogram analysis';
-							//return false;
-						}
-
-						$bittotal     = 0;
-						$framecounter = 0;
-						foreach ($info['mpeg']['audio']['bitrate_distribution'] as $bitratevalue => $bitratecount) {
-							$framecounter += $bitratecount;
-							if ($bitratevalue != 'free') {
-								$bittotal += ($bitratevalue * $bitratecount);
-							}
-						}
-						if ($framecounter == 0) {
-							$info['error'][] = 'Corrupt MP3 file: framecounter == zero';
-							return false;
-						}
-						$info['mpeg']['audio']['frame_count'] = getid3_lib::CastAsInt($framecounter);
-						$info['mpeg']['audio']['bitrate']     = ($bittotal / $framecounter);
-
-						$info['audio']['bitrate'] = $info['mpeg']['audio']['bitrate'];
-
-
-						// Definitively set VBR vs CBR, even if the Xing/LAME/VBRI header says differently
-						$distinct_bitrates = 0;
-						foreach ($info['mpeg']['audio']['bitrate_distribution'] as $bitrate_value => $bitrate_count) {
-							if ($bitrate_count > 0) {
-								$distinct_bitrates++;
-							}
-						}
-						if ($distinct_bitrates > 1) {
-							$info['mpeg']['audio']['bitrate_mode'] = 'vbr';
-						} else {
-							$info['mpeg']['audio']['bitrate_mode'] = 'cbr';
-						}
-						$info['audio']['bitrate_mode'] = $info['mpeg']['audio']['bitrate_mode'];
-
-					}
-
-					break; // exit while()
-				}
-			}
-
-			$SynchSeekOffset++;
-			if (($avdataoffset + $SynchSeekOffset) >= $info['avdataend']) {
-				// end of file/data
-
-				if (empty($info['mpeg']['audio'])) {
-
-					$info['error'][] = 'could not find valid MPEG synch before end of file';
-					if (isset($info['audio']['bitrate'])) {
-						unset($info['audio']['bitrate']);
-					}
-					if (isset($info['mpeg']['audio'])) {
-						unset($info['mpeg']['audio']);
-					}
-					if (isset($info['mpeg']) && (!is_array($info['mpeg']) || empty($info['mpeg']))) {
-						unset($info['mpeg']);
-					}
-					return false;
-
-				}
-				break;
-			}
-
-		}
-		$info['audio']['channels']        = $info['mpeg']['audio']['channels'];
-		$info['audio']['channelmode']     = $info['mpeg']['audio']['channelmode'];
-		$info['audio']['sample_rate']     = $info['mpeg']['audio']['sample_rate'];
-		return true;
-	}
-
-
-	static function MPEGaudioVersionArray() {
-		static $MPEGaudioVersion = array('2.5', false, '2', '1');
-		return $MPEGaudioVersion;
-	}
-
-	static function MPEGaudioLayerArray() {
-		static $MPEGaudioLayer = array(false, 3, 2, 1);
-		return $MPEGaudioLayer;
-	}
-
-	static function MPEGaudioBitrateArray() {
-		static $MPEGaudioBitrate;
-		if (empty($MPEGaudioBitrate)) {
-			$MPEGaudioBitrate = array (
-				'1'  =>  array (1 => array('free', 32000, 64000, 96000, 128000, 160000, 192000, 224000, 256000, 288000, 320000, 352000, 384000, 416000, 448000),
-								2 => array('free', 32000, 48000, 56000,  64000,  80000,  96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000, 384000),
-								3 => array('free', 32000, 40000, 48000,  56000,  64000,  80000,  96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000)
-							   ),
-
-				'2'  =>  array (1 => array('free', 32000, 48000, 56000,  64000,  80000,  96000, 112000, 128000, 144000, 160000, 176000, 192000, 224000, 256000),
-								2 => array('free',  8000, 16000, 24000,  32000,  40000,  48000,  56000,  64000,  80000,  96000, 112000, 128000, 144000, 160000),
-							   )
-			);
-			$MPEGaudioBitrate['2'][3] = $MPEGaudioBitrate['2'][2];
-			$MPEGaudioBitrate['2.5']  = $MPEGaudioBitrate['2'];
-		}
-		return $MPEGaudioBitrate;
-	}
-
-	static function MPEGaudioFrequencyArray() {
-		static $MPEGaudioFrequency;
-		if (empty($MPEGaudioFrequency)) {
-			$MPEGaudioFrequency = array (
-				'1'   => array(44100, 48000, 32000),
-				'2'   => array(22050, 24000, 16000),
-				'2.5' => array(11025, 12000,  8000)
-			);
-		}
-		return $MPEGaudioFrequency;
-	}
-
-	static function MPEGaudioChannelModeArray() {
-		static $MPEGaudioChannelMode = array('stereo', 'joint stereo', 'dual channel', 'mono');
-		return $MPEGaudioChannelMode;
-	}
-
-	static function MPEGaudioModeExtensionArray() {
-		static $MPEGaudioModeExtension;
-		if (empty($MPEGaudioModeExtension)) {
-			$MPEGaudioModeExtension = array (
-				1 => array('4-31', '8-31', '12-31', '16-31'),
-				2 => array('4-31', '8-31', '12-31', '16-31'),
-				3 => array('', 'IS', 'MS', 'IS+MS')
-			);
-		}
-		return $MPEGaudioModeExtension;
-	}
-
-	static function MPEGaudioEmphasisArray() {
-		static $MPEGaudioEmphasis = array('none', '50/15ms', false, 'CCIT J.17');
-		return $MPEGaudioEmphasis;
-	}
-
-	static function MPEGaudioHeaderBytesValid($head4, $allowBitrate15=false) {
-		return getid3_mp3::MPEGaudioHeaderValid(getid3_mp3::MPEGaudioHeaderDecode($head4), false, $allowBitrate15);
-	}
-
-	static function MPEGaudioHeaderValid($rawarray, $echoerrors=false, $allowBitrate15=false) {
-		if (($rawarray['synch'] & 0x0FFE) != 0x0FFE) {
-			return false;
-		}
-
-		static $MPEGaudioVersionLookup;
-		static $MPEGaudioLayerLookup;
-		static $MPEGaudioBitrateLookup;
-		static $MPEGaudioFrequencyLookup;
-		static $MPEGaudioChannelModeLookup;
-		static $MPEGaudioModeExtensionLookup;
-		static $MPEGaudioEmphasisLookup;
-		if (empty($MPEGaudioVersionLookup)) {
-			$MPEGaudioVersionLookup       = getid3_mp3::MPEGaudioVersionArray();
-			$MPEGaudioLayerLookup         = getid3_mp3::MPEGaudioLayerArray();
-			$MPEGaudioBitrateLookup       = getid3_mp3::MPEGaudioBitrateArray();
-			$MPEGaudioFrequencyLookup     = getid3_mp3::MPEGaudioFrequencyArray();
-			$MPEGaudioChannelModeLookup   = getid3_mp3::MPEGaudioChannelModeArray();
-			$MPEGaudioModeExtensionLookup = getid3_mp3::MPEGaudioModeExtensionArray();
-			$MPEGaudioEmphasisLookup      = getid3_mp3::MPEGaudioEmphasisArray();
-		}
-
-		if (isset($MPEGaudioVersionLookup[$rawarray['version']])) {
-			$decodedVersion = $MPEGaudioVersionLookup[$rawarray['version']];
-		} else {
-			echo ($echoerrors ? "\n".'invalid Version ('.$rawarray['version'].')' : '');
-			return false;
-		}
-		if (isset($MPEGaudioLayerLookup[$rawarray['layer']])) {
-			$decodedLayer = $MPEGaudioLayerLookup[$rawarray['layer']];
-		} else {
-			echo ($echoerrors ? "\n".'invalid Layer ('.$rawarray['layer'].')' : '');
-			return false;
-		}
-		if (!isset($MPEGaudioBitrateLookup[$decodedVersion][$decodedLayer][$rawarray['bitrate']])) {
-			echo ($echoerrors ? "\n".'invalid Bitrate ('.$rawarray['bitrate'].')' : '');
-			if ($rawarray['bitrate'] == 15) {
-				// known issue in LAME 3.90 - 3.93.1 where free-format has bitrate ID of 15 instead of 0
-				// let it go through here otherwise file will not be identified
-				if (!$allowBitrate15) {
-					return false;
-				}
-			} else {
-				return false;
-			}
-		}
-		if (!isset($MPEGaudioFrequencyLookup[$decodedVersion][$rawarray['sample_rate']])) {
-			echo ($echoerrors ? "\n".'invalid Frequency ('.$rawarray['sample_rate'].')' : '');
-			return false;
-		}
-		if (!isset($MPEGaudioChannelModeLookup[$rawarray['channelmode']])) {
-			echo ($echoerrors ? "\n".'invalid ChannelMode ('.$rawarray['channelmode'].')' : '');
-			return false;
-		}
-		if (!isset($MPEGaudioModeExtensionLookup[$decodedLayer][$rawarray['modeextension']])) {
-			echo ($echoerrors ? "\n".'invalid Mode Extension ('.$rawarray['modeextension'].')' : '');
-			return false;
-		}
-		if (!isset($MPEGaudioEmphasisLookup[$rawarray['emphasis']])) {
-			echo ($echoerrors ? "\n".'invalid Emphasis ('.$rawarray['emphasis'].')' : '');
-			return false;
-		}
-		// These are just either set or not set, you can't mess that up :)
-		// $rawarray['protection'];
-		// $rawarray['padding'];
-		// $rawarray['private'];
-		// $rawarray['copyright'];
-		// $rawarray['original'];
-
-		return true;
-	}
-
-	static function MPEGaudioHeaderDecode($Header4Bytes) {
-		// AAAA AAAA  AAAB BCCD  EEEE FFGH  IIJJ KLMM
-		// A - Frame sync (all bits set)
-		// B - MPEG Audio version ID
-		// C - Layer description
-		// D - Protection bit
-		// E - Bitrate index
-		// F - Sampling rate frequency index
-		// G - Padding bit
-		// H - Private bit
-		// I - Channel Mode
-		// J - Mode extension (Only if Joint stereo)
-		// K - Copyright
-		// L - Original
-		// M - Emphasis
-
-		if (strlen($Header4Bytes) != 4) {
-			return false;
-		}
-
-		$MPEGrawHeader['synch']         = (getid3_lib::BigEndian2Int(substr($Header4Bytes, 0, 2)) & 0xFFE0) >> 4;
-		$MPEGrawHeader['version']       = (ord($Header4Bytes{1}) & 0x18) >> 3; //    BB
-		$MPEGrawHeader['layer']         = (ord($Header4Bytes{1}) & 0x06) >> 1; //      CC
-		$MPEGrawHeader['protection']    = (ord($Header4Bytes{1}) & 0x01);      //        D
-		$MPEGrawHeader['bitrate']       = (ord($Header4Bytes{2}) & 0xF0) >> 4; // EEEE
-		$MPEGrawHeader['sample_rate']   = (ord($Header4Bytes{2}) & 0x0C) >> 2; //     FF
-		$MPEGrawHeader['padding']       = (ord($Header4Bytes{2}) & 0x02) >> 1; //       G
-		$MPEGrawHeader['private']       = (ord($Header4Bytes{2}) & 0x01);      //        H
-		$MPEGrawHeader['channelmode']   = (ord($Header4Bytes{3}) & 0xC0) >> 6; // II
-		$MPEGrawHeader['modeextension'] = (ord($Header4Bytes{3}) & 0x30) >> 4; //   JJ
-		$MPEGrawHeader['copyright']     = (ord($Header4Bytes{3}) & 0x08) >> 3; //     K
-		$MPEGrawHeader['original']      = (ord($Header4Bytes{3}) & 0x04) >> 2; //      L
-		$MPEGrawHeader['emphasis']      = (ord($Header4Bytes{3}) & 0x03);      //       MM
-
-		return $MPEGrawHeader;
-	}
-
-	static function MPEGaudioFrameLength(&$bitrate, &$version, &$layer, $padding, &$samplerate) {
-		static $AudioFrameLengthCache = array();
-
-		if (!isset($AudioFrameLengthCache[$bitrate][$version][$layer][$padding][$samplerate])) {
-			$AudioFrameLengthCache[$bitrate][$version][$layer][$padding][$samplerate] = false;
-			if ($bitrate != 'free') {
-
-				if ($version == '1') {
-
-					if ($layer == '1') {
-
-						// For Layer I slot is 32 bits long
-						$FrameLengthCoefficient = 48;
-						$SlotLength = 4;
-
-					} else { // Layer 2 / 3
-
-						// for Layer 2 and Layer 3 slot is 8 bits long.
-						$FrameLengthCoefficient = 144;
-						$SlotLength = 1;
-
-					}
-
-				} else { // MPEG-2 / MPEG-2.5
-
-					if ($layer == '1') {
-
-						// For Layer I slot is 32 bits long
-						$FrameLengthCoefficient = 24;
-						$SlotLength = 4;
-
-					} elseif ($layer == '2') {
-
-						// for Layer 2 and Layer 3 slot is 8 bits long.
-						$FrameLengthCoefficient = 144;
-						$SlotLength = 1;
-
-					} else { // layer 3
-
-						// for Layer 2 and Layer 3 slot is 8 bits long.
-						$FrameLengthCoefficient = 72;
-						$SlotLength = 1;
-
-					}
-
-				}
-
-				// FrameLengthInBytes = ((Coefficient * BitRate) / SampleRate) + Padding
-				if ($samplerate > 0) {
-					$NewFramelength  = ($FrameLengthCoefficient * $bitrate) / $samplerate;
-					$NewFramelength  = floor($NewFramelength / $SlotLength) * $SlotLength; // round to next-lower multiple of SlotLength (1 byte for Layer 2/3, 4 bytes for Layer I)
-					if ($padding) {
-						$NewFramelength += $SlotLength;
-					}
-					$AudioFrameLengthCache[$bitrate][$version][$layer][$padding][$samplerate] = (int) $NewFramelength;
-				}
-			}
-		}
-		return $AudioFrameLengthCache[$bitrate][$version][$layer][$padding][$samplerate];
-	}
-
-	static function ClosestStandardMP3Bitrate($bit_rate) {
-		static $standard_bit_rates = array (320000, 256000, 224000, 192000, 160000, 128000, 112000, 96000, 80000, 64000, 56000, 48000, 40000, 32000, 24000, 16000, 8000);
-		static $bit_rate_table = array (0=>'-');
-		$round_bit_rate = intval(round($bit_rate, -3));
-		if (!isset($bit_rate_table[$round_bit_rate])) {
-			if ($round_bit_rate > max($standard_bit_rates)) {
-				$bit_rate_table[$round_bit_rate] = round($bit_rate, 2 - strlen($bit_rate));
-			} else {
-				$bit_rate_table[$round_bit_rate] = max($standard_bit_rates);
-				foreach ($standard_bit_rates as $standard_bit_rate) {
-					if ($round_bit_rate >= $standard_bit_rate + (($bit_rate_table[$round_bit_rate] - $standard_bit_rate) / 2)) {
-						break;
-					}
-					$bit_rate_table[$round_bit_rate] = $standard_bit_rate;
-				}
-			}
-		}
-		return $bit_rate_table[$round_bit_rate];
-	}
-
-	static function XingVBRidOffset($version, $channelmode) {
-		static $XingVBRidOffsetCache = array();
-		if (empty($XingVBRidOffset)) {
-			$XingVBRidOffset = array (
-				'1'   => array ('mono'          => 0x15, // 4 + 17 = 21
-								'stereo'        => 0x24, // 4 + 32 = 36
-								'joint stereo'  => 0x24,
-								'dual channel'  => 0x24
-							   ),
-
-				'2'   => array ('mono'          => 0x0D, // 4 +  9 = 13
-								'stereo'        => 0x15, // 4 + 17 = 21
-								'joint stereo'  => 0x15,
-								'dual channel'  => 0x15
-							   ),
-
-				'2.5' => array ('mono'          => 0x15,
-								'stereo'        => 0x15,
-								'joint stereo'  => 0x15,
-								'dual channel'  => 0x15
-							   )
-			);
-		}
-		return $XingVBRidOffset[$version][$channelmode];
-	}
-
-	static function LAMEvbrMethodLookup($VBRmethodID) {
-		static $LAMEvbrMethodLookup = array(
-			0x00 => 'unknown',
-			0x01 => 'cbr',
-			0x02 => 'abr',
-			0x03 => 'vbr-old / vbr-rh',
-			0x04 => 'vbr-new / vbr-mtrh',
-			0x05 => 'vbr-mt',
-			0x06 => 'vbr (full vbr method 4)',
-			0x08 => 'cbr (constant bitrate 2 pass)',
-			0x09 => 'abr (2 pass)',
-			0x0F => 'reserved'
-		);
-		return (isset($LAMEvbrMethodLookup[$VBRmethodID]) ? $LAMEvbrMethodLookup[$VBRmethodID] : '');
-	}
-
-	static function LAMEmiscStereoModeLookup($StereoModeID) {
-		static $LAMEmiscStereoModeLookup = array(
-			0 => 'mono',
-			1 => 'stereo',
-			2 => 'dual mono',
-			3 => 'joint stereo',
-			4 => 'forced stereo',
-			5 => 'auto',
-			6 => 'intensity stereo',
-			7 => 'other'
-		);
-		return (isset($LAMEmiscStereoModeLookup[$StereoModeID]) ? $LAMEmiscStereoModeLookup[$StereoModeID] : '');
-	}
-
-	static function LAMEmiscSourceSampleFrequencyLookup($SourceSampleFrequencyID) {
-		static $LAMEmiscSourceSampleFrequencyLookup = array(
-			0 => '<= 32 kHz',
-			1 => '44.1 kHz',
-			2 => '48 kHz',
-			3 => '> 48kHz'
-		);
-		return (isset($LAMEmiscSourceSampleFrequencyLookup[$SourceSampleFrequencyID]) ? $LAMEmiscSourceSampleFrequencyLookup[$SourceSampleFrequencyID] : '');
-	}
-
-	static function LAMEsurroundInfoLookup($SurroundInfoID) {
-		static $LAMEsurroundInfoLookup = array(
-			0 => 'no surround info',
-			1 => 'DPL encoding',
-			2 => 'DPL2 encoding',
-			3 => 'Ambisonic encoding'
-		);
-		return (isset($LAMEsurroundInfoLookup[$SurroundInfoID]) ? $LAMEsurroundInfoLookup[$SurroundInfoID] : 'reserved');
-	}
-
-	static function LAMEpresetUsedLookup($LAMEtag) {
-
-		if ($LAMEtag['preset_used_id'] == 0) {
-			// no preset used (LAME >=3.93)
-			// no preset recorded (LAME <3.93)
-			return '';
-		}
-		$LAMEpresetUsedLookup = array();
-
-		/////  THIS PART CANNOT BE STATIC .
-		for ($i = 8; $i <= 320; $i++) {
-			switch ($LAMEtag['vbr_method']) {
-				case 'cbr':
-					$LAMEpresetUsedLookup[$i] = '--alt-preset '.$LAMEtag['vbr_method'].' '.$i;
-					break;
-				case 'abr':
-				default: // other VBR modes shouldn't be here(?)
-					$LAMEpresetUsedLookup[$i] = '--alt-preset '.$i;
-					break;
-			}
-		}
-
-		// named old-style presets (studio, phone, voice, etc) are handled in GuessEncoderOptions()
-
-		// named alt-presets
-		$LAMEpresetUsedLookup[1000] = '--r3mix';
-		$LAMEpresetUsedLookup[1001] = '--alt-preset standard';
-		$LAMEpresetUsedLookup[1002] = '--alt-preset extreme';
-		$LAMEpresetUsedLookup[1003] = '--alt-preset insane';
-		$LAMEpresetUsedLookup[1004] = '--alt-preset fast standard';
-		$LAMEpresetUsedLookup[1005] = '--alt-preset fast extreme';
-		$LAMEpresetUsedLookup[1006] = '--alt-preset medium';
-		$LAMEpresetUsedLookup[1007] = '--alt-preset fast medium';
-
-		// LAME 3.94 additions/changes
-		$LAMEpresetUsedLookup[1010] = '--preset portable';                                                           // 3.94a15 Oct 21 2003
-		$LAMEpresetUsedLookup[1015] = '--preset radio';                                                              // 3.94a15 Oct 21 2003
-
-		$LAMEpresetUsedLookup[320]  = '--preset insane';                                                             // 3.94a15 Nov 12 2003
-		$LAMEpresetUsedLookup[410]  = '-V9';
-		$LAMEpresetUsedLookup[420]  = '-V8';
-		$LAMEpresetUsedLookup[440]  = '-V6';
-		$LAMEpresetUsedLookup[430]  = '--preset radio';                                                              // 3.94a15 Nov 12 2003
-		$LAMEpresetUsedLookup[450]  = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'portable';  // 3.94a15 Nov 12 2003
-		$LAMEpresetUsedLookup[460]  = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'medium';    // 3.94a15 Nov 12 2003
-		$LAMEpresetUsedLookup[470]  = '--r3mix';                                                                     // 3.94b1  Dec 18 2003
-		$LAMEpresetUsedLookup[480]  = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'standard';  // 3.94a15 Nov 12 2003
-		$LAMEpresetUsedLookup[490]  = '-V1';
-		$LAMEpresetUsedLookup[500]  = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'extreme';   // 3.94a15 Nov 12 2003
-
-		return (isset($LAMEpresetUsedLookup[$LAMEtag['preset_used_id']]) ? $LAMEpresetUsedLookup[$LAMEtag['preset_used_id']] : 'new/unknown preset: '.$LAMEtag['preset_used_id'].' - report to info@getid3.org');
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.mpc.php b/lib/getid3/getid3/module.audio.mpc.php
deleted file mode 100644
index 9a0b16d9a..000000000
--- a/lib/getid3/getid3/module.audio.mpc.php
+++ /dev/null
@@ -1,509 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.mpc.php                                        //
-// module for analyzing Musepack/MPEG+ Audio files             //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_mpc extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['mpc']['header'] = array();
-		$thisfile_mpc_header   = &$info['mpc']['header'];
-
-		$info['fileformat']               = 'mpc';
-		$info['audio']['dataformat']      = 'mpc';
-		$info['audio']['bitrate_mode']    = 'vbr';
-		$info['audio']['channels']        = 2;  // up to SV7 the format appears to have been hardcoded for stereo only
-		$info['audio']['lossless']        = false;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$MPCheaderData = fread($this->getid3->fp, 4);
-		$info['mpc']['header']['preamble'] = substr($MPCheaderData, 0, 4); // should be 'MPCK' (SV8) or 'MP+' (SV7), otherwise possible stream data (SV4-SV6)
-		if (preg_match('#^MPCK#', $info['mpc']['header']['preamble'])) {
-
-			// this is SV8
-			return $this->ParseMPCsv8();
-
-		} elseif (preg_match('#^MP\+#', $info['mpc']['header']['preamble'])) {
-
-			// this is SV7
-			return $this->ParseMPCsv7();
-
-		} elseif (preg_match('/^[\x00\x01\x10\x11\x40\x41\x50\x51\x80\x81\x90\x91\xC0\xC1\xD0\xD1][\x20-37][\x00\x20\x40\x60\x80\xA0\xC0\xE0]/s', $MPCheaderData)) {
-
-			// this is SV4 - SV6, handle seperately
-			return $this->ParseMPCsv6();
-
-		} else {
-
-			$info['error'][] = 'Expecting "MP+" or "MPCK" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($MPCheaderData, 0, 4)).'"';
-			unset($info['fileformat']);
-			unset($info['mpc']);
-			return false;
-
-		}
-		return false;
-	}
-
-
-	function ParseMPCsv8() {
-		// this is SV8
-		// http://trac.musepack.net/trac/wiki/SV8Specification
-
-		$info = &$this->getid3->info;
-		$thisfile_mpc_header = &$info['mpc']['header'];
-
-		$keyNameSize            = 2;
-		$maxHandledPacketLength = 9; // specs say: "n*8; 0 < n < 10"
-
-		$offset = ftell($this->getid3->fp);
-		while ($offset < $info['avdataend']) {
-			$thisPacket = array();
-			$thisPacket['offset'] = $offset;
-			$packet_offset = 0;
-
-			// Size is a variable-size field, could be 1-4 bytes (possibly more?)
-			// read enough data in and figure out the exact size later
-			$MPCheaderData = fread($this->getid3->fp, $keyNameSize + $maxHandledPacketLength);
-			$packet_offset += $keyNameSize;
-			$thisPacket['key']      = substr($MPCheaderData, 0, $keyNameSize);
-			$thisPacket['key_name'] = $this->MPCsv8PacketName($thisPacket['key']);
-			if ($thisPacket['key'] == $thisPacket['key_name']) {
-				$info['error'][] = 'Found unexpected key value "'.$thisPacket['key'].'" at offset '.$thisPacket['offset'];
-				return false;
-			}
-			$packetLength = 0;
-			$thisPacket['packet_size'] = $this->SV8variableLengthInteger(substr($MPCheaderData, $keyNameSize), $packetLength); // includes keyname and packet_size field
-			if ($thisPacket['packet_size'] === false) {
-				$info['error'][] = 'Did not find expected packet length within '.$maxHandledPacketLength.' bytes at offset '.($thisPacket['offset'] + $keyNameSize);
-				return false;
-			}
-			$packet_offset += $packetLength;
-			$offset += $thisPacket['packet_size'];
-
-			switch ($thisPacket['key']) {
-				case 'SH': // Stream Header
-					$moreBytesToRead = $thisPacket['packet_size'] - $keyNameSize - $maxHandledPacketLength;
-					if ($moreBytesToRead > 0) {
-						$MPCheaderData .= fread($this->getid3->fp, $moreBytesToRead);
-					}
-					$thisPacket['crc']               =       getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 4));
-					$packet_offset += 4;
-					$thisPacket['stream_version']    =       getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 1));
-					$packet_offset += 1;
-
-					$packetLength = 0;
-					$thisPacket['sample_count']      = $this->SV8variableLengthInteger(substr($MPCheaderData, $packet_offset, $maxHandledPacketLength), $packetLength);
-					$packet_offset += $packetLength;
-
-					$packetLength = 0;
-					$thisPacket['beginning_silence'] = $this->SV8variableLengthInteger(substr($MPCheaderData, $packet_offset, $maxHandledPacketLength), $packetLength);
-					$packet_offset += $packetLength;
-
-					$otherUsefulData                 =       getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 2));
-					$packet_offset += 2;
-					$thisPacket['sample_frequency_raw'] =        (($otherUsefulData & 0xE000) >> 13);
-					$thisPacket['max_bands_used']       =        (($otherUsefulData & 0x1F00) >>  8);
-					$thisPacket['channels']             =        (($otherUsefulData & 0x00F0) >>  4) + 1;
-					$thisPacket['ms_used']              = (bool) (($otherUsefulData & 0x0008) >>  3);
-					$thisPacket['audio_block_frames']   =        (($otherUsefulData & 0x0007) >>  0);
-					$thisPacket['sample_frequency']     = $this->MPCfrequencyLookup($thisPacket['sample_frequency_raw']);
-
-					$thisfile_mpc_header['mid_side_stereo']      = $thisPacket['ms_used'];
-					$thisfile_mpc_header['sample_rate']          = $thisPacket['sample_frequency'];
-					$thisfile_mpc_header['samples']              = $thisPacket['sample_count'];
-					$thisfile_mpc_header['stream_version_major'] = $thisPacket['stream_version'];
-
-					$info['audio']['channels']    = $thisPacket['channels'];
-					$info['audio']['sample_rate'] = $thisPacket['sample_frequency'];
-					$info['playtime_seconds'] = $thisPacket['sample_count'] / $thisPacket['sample_frequency'];
-					$info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-					break;
-
-				case 'RG': // Replay Gain
-					$moreBytesToRead = $thisPacket['packet_size'] - $keyNameSize - $maxHandledPacketLength;
-					if ($moreBytesToRead > 0) {
-						$MPCheaderData .= fread($this->getid3->fp, $moreBytesToRead);
-					}
-					$thisPacket['replaygain_version']     =       getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 1));
-					$packet_offset += 1;
-					$thisPacket['replaygain_title_gain']  =       getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 2));
-					$packet_offset += 2;
-					$thisPacket['replaygain_title_peak']  =       getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 2));
-					$packet_offset += 2;
-					$thisPacket['replaygain_album_gain']  =       getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 2));
-					$packet_offset += 2;
-					$thisPacket['replaygain_album_peak']  =       getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 2));
-					$packet_offset += 2;
-
-					if ($thisPacket['replaygain_title_gain']) { $info['replay_gain']['title']['gain'] = $thisPacket['replaygain_title_gain']; }
-					if ($thisPacket['replaygain_title_peak']) { $info['replay_gain']['title']['peak'] = $thisPacket['replaygain_title_peak']; }
-					if ($thisPacket['replaygain_album_gain']) { $info['replay_gain']['album']['gain'] = $thisPacket['replaygain_album_gain']; }
-					if ($thisPacket['replaygain_album_peak']) { $info['replay_gain']['album']['peak'] = $thisPacket['replaygain_album_peak']; }
-					break;
-
-				case 'EI': // Encoder Info
-					$moreBytesToRead = $thisPacket['packet_size'] - $keyNameSize - $maxHandledPacketLength;
-					if ($moreBytesToRead > 0) {
-						$MPCheaderData .= fread($this->getid3->fp, $moreBytesToRead);
-					}
-					$profile_pns                 = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 1));
-					$packet_offset += 1;
-					$quality_int =                   (($profile_pns & 0xF0) >> 4);
-					$quality_dec =                   (($profile_pns & 0x0E) >> 3);
-					$thisPacket['quality'] = (float) $quality_int + ($quality_dec / 8);
-					$thisPacket['pns_tool'] = (bool) (($profile_pns & 0x01) >> 0);
-					$thisPacket['version_major'] = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 1));
-					$packet_offset += 1;
-					$thisPacket['version_minor'] = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 1));
-					$packet_offset += 1;
-					$thisPacket['version_build'] = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 1));
-					$packet_offset += 1;
-					$thisPacket['version'] = $thisPacket['version_major'].'.'.$thisPacket['version_minor'].'.'.$thisPacket['version_build'];
-
-					$info['audio']['encoder'] = 'MPC v'.$thisPacket['version'].' ('.(($thisPacket['version_minor'] % 2) ? 'unstable' : 'stable').')';
-					$thisfile_mpc_header['encoder_version'] = $info['audio']['encoder'];
-					//$thisfile_mpc_header['quality']         = (float) ($thisPacket['quality'] / 1.5875); // values can range from 0.000 to 15.875, mapped to qualities of 0.0 to 10.0
-					$thisfile_mpc_header['quality']         = (float) ($thisPacket['quality'] - 5); // values can range from 0.000 to 15.875, of which 0..4 are "reserved/experimental", and 5..15 are mapped to qualities of 0.0 to 10.0
-					break;
-
-				case 'SO': // Seek Table Offset
-					$packetLength = 0;
-					$thisPacket['seek_table_offset'] = $thisPacket['offset'] + $this->SV8variableLengthInteger(substr($MPCheaderData, $packet_offset, $maxHandledPacketLength), $packetLength);
-					$packet_offset += $packetLength;
-					break;
-
-				case 'ST': // Seek Table
-				case 'SE': // Stream End
-				case 'AP': // Audio Data
-					// nothing useful here, just skip this packet
-					$thisPacket = array();
-					break;
-
-				default:
-					$info['error'][] = 'Found unhandled key type "'.$thisPacket['key'].'" at offset '.$thisPacket['offset'];
-					return false;
-					break;
-			}
-			if (!empty($thisPacket)) {
-				$info['mpc']['packets'][] = $thisPacket;
-			}
-			fseek($this->getid3->fp, $offset);
-		}
-		$thisfile_mpc_header['size'] = $offset;
-		return true;
-	}
-
-	function ParseMPCsv7() {
-		// this is SV7
-		// http://www.uni-jena.de/~pfk/mpp/sv8/header.html
-
-		$info = &$this->getid3->info;
-		$thisfile_mpc_header = &$info['mpc']['header'];
-		$offset = 0;
-
-		$thisfile_mpc_header['size'] = 28;
-		$MPCheaderData  = $info['mpc']['header']['preamble'];
-		$MPCheaderData .= fread($this->getid3->fp, $thisfile_mpc_header['size'] - strlen($info['mpc']['header']['preamble']));
-		$offset = strlen('MP+');
-
-		$StreamVersionByte                           = getid3_lib::LittleEndian2Int(substr($MPCheaderData, $offset, 1));
-		$offset += 1;
-		$thisfile_mpc_header['stream_version_major'] = ($StreamVersionByte & 0x0F) >> 0;
-		$thisfile_mpc_header['stream_version_minor'] = ($StreamVersionByte & 0xF0) >> 4; // should always be 0, subversions no longer exist in SV8
-		$thisfile_mpc_header['frame_count']          = getid3_lib::LittleEndian2Int(substr($MPCheaderData, $offset, 4));
-		$offset += 4;
-
-		if ($thisfile_mpc_header['stream_version_major'] != 7) {
-			$info['error'][] = 'Only Musepack SV7 supported (this file claims to be v'.$thisfile_mpc_header['stream_version_major'].')';
-			return false;
-		}
-
-		$FlagsDWORD1                                   = getid3_lib::LittleEndian2Int(substr($MPCheaderData, $offset, 4));
-		$offset += 4;
-		$thisfile_mpc_header['intensity_stereo']       = (bool) (($FlagsDWORD1 & 0x80000000) >> 31);
-		$thisfile_mpc_header['mid_side_stereo']        = (bool) (($FlagsDWORD1 & 0x40000000) >> 30);
-		$thisfile_mpc_header['max_subband']            =         ($FlagsDWORD1 & 0x3F000000) >> 24;
-		$thisfile_mpc_header['raw']['profile']         =         ($FlagsDWORD1 & 0x00F00000) >> 20;
-		$thisfile_mpc_header['begin_loud']             = (bool) (($FlagsDWORD1 & 0x00080000) >> 19);
-		$thisfile_mpc_header['end_loud']               = (bool) (($FlagsDWORD1 & 0x00040000) >> 18);
-		$thisfile_mpc_header['raw']['sample_rate']     =         ($FlagsDWORD1 & 0x00030000) >> 16;
-		$thisfile_mpc_header['max_level']              =         ($FlagsDWORD1 & 0x0000FFFF);
-
-		$thisfile_mpc_header['raw']['title_peak']      = getid3_lib::LittleEndian2Int(substr($MPCheaderData, $offset, 2));
-		$offset += 2;
-		$thisfile_mpc_header['raw']['title_gain']      = getid3_lib::LittleEndian2Int(substr($MPCheaderData, $offset, 2), true);
-		$offset += 2;
-
-		$thisfile_mpc_header['raw']['album_peak']      = getid3_lib::LittleEndian2Int(substr($MPCheaderData, $offset, 2));
-		$offset += 2;
-		$thisfile_mpc_header['raw']['album_gain']      = getid3_lib::LittleEndian2Int(substr($MPCheaderData, $offset, 2), true);
-		$offset += 2;
-
-		$FlagsDWORD2                                   = getid3_lib::LittleEndian2Int(substr($MPCheaderData, $offset, 4));
-		$offset += 4;
-		$thisfile_mpc_header['true_gapless']           = (bool) (($FlagsDWORD2 & 0x80000000) >> 31);
-		$thisfile_mpc_header['last_frame_length']      =         ($FlagsDWORD2 & 0x7FF00000) >> 20;
-
-
-		$thisfile_mpc_header['raw']['not_sure_what']   = getid3_lib::LittleEndian2Int(substr($MPCheaderData, $offset, 3));
-		$offset += 3;
-		$thisfile_mpc_header['raw']['encoder_version'] = getid3_lib::LittleEndian2Int(substr($MPCheaderData, $offset, 1));
-		$offset += 1;
-
-		$thisfile_mpc_header['profile']     = $this->MPCprofileNameLookup($thisfile_mpc_header['raw']['profile']);
-		$thisfile_mpc_header['sample_rate'] = $this->MPCfrequencyLookup($thisfile_mpc_header['raw']['sample_rate']);
-		if ($thisfile_mpc_header['sample_rate'] == 0) {
-			$info['error'][] = 'Corrupt MPC file: frequency == zero';
-			return false;
-		}
-		$info['audio']['sample_rate'] = $thisfile_mpc_header['sample_rate'];
-		$thisfile_mpc_header['samples']       = ((($thisfile_mpc_header['frame_count'] - 1) * 1152) + $thisfile_mpc_header['last_frame_length']) * $info['audio']['channels'];
-
-		$info['playtime_seconds']     = ($thisfile_mpc_header['samples'] / $info['audio']['channels']) / $info['audio']['sample_rate'];
-		if ($info['playtime_seconds'] == 0) {
-			$info['error'][] = 'Corrupt MPC file: playtime_seconds == zero';
-			return false;
-		}
-
-		// add size of file header to avdataoffset - calc bitrate correctly + MD5 data
-		$info['avdataoffset'] += $thisfile_mpc_header['size'];
-
-		$info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-
-		$thisfile_mpc_header['title_peak']        = $thisfile_mpc_header['raw']['title_peak'];
-		$thisfile_mpc_header['title_peak_db']     = $this->MPCpeakDBLookup($thisfile_mpc_header['title_peak']);
-		if ($thisfile_mpc_header['raw']['title_gain'] < 0) {
-			$thisfile_mpc_header['title_gain_db'] = (float) (32768 + $thisfile_mpc_header['raw']['title_gain']) / -100;
-		} else {
-			$thisfile_mpc_header['title_gain_db'] = (float) $thisfile_mpc_header['raw']['title_gain'] / 100;
-		}
-
-		$thisfile_mpc_header['album_peak']        = $thisfile_mpc_header['raw']['album_peak'];
-		$thisfile_mpc_header['album_peak_db']     = $this->MPCpeakDBLookup($thisfile_mpc_header['album_peak']);
-		if ($thisfile_mpc_header['raw']['album_gain'] < 0) {
-			$thisfile_mpc_header['album_gain_db'] = (float) (32768 + $thisfile_mpc_header['raw']['album_gain']) / -100;
-		} else {
-			$thisfile_mpc_header['album_gain_db'] = (float) $thisfile_mpc_header['raw']['album_gain'] / 100;;
-		}
-		$thisfile_mpc_header['encoder_version']   = $this->MPCencoderVersionLookup($thisfile_mpc_header['raw']['encoder_version']);
-
-		$info['replay_gain']['track']['adjustment'] = $thisfile_mpc_header['title_gain_db'];
-		$info['replay_gain']['album']['adjustment'] = $thisfile_mpc_header['album_gain_db'];
-
-		if ($thisfile_mpc_header['title_peak'] > 0) {
-			$info['replay_gain']['track']['peak'] = $thisfile_mpc_header['title_peak'];
-		} elseif (round($thisfile_mpc_header['max_level'] * 1.18) > 0) {
-			$info['replay_gain']['track']['peak'] = getid3_lib::CastAsInt(round($thisfile_mpc_header['max_level'] * 1.18)); // why? I don't know - see mppdec.c
-		}
-		if ($thisfile_mpc_header['album_peak'] > 0) {
-			$info['replay_gain']['album']['peak'] = $thisfile_mpc_header['album_peak'];
-		}
-
-		//$info['audio']['encoder'] = 'SV'.$thisfile_mpc_header['stream_version_major'].'.'.$thisfile_mpc_header['stream_version_minor'].', '.$thisfile_mpc_header['encoder_version'];
-		$info['audio']['encoder'] = $thisfile_mpc_header['encoder_version'];
-		$info['audio']['encoder_options'] = $thisfile_mpc_header['profile'];
-		$thisfile_mpc_header['quality'] = (float) ($thisfile_mpc_header['raw']['profile'] - 5); // values can range from 0 to 15, of which 0..4 are "reserved/experimental", and 5..15 are mapped to qualities of 0.0 to 10.0
-
-		return true;
-	}
-
-	function ParseMPCsv6() {
-		// this is SV4 - SV6
-
-		$info = &$this->getid3->info;
-		$thisfile_mpc_header = &$info['mpc']['header'];
-		$offset = 0;
-
-		$thisfile_mpc_header['size'] = 8;
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$MPCheaderData = fread($this->getid3->fp, $thisfile_mpc_header['size']);
-
-		// add size of file header to avdataoffset - calc bitrate correctly + MD5 data
-		$info['avdataoffset'] += $thisfile_mpc_header['size'];
-
-		// Most of this code adapted from Jurgen Faul's MPEGplus source code - thanks Jurgen! :)
-		$HeaderDWORD[0] = getid3_lib::LittleEndian2Int(substr($MPCheaderData, 0, 4));
-		$HeaderDWORD[1] = getid3_lib::LittleEndian2Int(substr($MPCheaderData, 4, 4));
-
-
-		// DDDD DDDD  CCCC CCCC  BBBB BBBB  AAAA AAAA
-		// aaaa aaaa  abcd dddd  dddd deee  eeff ffff
-		//
-		// a = bitrate       = anything
-		// b = IS            = anything
-		// c = MS            = anything
-		// d = streamversion = 0000000004 or 0000000005 or 0000000006
-		// e = maxband       = anything
-		// f = blocksize     = 000001 for SV5+, anything(?) for SV4
-
-		$thisfile_mpc_header['target_bitrate']       =        (($HeaderDWORD[0] & 0xFF800000) >> 23);
-		$thisfile_mpc_header['intensity_stereo']     = (bool) (($HeaderDWORD[0] & 0x00400000) >> 22);
-		$thisfile_mpc_header['mid_side_stereo']      = (bool) (($HeaderDWORD[0] & 0x00200000) >> 21);
-		$thisfile_mpc_header['stream_version_major'] =         ($HeaderDWORD[0] & 0x001FF800) >> 11;
-		$thisfile_mpc_header['stream_version_minor'] = 0; // no sub-version numbers before SV7
-		$thisfile_mpc_header['max_band']             =         ($HeaderDWORD[0] & 0x000007C0) >>  6;  // related to lowpass frequency, not sure how it translates exactly
-		$thisfile_mpc_header['block_size']           =         ($HeaderDWORD[0] & 0x0000003F);
-
-		switch ($thisfile_mpc_header['stream_version_major']) {
-			case 4:
-				$thisfile_mpc_header['frame_count'] = ($HeaderDWORD[1] >> 16);
-				break;
-
-			case 5:
-			case 6:
-				$thisfile_mpc_header['frame_count'] =  $HeaderDWORD[1];
-				break;
-
-			default:
-				$info['error'] = 'Expecting 4, 5 or 6 in version field, found '.$thisfile_mpc_header['stream_version_major'].' instead';
-				unset($info['mpc']);
-				return false;
-				break;
-		}
-
-		if (($thisfile_mpc_header['stream_version_major'] > 4) && ($thisfile_mpc_header['block_size'] != 1)) {
-			$info['warning'][] = 'Block size expected to be 1, actual value found: '.$thisfile_mpc_header['block_size'];
-		}
-
-		$thisfile_mpc_header['sample_rate']   = 44100; // AB: used by all files up to SV7
-		$info['audio']['sample_rate'] = $thisfile_mpc_header['sample_rate'];
-		$thisfile_mpc_header['samples']       = $thisfile_mpc_header['frame_count'] * 1152 * $info['audio']['channels'];
-
-		if ($thisfile_mpc_header['target_bitrate'] == 0) {
-			$info['audio']['bitrate_mode'] = 'vbr';
-		} else {
-			$info['audio']['bitrate_mode'] = 'cbr';
-		}
-
-		$info['mpc']['bitrate']   = ($info['avdataend'] - $info['avdataoffset']) * 8 * 44100 / $thisfile_mpc_header['frame_count'] / 1152;
-		$info['audio']['bitrate'] = $info['mpc']['bitrate'];
-		$info['audio']['encoder'] = 'SV'.$thisfile_mpc_header['stream_version_major'];
-
-		return true;
-	}
-
-
-	function MPCprofileNameLookup($profileid) {
-		static $MPCprofileNameLookup = array(
-			0  => 'no profile',
-			1  => 'Experimental',
-			2  => 'unused',
-			3  => 'unused',
-			4  => 'unused',
-			5  => 'below Telephone (q = 0.0)',
-			6  => 'below Telephone (q = 1.0)',
-			7  => 'Telephone (q = 2.0)',
-			8  => 'Thumb (q = 3.0)',
-			9  => 'Radio (q = 4.0)',
-			10 => 'Standard (q = 5.0)',
-			11 => 'Extreme (q = 6.0)',
-			12 => 'Insane (q = 7.0)',
-			13 => 'BrainDead (q = 8.0)',
-			14 => 'above BrainDead (q = 9.0)',
-			15 => 'above BrainDead (q = 10.0)'
-		);
-		return (isset($MPCprofileNameLookup[$profileid]) ? $MPCprofileNameLookup[$profileid] : 'invalid');
-	}
-
-	function MPCfrequencyLookup($frequencyid) {
-		static $MPCfrequencyLookup = array(
-			0 => 44100,
-			1 => 48000,
-			2 => 37800,
-			3 => 32000
-		);
-		return (isset($MPCfrequencyLookup[$frequencyid]) ? $MPCfrequencyLookup[$frequencyid] : 'invalid');
-	}
-
-	function MPCpeakDBLookup($intvalue) {
-		if ($intvalue > 0) {
-			return ((log10($intvalue) / log10(2)) - 15) * 6;
-		}
-		return false;
-	}
-
-	function MPCencoderVersionLookup($encoderversion) {
-		//Encoder version * 100  (106 = 1.06)
-		//EncoderVersion % 10 == 0        Release (1.0)
-		//EncoderVersion %  2 == 0        Beta (1.06)
-		//EncoderVersion %  2 == 1        Alpha (1.05a...z)
-
-		if ($encoderversion == 0) {
-			// very old version, not known exactly which
-			return 'Buschmann v1.7.0-v1.7.9 or Klemm v0.90-v1.05';
-		}
-
-		if (($encoderversion % 10) == 0) {
-
-			// release version
-			return number_format($encoderversion / 100, 2);
-
-		} elseif (($encoderversion % 2) == 0) {
-
-			// beta version
-			return number_format($encoderversion / 100, 2).' beta';
-
-		}
-
-		// alpha version
-		return number_format($encoderversion / 100, 2).' alpha';
-	}
-
-	function SV8variableLengthInteger($data, &$packetLength, $maxHandledPacketLength=9) {
-		$packet_size = 0;
-		for ($packetLength = 1; $packetLength <= $maxHandledPacketLength; $packetLength++) {
-			// variable-length size field:
-			//  bits, big-endian
-			//  0xxx xxxx                                           - value 0 to  2^7-1
-			//  1xxx xxxx  0xxx xxxx                                - value 0 to 2^14-1
-			//  1xxx xxxx  1xxx xxxx  0xxx xxxx                     - value 0 to 2^21-1
-			//  1xxx xxxx  1xxx xxxx  1xxx xxxx  0xxx xxxx          - value 0 to 2^28-1
-			//  ...
-			$thisbyte = ord(substr($data, ($packetLength - 1), 1));
-			// look through bytes until find a byte with MSB==0
-			$packet_size = ($packet_size << 7);
-			$packet_size = ($packet_size | ($thisbyte & 0x7F));
-			if (($thisbyte & 0x80) === 0) {
-				break;
-			}
-			if ($packetLength >= $maxHandledPacketLength) {
-				return false;
-			}
-		}
-		return $packet_size;
-	}
-
-	function MPCsv8PacketName($packetKey) {
-		static $MPCsv8PacketName = array();
-		if (empty($MPCsv8PacketName)) {
-			$MPCsv8PacketName = array(
-				'AP' => 'Audio Packet',
-				'CT' => 'Chapter Tag',
-				'EI' => 'Encoder Info',
-				'RG' => 'Replay Gain',
-				'SE' => 'Stream End',
-				'SH' => 'Stream Header',
-				'SO' => 'Seek Table Offset',
-				'ST' => 'Seek Table',
-			);
-		}
-		return (isset($MPCsv8PacketName[$packetKey]) ? $MPCsv8PacketName[$packetKey] : $packetKey);
-	}
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.ogg.php b/lib/getid3/getid3/module.audio.ogg.php
deleted file mode 100644
index c987fa67d..000000000
--- a/lib/getid3/getid3/module.audio.ogg.php
+++ /dev/null
@@ -1,705 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.ogg.php                                        //
-// module for analyzing Ogg Vorbis, OggFLAC and Speex files    //
-// dependencies: module.audio.flac.php                         //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.flac.php', __FILE__, true);
-
-class getid3_ogg extends getid3_handler
-{
-	var $inline_attachments = true; // true: return full data for all attachments; false: return no data for all attachments; integer: return data for attachments <= than this; string: save as file to this directory
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat'] = 'ogg';
-
-		// Warn about illegal tags - only vorbiscomments are allowed
-		if (isset($info['id3v2'])) {
-			$info['warning'][] = 'Illegal ID3v2 tag present.';
-		}
-		if (isset($info['id3v1'])) {
-			$info['warning'][] = 'Illegal ID3v1 tag present.';
-		}
-		if (isset($info['ape'])) {
-			$info['warning'][] = 'Illegal APE tag present.';
-		}
-
-
-		// Page 1 - Stream Header
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-
-		$oggpageinfo = $this->ParseOggPageHeader();
-		$info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
-
-		if (ftell($this->getid3->fp) >= $this->getid3->fread_buffer_size()) {
-			$info['error'][] = 'Could not find start of Ogg page in the first '.$this->getid3->fread_buffer_size().' bytes (this might not be an Ogg-Vorbis file?)';
-			unset($info['fileformat']);
-			unset($info['ogg']);
-			return false;
-		}
-
-		$filedata = fread($this->getid3->fp, $oggpageinfo['page_length']);
-		$filedataoffset = 0;
-
-		if (substr($filedata, 0, 4) == 'fLaC') {
-
-			$info['audio']['dataformat']   = 'flac';
-			$info['audio']['bitrate_mode'] = 'vbr';
-			$info['audio']['lossless']     = true;
-
-		} elseif (substr($filedata, 1, 6) == 'vorbis') {
-
-			$this->ParseVorbisPageHeader($filedata, $filedataoffset, $oggpageinfo);
-
-		} elseif (substr($filedata, 0, 8) == 'Speex   ') {
-
-			// http://www.speex.org/manual/node10.html
-
-			$info['audio']['dataformat']   = 'speex';
-			$info['mime_type']             = 'audio/speex';
-			$info['audio']['bitrate_mode'] = 'abr';
-			$info['audio']['lossless']     = false;
-
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_string']           =                              substr($filedata, $filedataoffset, 8); // hard-coded to 'Speex   '
-			$filedataoffset += 8;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_version']          =                              substr($filedata, $filedataoffset, 20);
-			$filedataoffset += 20;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_version_id']       = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-			$filedataoffset += 4;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['header_size']            = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-			$filedataoffset += 4;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['rate']                   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-			$filedataoffset += 4;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['mode']                   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-			$filedataoffset += 4;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['mode_bitstream_version'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-			$filedataoffset += 4;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['nb_channels']            = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-			$filedataoffset += 4;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['bitrate']                = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-			$filedataoffset += 4;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['framesize']              = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-			$filedataoffset += 4;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['vbr']                    = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-			$filedataoffset += 4;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['frames_per_packet']      = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-			$filedataoffset += 4;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['extra_headers']          = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-			$filedataoffset += 4;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['reserved1']              = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-			$filedataoffset += 4;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['reserved2']              = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-			$filedataoffset += 4;
-
-			$info['speex']['speex_version'] = trim($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_version']);
-			$info['speex']['sample_rate']   = $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['rate'];
-			$info['speex']['channels']      = $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['nb_channels'];
-			$info['speex']['vbr']           = (bool) $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['vbr'];
-			$info['speex']['band_type']     = $this->SpeexBandModeLookup($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['mode']);
-
-			$info['audio']['sample_rate']   = $info['speex']['sample_rate'];
-			$info['audio']['channels']      = $info['speex']['channels'];
-			if ($info['speex']['vbr']) {
-				$info['audio']['bitrate_mode'] = 'vbr';
-			}
-
-
-		} elseif (substr($filedata, 0, 8) == "fishead\x00") {
-
-			// Ogg Skeleton version 3.0 Format Specification
-			// http://xiph.org/ogg/doc/skeleton.html
-			$filedataoffset += 8;
-			$info['ogg']['skeleton']['fishead']['raw']['version_major']                = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  2));
-			$filedataoffset += 2;
-			$info['ogg']['skeleton']['fishead']['raw']['version_minor']                = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  2));
-			$filedataoffset += 2;
-			$info['ogg']['skeleton']['fishead']['raw']['presentationtime_numerator']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
-			$filedataoffset += 8;
-			$info['ogg']['skeleton']['fishead']['raw']['presentationtime_denominator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
-			$filedataoffset += 8;
-			$info['ogg']['skeleton']['fishead']['raw']['basetime_numerator']           = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
-			$filedataoffset += 8;
-			$info['ogg']['skeleton']['fishead']['raw']['basetime_denominator']         = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
-			$filedataoffset += 8;
-			$info['ogg']['skeleton']['fishead']['raw']['utc']                          = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 20));
-			$filedataoffset += 20;
-
-			$info['ogg']['skeleton']['fishead']['version']          = $info['ogg']['skeleton']['fishead']['raw']['version_major'].'.'.$info['ogg']['skeleton']['fishead']['raw']['version_minor'];
-			$info['ogg']['skeleton']['fishead']['presentationtime'] = $info['ogg']['skeleton']['fishead']['raw']['presentationtime_numerator'] / $info['ogg']['skeleton']['fishead']['raw']['presentationtime_denominator'];
-			$info['ogg']['skeleton']['fishead']['basetime']         = $info['ogg']['skeleton']['fishead']['raw']['basetime_numerator']         / $info['ogg']['skeleton']['fishead']['raw']['basetime_denominator'];
-			$info['ogg']['skeleton']['fishead']['utc']              = $info['ogg']['skeleton']['fishead']['raw']['utc'];
-
-
-			$counter = 0;
-			do {
-				$oggpageinfo = $this->ParseOggPageHeader();
-				$info['ogg']['pageheader'][$oggpageinfo['page_seqno'].'.'.$counter++] = $oggpageinfo;
-				$filedata = fread($this->getid3->fp, $oggpageinfo['page_length']);
-				fseek($this->getid3->fp, $oggpageinfo['page_end_offset'], SEEK_SET);
-
-				if (substr($filedata, 0, 8) == "fisbone\x00") {
-
-					$filedataoffset = 8;
-					$info['ogg']['skeleton']['fisbone']['raw']['message_header_offset']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  4));
-					$filedataoffset += 4;
-					$info['ogg']['skeleton']['fisbone']['raw']['serial_number']           = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  4));
-					$filedataoffset += 4;
-					$info['ogg']['skeleton']['fisbone']['raw']['number_header_packets']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  4));
-					$filedataoffset += 4;
-					$info['ogg']['skeleton']['fisbone']['raw']['granulerate_numerator']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
-					$filedataoffset += 8;
-					$info['ogg']['skeleton']['fisbone']['raw']['granulerate_denominator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
-					$filedataoffset += 8;
-					$info['ogg']['skeleton']['fisbone']['raw']['basegranule']             = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
-					$filedataoffset += 8;
-					$info['ogg']['skeleton']['fisbone']['raw']['preroll']                 = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  4));
-					$filedataoffset += 4;
-					$info['ogg']['skeleton']['fisbone']['raw']['granuleshift']            = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  1));
-					$filedataoffset += 1;
-					$info['ogg']['skeleton']['fisbone']['raw']['padding']                 =                              substr($filedata, $filedataoffset,  3);
-					$filedataoffset += 3;
-
-				} elseif (substr($filedata, 1, 6) == 'theora') {
-
-					$info['video']['dataformat'] = 'theora';
-$info['error'][] = 'Ogg Theora not correctly handled in this version of getID3 ['.$this->getid3->version().']';
-//break;
-
-				} elseif (substr($filedata, 1, 6) == 'vorbis') {
-
-					$this->ParseVorbisPageHeader($filedata, $filedataoffset, $oggpageinfo);
-
-				} else {
-$info['error'][] = 'unexpected';
-//break;
-				}
-			//} while ($oggpageinfo['page_seqno'] == 0);
-			} while (($oggpageinfo['page_seqno'] == 0) && (substr($filedata, 0, 8) != "fisbone\x00"));
-			fseek($this->getid3->fp, $oggpageinfo['page_start_offset'], SEEK_SET);
-
-
-$info['error'][] = 'Ogg Skeleton not correctly handled in this version of getID3 ['.$this->getid3->version().']';
-//return false;
-
-
-		} else {
-
-			$info['error'][] = 'Expecting either "Speex   " or "vorbis" identifier strings, found "'.substr($filedata, 0, 8).'"';
-			unset($info['ogg']);
-			unset($info['mime_type']);
-			return false;
-
-		}
-
-		// Page 2 - Comment Header
-		$oggpageinfo = $this->ParseOggPageHeader();
-		$info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
-
-		switch ($info['audio']['dataformat']) {
-			case 'vorbis':
-				$filedata = fread($this->getid3->fp, $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
-				$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['packet_type'] = getid3_lib::LittleEndian2Int(substr($filedata, 0, 1));
-				$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] =                              substr($filedata, 1, 6); // hard-coded to 'vorbis'
-
-				$this->ParseVorbisCommentsFilepointer();
-				break;
-
-			case 'flac':
-				$getid3_flac = new getid3_flac($this->getid3);
-				if (!$getid3_flac->FLACparseMETAdata()) {
-					$info['error'][] = 'Failed to parse FLAC headers';
-					return false;
-				}
-				unset($getid3_flac);
-				break;
-
-			case 'speex':
-				fseek($this->getid3->fp, $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length'], SEEK_CUR);
-				$this->ParseVorbisCommentsFilepointer();
-				break;
-
-		}
-
-
-
-		// Last Page - Number of Samples
-
-		if (!getid3_lib::intValueSupported($info['avdataend'])) {
-
-			$info['warning'][] = 'Unable to parse Ogg end chunk file (PHP does not support file operations beyond '.round(PHP_INT_MAX / 1073741824).'GB)';
-
-		} else {
-
-			fseek($this->getid3->fp, max($info['avdataend'] - $this->getid3->fread_buffer_size(), 0), SEEK_SET);
-			$LastChunkOfOgg = strrev(fread($this->getid3->fp, $this->getid3->fread_buffer_size()));
-			if ($LastOggSpostion = strpos($LastChunkOfOgg, 'SggO')) {
-				fseek($this->getid3->fp, $info['avdataend'] - ($LastOggSpostion + strlen('SggO')), SEEK_SET);
-				$info['avdataend'] = ftell($this->getid3->fp);
-				$info['ogg']['pageheader']['eos'] = $this->ParseOggPageHeader();
-				$info['ogg']['samples']   = $info['ogg']['pageheader']['eos']['pcm_abs_position'];
-				if ($info['ogg']['samples'] == 0) {
-					$info['error'][] = 'Corrupt Ogg file: eos.number of samples == zero';
-					return false;
-				}
-				if (!empty($info['audio']['sample_rate'])) {
-					$info['ogg']['bitrate_average'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / ($info['ogg']['samples'] / $info['audio']['sample_rate']);
-				}
-			}
-
-		}
-
-		if (!empty($info['ogg']['bitrate_average'])) {
-			$info['audio']['bitrate'] = $info['ogg']['bitrate_average'];
-		} elseif (!empty($info['ogg']['bitrate_nominal'])) {
-			$info['audio']['bitrate'] = $info['ogg']['bitrate_nominal'];
-		} elseif (!empty($info['ogg']['bitrate_min']) && !empty($info['ogg']['bitrate_max'])) {
-			$info['audio']['bitrate'] = ($info['ogg']['bitrate_min'] + $info['ogg']['bitrate_max']) / 2;
-		}
-		if (isset($info['audio']['bitrate']) && !isset($info['playtime_seconds'])) {
-			if ($info['audio']['bitrate'] == 0) {
-				$info['error'][] = 'Corrupt Ogg file: bitrate_audio == zero';
-				return false;
-			}
-			$info['playtime_seconds'] = (float) ((($info['avdataend'] - $info['avdataoffset']) * 8) / $info['audio']['bitrate']);
-		}
-
-		if (isset($info['ogg']['vendor'])) {
-			$info['audio']['encoder'] = preg_replace('/^Encoded with /', '', $info['ogg']['vendor']);
-
-			// Vorbis only
-			if ($info['audio']['dataformat'] == 'vorbis') {
-
-				// Vorbis 1.0 starts with Xiph.Org
-				if  (preg_match('/^Xiph.Org/', $info['audio']['encoder'])) {
-
-					if ($info['audio']['bitrate_mode'] == 'abr') {
-
-						// Set -b 128 on abr files
-						$info['audio']['encoder_options'] = '-b '.round($info['ogg']['bitrate_nominal'] / 1000);
-
-					} elseif (($info['audio']['bitrate_mode'] == 'vbr') && ($info['audio']['channels'] == 2) && ($info['audio']['sample_rate'] >= 44100) && ($info['audio']['sample_rate'] <= 48000)) {
-						// Set -q N on vbr files
-						$info['audio']['encoder_options'] = '-q '.$this->get_quality_from_nominal_bitrate($info['ogg']['bitrate_nominal']);
-
-					}
-				}
-
-				if (empty($info['audio']['encoder_options']) && !empty($info['ogg']['bitrate_nominal'])) {
-					$info['audio']['encoder_options'] = 'Nominal bitrate: '.intval(round($info['ogg']['bitrate_nominal'] / 1000)).'kbps';
-				}
-			}
-		}
-
-		return true;
-	}
-
-	function ParseVorbisPageHeader(&$filedata, &$filedataoffset, &$oggpageinfo) {
-		$info = &$this->getid3->info;
-		$info['audio']['dataformat'] = 'vorbis';
-		$info['audio']['lossless']   = false;
-
-		$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['packet_type'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
-		$filedataoffset += 1;
-		$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] = substr($filedata, $filedataoffset, 6); // hard-coded to 'vorbis'
-		$filedataoffset += 6;
-		$info['ogg']['bitstreamversion'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-		$filedataoffset += 4;
-		$info['ogg']['numberofchannels'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
-		$filedataoffset += 1;
-		$info['audio']['channels']       = $info['ogg']['numberofchannels'];
-		$info['ogg']['samplerate']       = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-		$filedataoffset += 4;
-		if ($info['ogg']['samplerate'] == 0) {
-			$info['error'][] = 'Corrupt Ogg file: sample rate == zero';
-			return false;
-		}
-		$info['audio']['sample_rate']    = $info['ogg']['samplerate'];
-		$info['ogg']['samples']          = 0; // filled in later
-		$info['ogg']['bitrate_average']  = 0; // filled in later
-		$info['ogg']['bitrate_max']      = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-		$filedataoffset += 4;
-		$info['ogg']['bitrate_nominal']  = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-		$filedataoffset += 4;
-		$info['ogg']['bitrate_min']      = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-		$filedataoffset += 4;
-		$info['ogg']['blocksize_small']  = pow(2,  getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)) & 0x0F);
-		$info['ogg']['blocksize_large']  = pow(2, (getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)) & 0xF0) >> 4);
-		$info['ogg']['stop_bit']         = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)); // must be 1, marks end of packet
-
-		$info['audio']['bitrate_mode'] = 'vbr'; // overridden if actually abr
-		if ($info['ogg']['bitrate_max'] == 0xFFFFFFFF) {
-			unset($info['ogg']['bitrate_max']);
-			$info['audio']['bitrate_mode'] = 'abr';
-		}
-		if ($info['ogg']['bitrate_nominal'] == 0xFFFFFFFF) {
-			unset($info['ogg']['bitrate_nominal']);
-		}
-		if ($info['ogg']['bitrate_min'] == 0xFFFFFFFF) {
-			unset($info['ogg']['bitrate_min']);
-			$info['audio']['bitrate_mode'] = 'abr';
-		}
-		return true;
-	}
-
-	function ParseOggPageHeader() {
-		// http://xiph.org/ogg/vorbis/doc/framing.html
-		$oggheader['page_start_offset'] = ftell($this->getid3->fp); // where we started from in the file
-
-		$filedata = fread($this->getid3->fp, $this->getid3->fread_buffer_size());
-		$filedataoffset = 0;
-		while ((substr($filedata, $filedataoffset++, 4) != 'OggS')) {
-			if ((ftell($this->getid3->fp) - $oggheader['page_start_offset']) >= $this->getid3->fread_buffer_size()) {
-				// should be found before here
-				return false;
-			}
-			if ((($filedataoffset + 28) > strlen($filedata)) || (strlen($filedata) < 28)) {
-				if (feof($this->getid3->fp) || (($filedata .= fread($this->getid3->fp, $this->getid3->fread_buffer_size())) === false)) {
-					// get some more data, unless eof, in which case fail
-					return false;
-				}
-			}
-		}
-		$filedataoffset += strlen('OggS') - 1; // page, delimited by 'OggS'
-
-		$oggheader['stream_structver']  = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
-		$filedataoffset += 1;
-		$oggheader['flags_raw']         = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
-		$filedataoffset += 1;
-		$oggheader['flags']['fresh']    = (bool) ($oggheader['flags_raw'] & 0x01); // fresh packet
-		$oggheader['flags']['bos']      = (bool) ($oggheader['flags_raw'] & 0x02); // first page of logical bitstream (bos)
-		$oggheader['flags']['eos']      = (bool) ($oggheader['flags_raw'] & 0x04); // last page of logical bitstream (eos)
-
-		$oggheader['pcm_abs_position']  = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
-		$filedataoffset += 8;
-		$oggheader['stream_serialno']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-		$filedataoffset += 4;
-		$oggheader['page_seqno']        = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-		$filedataoffset += 4;
-		$oggheader['page_checksum']     = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
-		$filedataoffset += 4;
-		$oggheader['page_segments']     = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
-		$filedataoffset += 1;
-		$oggheader['page_length'] = 0;
-		for ($i = 0; $i < $oggheader['page_segments']; $i++) {
-			$oggheader['segment_table'][$i] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
-			$filedataoffset += 1;
-			$oggheader['page_length'] += $oggheader['segment_table'][$i];
-		}
-		$oggheader['header_end_offset'] = $oggheader['page_start_offset'] + $filedataoffset;
-		$oggheader['page_end_offset']   = $oggheader['header_end_offset'] + $oggheader['page_length'];
-		fseek($this->getid3->fp, $oggheader['header_end_offset'], SEEK_SET);
-
-		return $oggheader;
-	}
-
-
-	function ParseVorbisCommentsFilepointer() {
-		$info = &$this->getid3->info;
-
-		$OriginalOffset = ftell($this->getid3->fp);
-		$commentdataoffset = 0;
-		$VorbisCommentPage = 1;
-
-		switch ($info['audio']['dataformat']) {
-			case 'vorbis':
-				$CommentStartOffset = $info['ogg']['pageheader'][$VorbisCommentPage]['page_start_offset'];  // Second Ogg page, after header block
-				fseek($this->getid3->fp, $CommentStartOffset, SEEK_SET);
-				$commentdataoffset = 27 + $info['ogg']['pageheader'][$VorbisCommentPage]['page_segments'];
-				$commentdata = fread($this->getid3->fp, getid3_ogg::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1) + $commentdataoffset);
-
-				$commentdataoffset += (strlen('vorbis') + 1);
-				break;
-
-			case 'flac':
-				$CommentStartOffset = $info['flac']['VORBIS_COMMENT']['raw']['offset'] + 4;
-				fseek($this->getid3->fp, $CommentStartOffset, SEEK_SET);
-				$commentdata = fread($this->getid3->fp, $info['flac']['VORBIS_COMMENT']['raw']['block_length']);
-				break;
-
-			case 'speex':
-				$CommentStartOffset = $info['ogg']['pageheader'][$VorbisCommentPage]['page_start_offset'];  // Second Ogg page, after header block
-				fseek($this->getid3->fp, $CommentStartOffset, SEEK_SET);
-				$commentdataoffset = 27 + $info['ogg']['pageheader'][$VorbisCommentPage]['page_segments'];
-				$commentdata = fread($this->getid3->fp, getid3_ogg::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1) + $commentdataoffset);
-				break;
-
-			default:
-				return false;
-				break;
-		}
-
-		$VendorSize = getid3_lib::LittleEndian2Int(substr($commentdata, $commentdataoffset, 4));
-		$commentdataoffset += 4;
-
-		$info['ogg']['vendor'] = substr($commentdata, $commentdataoffset, $VendorSize);
-		$commentdataoffset += $VendorSize;
-
-		$CommentsCount = getid3_lib::LittleEndian2Int(substr($commentdata, $commentdataoffset, 4));
-		$commentdataoffset += 4;
-		$info['avdataoffset'] = $CommentStartOffset + $commentdataoffset;
-
-		$basicfields = array('TITLE', 'ARTIST', 'ALBUM', 'TRACKNUMBER', 'GENRE', 'DATE', 'DESCRIPTION', 'COMMENT');
-		$ThisFileInfo_ogg_comments_raw = &$info['ogg']['comments_raw'];
-		for ($i = 0; $i < $CommentsCount; $i++) {
-
-			$ThisFileInfo_ogg_comments_raw[$i]['dataoffset'] = $CommentStartOffset + $commentdataoffset;
-
-			if (ftell($this->getid3->fp) < ($ThisFileInfo_ogg_comments_raw[$i]['dataoffset'] + 4)) {
-				if ($oggpageinfo = $this->ParseOggPageHeader()) {
-					$info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
-
-					$VorbisCommentPage++;
-
-					// First, save what we haven't read yet
-					$AsYetUnusedData = substr($commentdata, $commentdataoffset);
-
-					// Then take that data off the end
-					$commentdata     = substr($commentdata, 0, $commentdataoffset);
-
-					// Add [headerlength] bytes of dummy data for the Ogg Page Header, just to keep absolute offsets correct
-					$commentdata .= str_repeat("\x00", 27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
-					$commentdataoffset += (27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
-
-					// Finally, stick the unused data back on the end
-					$commentdata .= $AsYetUnusedData;
-
-					//$commentdata .= fread($this->getid3->fp, $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
-					$commentdata .= fread($this->getid3->fp, $this->OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1));
-				}
-
-			}
-			$ThisFileInfo_ogg_comments_raw[$i]['size'] = getid3_lib::LittleEndian2Int(substr($commentdata, $commentdataoffset, 4));
-
-			// replace avdataoffset with position just after the last vorbiscomment
-			$info['avdataoffset'] = $ThisFileInfo_ogg_comments_raw[$i]['dataoffset'] + $ThisFileInfo_ogg_comments_raw[$i]['size'] + 4;
-
-			$commentdataoffset += 4;
-			while ((strlen($commentdata) - $commentdataoffset) < $ThisFileInfo_ogg_comments_raw[$i]['size']) {
-				if (($ThisFileInfo_ogg_comments_raw[$i]['size'] > $info['avdataend']) || ($ThisFileInfo_ogg_comments_raw[$i]['size'] < 0)) {
-					$info['warning'][] = 'Invalid Ogg comment size (comment #'.$i.', claims to be '.number_format($ThisFileInfo_ogg_comments_raw[$i]['size']).' bytes) - aborting reading comments';
-					break 2;
-				}
-
-				$VorbisCommentPage++;
-
-				$oggpageinfo = $this->ParseOggPageHeader();
-				$info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
-
-				// First, save what we haven't read yet
-				$AsYetUnusedData = substr($commentdata, $commentdataoffset);
-
-				// Then take that data off the end
-				$commentdata     = substr($commentdata, 0, $commentdataoffset);
-
-				// Add [headerlength] bytes of dummy data for the Ogg Page Header, just to keep absolute offsets correct
-				$commentdata .= str_repeat("\x00", 27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
-				$commentdataoffset += (27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
-
-				// Finally, stick the unused data back on the end
-				$commentdata .= $AsYetUnusedData;
-
-				//$commentdata .= fread($this->getid3->fp, $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
-				if (!isset($info['ogg']['pageheader'][$VorbisCommentPage])) {
-					$info['warning'][] = 'undefined Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.ftell($this->getid3->fp);
-					break;
-				}
-				$readlength = getid3_ogg::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1);
-				if ($readlength <= 0) {
-					$info['warning'][] = 'invalid length Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.ftell($this->getid3->fp);
-					break;
-				}
-				$commentdata .= fread($this->getid3->fp, $readlength);
-
-				//$filebaseoffset += $oggpageinfo['header_end_offset'] - $oggpageinfo['page_start_offset'];
-			}
-			$ThisFileInfo_ogg_comments_raw[$i]['offset'] = $commentdataoffset;
-			$commentstring = substr($commentdata, $commentdataoffset, $ThisFileInfo_ogg_comments_raw[$i]['size']);
-			$commentdataoffset += $ThisFileInfo_ogg_comments_raw[$i]['size'];
-
-			if (!$commentstring) {
-
-				// no comment?
-				$info['warning'][] = 'Blank Ogg comment ['.$i.']';
-
-			} elseif (strstr($commentstring, '=')) {
-
-				$commentexploded = explode('=', $commentstring, 2);
-				$ThisFileInfo_ogg_comments_raw[$i]['key']         = strtoupper($commentexploded[0]);
-				$ThisFileInfo_ogg_comments_raw[$i]['value']       = (isset($commentexploded[1]) ? $commentexploded[1] : '');
-				$ThisFileInfo_ogg_comments_raw[$i]['data']        = base64_decode($ThisFileInfo_ogg_comments_raw[$i]['value']);
-				$ThisFileInfo_ogg_comments_raw[$i]['data_length'] = strlen($ThisFileInfo_ogg_comments_raw[$i]['data']);
-
-				if (preg_match('#^(BM|GIF|\xFF\xD8\xFF|\x89\x50\x4E\x47\x0D\x0A\x1A\x0A|II\x2A\x00|MM\x00\x2A)#s', $ThisFileInfo_ogg_comments_raw[$i]['data'])) {
-					$imageinfo = array();
-					$imagechunkcheck = getid3_lib::GetDataImageSize($ThisFileInfo_ogg_comments_raw[$i]['data'], $imageinfo);
-					unset($imageinfo);
-					if (!empty($imagechunkcheck)) {
-						$ThisFileInfo_ogg_comments_raw[$i]['image_mime'] = image_type_to_mime_type($imagechunkcheck[2]);
-						if ($ThisFileInfo_ogg_comments_raw[$i]['image_mime'] && ($ThisFileInfo_ogg_comments_raw[$i]['image_mime'] != 'application/octet-stream')) {
-							unset($ThisFileInfo_ogg_comments_raw[$i]['value']);
-						}
-					}
-				}
-
-				if (isset($ThisFileInfo_ogg_comments_raw[$i]['value'])) {
-					unset($ThisFileInfo_ogg_comments_raw[$i]['data']);
-					$info['ogg']['comments'][strtolower($ThisFileInfo_ogg_comments_raw[$i]['key'])][] = $ThisFileInfo_ogg_comments_raw[$i]['value'];
-				} else {
-					do {
-						if ($this->inline_attachments === false) {
-							// skip entirely
-							unset($ThisFileInfo_ogg_comments_raw[$i]['data']);
-							break;
-						}
-						if ($this->inline_attachments === true) {
-							// great
-						} elseif (is_int($this->inline_attachments)) {
-							if ($this->inline_attachments < $ThisFileInfo_ogg_comments_raw[$i]['data_length']) {
-								// too big, skip
-								$info['warning'][] = 'attachment at '.$ThisFileInfo_ogg_comments_raw[$i]['offset'].' is too large to process inline ('.number_format($ThisFileInfo_ogg_comments_raw[$i]['data_length']).' bytes)';
-								unset($ThisFileInfo_ogg_comments_raw[$i]['data']);
-								break;
-							}
-						} elseif (is_string($this->inline_attachments)) {
-							$this->inline_attachments = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->inline_attachments), DIRECTORY_SEPARATOR);
-							if (!is_dir($this->inline_attachments) || !is_writable($this->inline_attachments)) {
-								// cannot write, skip
-								$info['warning'][] = 'attachment at '.$ThisFileInfo_ogg_comments_raw[$i]['offset'].' cannot be saved to "'.$this->inline_attachments.'" (not writable)';
-								unset($ThisFileInfo_ogg_comments_raw[$i]['data']);
-								break;
-							}
-						}
-						// if we get this far, must be OK
-						if (is_string($this->inline_attachments)) {
-							$destination_filename = $this->inline_attachments.DIRECTORY_SEPARATOR.md5($info['filenamepath']).'_'.$ThisFileInfo_ogg_comments_raw[$i]['offset'];
-							if (!file_exists($destination_filename) || is_writable($destination_filename)) {
-								file_put_contents($destination_filename, $ThisFileInfo_ogg_comments_raw[$i]['data']);
-							} else {
-								$info['warning'][] = 'attachment at '.$ThisFileInfo_ogg_comments_raw[$i]['offset'].' cannot be saved to "'.$destination_filename.'" (not writable)';
-							}
-							$ThisFileInfo_ogg_comments_raw[$i]['data_filename'] = $destination_filename;
-							unset($ThisFileInfo_ogg_comments_raw[$i]['data']);
-						} else {
-							$info['ogg']['comments']['picture'][] = array('data'=>$ThisFileInfo_ogg_comments_raw[$i]['data'], 'image_mime'=>$ThisFileInfo_ogg_comments_raw[$i]['image_mime']);
-						}
-					} while (false);
-
-				}
-
-
-			} else {
-
-				$info['warning'][] = '[known problem with CDex >= v1.40, < v1.50b7] Invalid Ogg comment name/value pair ['.$i.']: '.$commentstring;
-
-			}
-		}
-
-
-		// Replay Gain Adjustment
-		// http://privatewww.essex.ac.uk/~djmrob/replaygain/
-		if (isset($info['ogg']['comments']) && is_array($info['ogg']['comments'])) {
-			foreach ($info['ogg']['comments'] as $index => $commentvalue) {
-				switch ($index) {
-					case 'rg_audiophile':
-					case 'replaygain_album_gain':
-						$info['replay_gain']['album']['adjustment'] = (double) $commentvalue[0];
-						unset($info['ogg']['comments'][$index]);
-						break;
-
-					case 'rg_radio':
-					case 'replaygain_track_gain':
-						$info['replay_gain']['track']['adjustment'] = (double) $commentvalue[0];
-						unset($info['ogg']['comments'][$index]);
-						break;
-
-					case 'replaygain_album_peak':
-						$info['replay_gain']['album']['peak'] = (double) $commentvalue[0];
-						unset($info['ogg']['comments'][$index]);
-						break;
-
-					case 'rg_peak':
-					case 'replaygain_track_peak':
-						$info['replay_gain']['track']['peak'] = (double) $commentvalue[0];
-						unset($info['ogg']['comments'][$index]);
-						break;
-
-					case 'replaygain_reference_loudness':
-						$info['replay_gain']['reference_volume'] = (double) $commentvalue[0];
-						unset($info['ogg']['comments'][$index]);
-						break;
-
-					default:
-						// do nothing
-						break;
-				}
-			}
-		}
-
-		fseek($this->getid3->fp, $OriginalOffset, SEEK_SET);
-
-		return true;
-	}
-
-	static function SpeexBandModeLookup($mode) {
-		static $SpeexBandModeLookup = array();
-		if (empty($SpeexBandModeLookup)) {
-			$SpeexBandModeLookup[0] = 'narrow';
-			$SpeexBandModeLookup[1] = 'wide';
-			$SpeexBandModeLookup[2] = 'ultra-wide';
-		}
-		return (isset($SpeexBandModeLookup[$mode]) ? $SpeexBandModeLookup[$mode] : null);
-	}
-
-
-	static function OggPageSegmentLength($OggInfoArray, $SegmentNumber=1) {
-		for ($i = 0; $i < $SegmentNumber; $i++) {
-			$segmentlength = 0;
-			foreach ($OggInfoArray['segment_table'] as $key => $value) {
-				$segmentlength += $value;
-				if ($value < 255) {
-					break;
-				}
-			}
-		}
-		return $segmentlength;
-	}
-
-
-	static function get_quality_from_nominal_bitrate($nominal_bitrate) {
-
-		// decrease precision
-		$nominal_bitrate = $nominal_bitrate / 1000;
-
-		if ($nominal_bitrate < 128) {
-			// q-1 to q4
-			$qval = ($nominal_bitrate - 64) / 16;
-		} elseif ($nominal_bitrate < 256) {
-			// q4 to q8
-			$qval = $nominal_bitrate / 32;
-		} elseif ($nominal_bitrate < 320) {
-			// q8 to q9
-			$qval = ($nominal_bitrate + 256) / 64;
-		} else {
-			// q9 to q10
-			$qval = ($nominal_bitrate + 1300) / 180;
-		}
-		//return $qval; // 5.031324
-		//return intval($qval); // 5
-		return round($qval, 1); // 5 or 4.9
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.optimfrog.php b/lib/getid3/getid3/module.audio.optimfrog.php
deleted file mode 100644
index c1c896383..000000000
--- a/lib/getid3/getid3/module.audio.optimfrog.php
+++ /dev/null
@@ -1,429 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.optimfrog.php                                  //
-// module for analyzing OptimFROG audio files                  //
-// dependencies: module.audio.riff.php                         //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
-
-class getid3_optimfrog extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat']            = 'ofr';
-		$info['audio']['dataformat']   = 'ofr';
-		$info['audio']['bitrate_mode'] = 'vbr';
-		$info['audio']['lossless']     = true;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$OFRheader  = fread($this->getid3->fp, 8);
-		if (substr($OFRheader, 0, 5) == '*RIFF') {
-
-			return $this->ParseOptimFROGheader42();
-
-		} elseif (substr($OFRheader, 0, 3) == 'OFR') {
-
-			return $this->ParseOptimFROGheader45();
-
-		}
-
-		$info['error'][] = 'Expecting "*RIFF" or "OFR " at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($OFRheader).'"';
-		unset($info['fileformat']);
-		return false;
-	}
-
-
-	function ParseOptimFROGheader42() {
-		// for fileformat of v4.21 and older
-
-		$info = &$this->getid3->info;
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$OptimFROGheaderData = fread($this->getid3->fp, 45);
-		$info['avdataoffset'] = 45;
-
-		$OptimFROGencoderVersion_raw   = getid3_lib::LittleEndian2Int(substr($OptimFROGheaderData, 0, 1));
-		$OptimFROGencoderVersion_major = floor($OptimFROGencoderVersion_raw / 10);
-		$OptimFROGencoderVersion_minor = $OptimFROGencoderVersion_raw - ($OptimFROGencoderVersion_major * 10);
-		$RIFFdata                = substr($OptimFROGheaderData, 1, 44);
-		$OrignalRIFFheaderSize   = getid3_lib::LittleEndian2Int(substr($RIFFdata,  4, 4)) +  8;
-		$OrignalRIFFdataSize     = getid3_lib::LittleEndian2Int(substr($RIFFdata, 40, 4)) + 44;
-
-		if ($OrignalRIFFheaderSize > $OrignalRIFFdataSize) {
-			$info['avdataend'] -= ($OrignalRIFFheaderSize - $OrignalRIFFdataSize);
-			fseek($this->getid3->fp, $info['avdataend'], SEEK_SET);
-			$RIFFdata .= fread($this->getid3->fp, $OrignalRIFFheaderSize - $OrignalRIFFdataSize);
-		}
-
-		// move the data chunk after all other chunks (if any)
-		// so that the RIFF parser doesn't see EOF when trying
-		// to skip over the data chunk
-		$RIFFdata = substr($RIFFdata, 0, 36).substr($RIFFdata, 44).substr($RIFFdata, 36, 8);
-
-		$getid3_temp = new getID3();
-		$getid3_temp->openfile($this->getid3->filename);
-		$getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
-		$getid3_temp->info['avdataend']    = $info['avdataend'];
-		$getid3_riff = new getid3_riff($getid3_temp);
-		$getid3_riff->ParseRIFFdata($RIFFdata);
-		$info['riff'] = $getid3_temp->info['riff'];
-
-		$info['audio']['encoder']         = 'OptimFROG '.$OptimFROGencoderVersion_major.'.'.$OptimFROGencoderVersion_minor;
-		$info['audio']['channels']        = $info['riff']['audio'][0]['channels'];
-		$info['audio']['sample_rate']     = $info['riff']['audio'][0]['sample_rate'];
-		$info['audio']['bits_per_sample'] = $info['riff']['audio'][0]['bits_per_sample'];
-		$info['playtime_seconds']         = $OrignalRIFFdataSize / ($info['audio']['channels'] * $info['audio']['sample_rate'] * ($info['audio']['bits_per_sample'] / 8));
-		$info['audio']['bitrate']         = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-
-		unset($getid3_riff, $getid3_temp, $RIFFdata);
-
-		return true;
-	}
-
-
-	function ParseOptimFROGheader45() {
-		// for fileformat of v4.50a and higher
-
-		$info = &$this->getid3->info;
-		$RIFFdata = '';
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		while (!feof($this->getid3->fp) && (ftell($this->getid3->fp) < $info['avdataend'])) {
-			$BlockOffset = ftell($this->getid3->fp);
-			$BlockData   = fread($this->getid3->fp, 8);
-			$offset      = 8;
-			$BlockName   =                  substr($BlockData, 0, 4);
-			$BlockSize   = getid3_lib::LittleEndian2Int(substr($BlockData, 4, 4));
-
-			if ($BlockName == 'OFRX') {
-				$BlockName = 'OFR ';
-			}
-			if (!isset($info['ofr'][$BlockName])) {
-				$info['ofr'][$BlockName] = array();
-			}
-			$thisfile_ofr_thisblock = &$info['ofr'][$BlockName];
-
-			switch ($BlockName) {
-				case 'OFR ':
-
-					// shortcut
-					$thisfile_ofr_thisblock['offset'] = $BlockOffset;
-					$thisfile_ofr_thisblock['size']   = $BlockSize;
-
-					$info['audio']['encoder'] = 'OptimFROG 4.50 alpha';
-					switch ($BlockSize) {
-						case 12:
-						case 15:
-							// good
-							break;
-
-						default:
-							$info['warning'][] = '"'.$BlockName.'" contains more data than expected (expected 12 or 15 bytes, found '.$BlockSize.' bytes)';
-							break;
-					}
-					$BlockData .= fread($this->getid3->fp, $BlockSize);
-
-					$thisfile_ofr_thisblock['total_samples']      = getid3_lib::LittleEndian2Int(substr($BlockData, $offset, 6));
-					$offset += 6;
-					$thisfile_ofr_thisblock['raw']['sample_type'] = getid3_lib::LittleEndian2Int(substr($BlockData, $offset, 1));
-					$thisfile_ofr_thisblock['sample_type']        = $this->OptimFROGsampleTypeLookup($thisfile_ofr_thisblock['raw']['sample_type']);
-					$offset += 1;
-					$thisfile_ofr_thisblock['channel_config']     = getid3_lib::LittleEndian2Int(substr($BlockData, $offset, 1));
-					$thisfile_ofr_thisblock['channels']           = $thisfile_ofr_thisblock['channel_config'];
-					$offset += 1;
-					$thisfile_ofr_thisblock['sample_rate']        = getid3_lib::LittleEndian2Int(substr($BlockData, $offset, 4));
-					$offset += 4;
-
-					if ($BlockSize > 12) {
-
-						// OFR 4.504b or higher
-						$thisfile_ofr_thisblock['channels']           = $this->OptimFROGchannelConfigNumChannelsLookup($thisfile_ofr_thisblock['channel_config']);
-						$thisfile_ofr_thisblock['raw']['encoder_id']  = getid3_lib::LittleEndian2Int(substr($BlockData, $offset, 2));
-						$thisfile_ofr_thisblock['encoder']            = $this->OptimFROGencoderNameLookup($thisfile_ofr_thisblock['raw']['encoder_id']);
-						$offset += 2;
-						$thisfile_ofr_thisblock['raw']['compression'] = getid3_lib::LittleEndian2Int(substr($BlockData, $offset, 1));
-						$thisfile_ofr_thisblock['compression']        = $this->OptimFROGcompressionLookup($thisfile_ofr_thisblock['raw']['compression']);
-						$thisfile_ofr_thisblock['speedup']            = $this->OptimFROGspeedupLookup($thisfile_ofr_thisblock['raw']['compression']);
-						$offset += 1;
-
-						$info['audio']['encoder']         = 'OptimFROG '.$thisfile_ofr_thisblock['encoder'];
-						$info['audio']['encoder_options'] = '--mode '.$thisfile_ofr_thisblock['compression'];
-
-						if ((($thisfile_ofr_thisblock['raw']['encoder_id'] & 0xF0) >> 4) == 7) { // v4.507
-							if (strtolower(getid3_lib::fileextension($info['filename'])) == 'ofs') {
-								// OptimFROG DualStream format is lossy, but as of v4.507 there is no way to tell the difference
-								// between lossless and lossy other than the file extension.
-								$info['audio']['dataformat']   = 'ofs';
-								$info['audio']['lossless']     = true;
-							}
-						}
-
-					}
-
-					$info['audio']['channels']        = $thisfile_ofr_thisblock['channels'];
-					$info['audio']['sample_rate']     = $thisfile_ofr_thisblock['sample_rate'];
-					$info['audio']['bits_per_sample'] = $this->OptimFROGbitsPerSampleTypeLookup($thisfile_ofr_thisblock['raw']['sample_type']);
-					break;
-
-
-				case 'COMP':
-					// unlike other block types, there CAN be multiple COMP blocks
-
-					$COMPdata['offset'] = $BlockOffset;
-					$COMPdata['size']   = $BlockSize;
-
-					if ($info['avdataoffset'] == 0) {
-						$info['avdataoffset'] = $BlockOffset;
-					}
-
-					// Only interested in first 14 bytes (only first 12 needed for v4.50 alpha), not actual audio data
-					$BlockData .= fread($this->getid3->fp, 14);
-					fseek($this->getid3->fp, $BlockSize - 14, SEEK_CUR);
-
-					$COMPdata['crc_32']                       = getid3_lib::LittleEndian2Int(substr($BlockData, $offset, 4));
-					$offset += 4;
-					$COMPdata['sample_count']                 = getid3_lib::LittleEndian2Int(substr($BlockData, $offset, 4));
-					$offset += 4;
-					$COMPdata['raw']['sample_type']           = getid3_lib::LittleEndian2Int(substr($BlockData, $offset, 1));
-					$COMPdata['sample_type']                  = $this->OptimFROGsampleTypeLookup($COMPdata['raw']['sample_type']);
-					$offset += 1;
-					$COMPdata['raw']['channel_configuration'] = getid3_lib::LittleEndian2Int(substr($BlockData, $offset, 1));
-					$COMPdata['channel_configuration']        = $this->OptimFROGchannelConfigurationLookup($COMPdata['raw']['channel_configuration']);
-					$offset += 1;
-					$COMPdata['raw']['algorithm_id']          = getid3_lib::LittleEndian2Int(substr($BlockData, $offset, 2));
-					//$COMPdata['algorithm']                    = OptimFROGalgorithmNameLookup($COMPdata['raw']['algorithm_id']);
-					$offset += 2;
-
-					if ($info['ofr']['OFR ']['size'] > 12) {
-
-						// OFR 4.504b or higher
-						$COMPdata['raw']['encoder_id']        = getid3_lib::LittleEndian2Int(substr($BlockData, $offset, 2));
-						$COMPdata['encoder']                  = $this->OptimFROGencoderNameLookup($COMPdata['raw']['encoder_id']);
-						$offset += 2;
-
-					}
-
-					if ($COMPdata['crc_32'] == 0x454E4F4E) {
-						// ASCII value of 'NONE' - placeholder value in v4.50a
-						$COMPdata['crc_32'] = false;
-					}
-
-					$thisfile_ofr_thisblock[] = $COMPdata;
-					break;
-
-				case 'HEAD':
-					$thisfile_ofr_thisblock['offset'] = $BlockOffset;
-					$thisfile_ofr_thisblock['size']   = $BlockSize;
-
-					$RIFFdata .= fread($this->getid3->fp, $BlockSize);
-					break;
-
-				case 'TAIL':
-					$thisfile_ofr_thisblock['offset'] = $BlockOffset;
-					$thisfile_ofr_thisblock['size']   = $BlockSize;
-
-					if ($BlockSize > 0) {
-						$RIFFdata .= fread($this->getid3->fp, $BlockSize);
-					}
-					break;
-
-				case 'RECV':
-					// block contains no useful meta data - simply note and skip
-
-					$thisfile_ofr_thisblock['offset'] = $BlockOffset;
-					$thisfile_ofr_thisblock['size']   = $BlockSize;
-
-					fseek($this->getid3->fp, $BlockSize, SEEK_CUR);
-					break;
-
-
-				case 'APET':
-					// APEtag v2
-
-					$thisfile_ofr_thisblock['offset'] = $BlockOffset;
-					$thisfile_ofr_thisblock['size']   = $BlockSize;
-					$info['warning'][] = 'APEtag processing inside OptimFROG not supported in this version ('.$this->getid3->version().') of getID3()';
-
-					fseek($this->getid3->fp, $BlockSize, SEEK_CUR);
-					break;
-
-
-				case 'MD5 ':
-					// APEtag v2
-
-					$thisfile_ofr_thisblock['offset'] = $BlockOffset;
-					$thisfile_ofr_thisblock['size']   = $BlockSize;
-
-					if ($BlockSize == 16) {
-
-						$thisfile_ofr_thisblock['md5_binary'] = fread($this->getid3->fp, $BlockSize);
-						$thisfile_ofr_thisblock['md5_string'] = getid3_lib::PrintHexBytes($thisfile_ofr_thisblock['md5_binary'], true, false, false);
-						$info['md5_data_source'] = $thisfile_ofr_thisblock['md5_string'];
-
-					} else {
-
-						$info['warning'][] = 'Expecting block size of 16 in "MD5 " chunk, found '.$BlockSize.' instead';
-						fseek($this->getid3->fp, $BlockSize, SEEK_CUR);
-
-					}
-					break;
-
-
-				default:
-					$thisfile_ofr_thisblock['offset'] = $BlockOffset;
-					$thisfile_ofr_thisblock['size']   = $BlockSize;
-
-					$info['warning'][] = 'Unhandled OptimFROG block type "'.$BlockName.'" at offset '.$thisfile_ofr_thisblock['offset'];
-					fseek($this->getid3->fp, $BlockSize, SEEK_CUR);
-					break;
-			}
-		}
-		if (isset($info['ofr']['TAIL']['offset'])) {
-			$info['avdataend'] = $info['ofr']['TAIL']['offset'];
-		}
-
-		$info['playtime_seconds'] = (float) $info['ofr']['OFR ']['total_samples'] / ($info['audio']['channels'] * $info['audio']['sample_rate']);
-		$info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-
-		// move the data chunk after all other chunks (if any)
-		// so that the RIFF parser doesn't see EOF when trying
-		// to skip over the data chunk
-		$RIFFdata = substr($RIFFdata, 0, 36).substr($RIFFdata, 44).substr($RIFFdata, 36, 8);
-
-		$getid3_temp = new getID3();
-		$getid3_temp->openfile($this->getid3->filename);
-		$getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
-		$getid3_temp->info['avdataend']    = $info['avdataend'];
-		$getid3_riff = new getid3_riff($getid3_temp);
-		$getid3_riff->ParseRIFFdata($RIFFdata);
-		$info['riff'] = $getid3_temp->info['riff'];
-
-		unset($getid3_riff, $getid3_temp, $RIFFdata);
-
-		return true;
-	}
-
-
-	static function OptimFROGsampleTypeLookup($SampleType) {
-		static $OptimFROGsampleTypeLookup = array(
-			0  => 'unsigned int (8-bit)',
-			1  => 'signed int (8-bit)',
-			2  => 'unsigned int (16-bit)',
-			3  => 'signed int (16-bit)',
-			4  => 'unsigned int (24-bit)',
-			5  => 'signed int (24-bit)',
-			6  => 'unsigned int (32-bit)',
-			7  => 'signed int (32-bit)',
-			8  => 'float 0.24 (32-bit)',
-			9  => 'float 16.8 (32-bit)',
-			10 => 'float 24.0 (32-bit)'
-		);
-		return (isset($OptimFROGsampleTypeLookup[$SampleType]) ? $OptimFROGsampleTypeLookup[$SampleType] : false);
-	}
-
-	static function OptimFROGbitsPerSampleTypeLookup($SampleType) {
-		static $OptimFROGbitsPerSampleTypeLookup = array(
-			0  => 8,
-			1  => 8,
-			2  => 16,
-			3  => 16,
-			4  => 24,
-			5  => 24,
-			6  => 32,
-			7  => 32,
-			8  => 32,
-			9  => 32,
-			10 => 32
-		);
-		return (isset($OptimFROGbitsPerSampleTypeLookup[$SampleType]) ? $OptimFROGbitsPerSampleTypeLookup[$SampleType] : false);
-	}
-
-	static function OptimFROGchannelConfigurationLookup($ChannelConfiguration) {
-		static $OptimFROGchannelConfigurationLookup = array(
-			0 => 'mono',
-			1 => 'stereo'
-		);
-		return (isset($OptimFROGchannelConfigurationLookup[$ChannelConfiguration]) ? $OptimFROGchannelConfigurationLookup[$ChannelConfiguration] : false);
-	}
-
-	static function OptimFROGchannelConfigNumChannelsLookup($ChannelConfiguration) {
-		static $OptimFROGchannelConfigNumChannelsLookup = array(
-			0 => 1,
-			1 => 2
-		);
-		return (isset($OptimFROGchannelConfigNumChannelsLookup[$ChannelConfiguration]) ? $OptimFROGchannelConfigNumChannelsLookup[$ChannelConfiguration] : false);
-	}
-
-
-
-	// static function OptimFROGalgorithmNameLookup($AlgorithID) {
-	//     static $OptimFROGalgorithmNameLookup = array();
-	//     return (isset($OptimFROGalgorithmNameLookup[$AlgorithID]) ? $OptimFROGalgorithmNameLookup[$AlgorithID] : false);
-	// }
-
-
-	static function OptimFROGencoderNameLookup($EncoderID) {
-		// version = (encoderID >> 4) + 4500
-		// system  =  encoderID & 0xF
-
-		$EncoderVersion  = number_format(((($EncoderID & 0xF0) >> 4) + 4500) / 1000, 3);
-		$EncoderSystemID = ($EncoderID & 0x0F);
-
-		static $OptimFROGencoderSystemLookup = array(
-			0x00 => 'Windows console',
-			0x01 => 'Linux console',
-			0x0F => 'unknown'
-		);
-		return $EncoderVersion.' ('.(isset($OptimFROGencoderSystemLookup[$EncoderSystemID]) ? $OptimFROGencoderSystemLookup[$EncoderSystemID] : 'undefined encoder type (0x'.dechex($EncoderSystemID).')').')';
-	}
-
-	static function OptimFROGcompressionLookup($CompressionID) {
-		// mode    = compression >> 3
-		// speedup = compression & 0x07
-
-		$CompressionModeID    = ($CompressionID & 0xF8) >> 3;
-		//$CompressionSpeedupID = ($CompressionID & 0x07);
-
-		static $OptimFROGencoderModeLookup = array(
-			0x00 => 'fast',
-			0x01 => 'normal',
-			0x02 => 'high',
-			0x03 => 'extra', // extranew (some versions)
-			0x04 => 'best',  // bestnew (some versions)
-			0x05 => 'ultra',
-			0x06 => 'insane',
-			0x07 => 'highnew',
-			0x08 => 'extranew',
-			0x09 => 'bestnew'
-		);
-		return (isset($OptimFROGencoderModeLookup[$CompressionModeID]) ? $OptimFROGencoderModeLookup[$CompressionModeID] : 'undefined mode (0x'.str_pad(dechex($CompressionModeID), 2, '0', STR_PAD_LEFT).')');
-	}
-
-	static function OptimFROGspeedupLookup($CompressionID) {
-		// mode    = compression >> 3
-		// speedup = compression & 0x07
-
-		//$CompressionModeID    = ($CompressionID & 0xF8) >> 3;
-		$CompressionSpeedupID = ($CompressionID & 0x07);
-
-		static $OptimFROGencoderSpeedupLookup = array(
-			0x00 => '1x',
-			0x01 => '2x',
-			0x02 => '4x'
-		);
-		return (isset($OptimFROGencoderSpeedupLookup[$CompressionSpeedupID]) ? $OptimFROGencoderSpeedupLookup[$CompressionSpeedupID] : 'undefined mode (0x'.dechex($CompressionSpeedupID));
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.rkau.php b/lib/getid3/getid3/module.audio.rkau.php
deleted file mode 100644
index c44207627..000000000
--- a/lib/getid3/getid3/module.audio.rkau.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.shorten.php                                    //
-// module for analyzing Shorten Audio files                    //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_rkau extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$RKAUHeader = fread($this->getid3->fp, 20);
-		$magic = 'RKA';
-		if (substr($RKAUHeader, 0, 3) != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($RKAUHeader, 0, 3)).'"';
-			return false;
-		}
-
-		$info['fileformat']            = 'rkau';
-		$info['audio']['dataformat']   = 'rkau';
-		$info['audio']['bitrate_mode'] = 'vbr';
-
-		$info['rkau']['raw']['version']   = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 3, 1));
-		$info['rkau']['version']          = '1.'.str_pad($info['rkau']['raw']['version'] & 0x0F, 2, '0', STR_PAD_LEFT);
-		if (($info['rkau']['version'] > 1.07) || ($info['rkau']['version'] < 1.06)) {
-			$info['error'][] = 'This version of getID3() ['.$this->getid3->version().'] can only parse RKAU files v1.06 and 1.07 (this file is v'.$info['rkau']['version'].')';
-			unset($info['rkau']);
-			return false;
-		}
-
-		$info['rkau']['source_bytes']     = getid3_lib::LittleEndian2Int(substr($RKAUHeader,  4, 4));
-		$info['rkau']['sample_rate']      = getid3_lib::LittleEndian2Int(substr($RKAUHeader,  8, 4));
-		$info['rkau']['channels']         = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 12, 1));
-		$info['rkau']['bits_per_sample']  = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 13, 1));
-
-		$info['rkau']['raw']['quality']   = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 14, 1));
-		$this->RKAUqualityLookup($info['rkau']);
-
-		$info['rkau']['raw']['flags']            = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 15, 1));
-		$info['rkau']['flags']['joint_stereo']   = (bool) (!($info['rkau']['raw']['flags'] & 0x01));
-		$info['rkau']['flags']['streaming']      =  (bool)  ($info['rkau']['raw']['flags'] & 0x02);
-		$info['rkau']['flags']['vrq_lossy_mode'] =  (bool)  ($info['rkau']['raw']['flags'] & 0x04);
-
-		if ($info['rkau']['flags']['streaming']) {
-			$info['avdataoffset'] += 20;
-			$info['rkau']['compressed_bytes']  = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 16, 4));
-		} else {
-			$info['avdataoffset'] += 16;
-			$info['rkau']['compressed_bytes'] = $info['avdataend'] - $info['avdataoffset'] - 1;
-		}
-		// Note: compressed_bytes does not always equal what appears to be the actual number of compressed bytes,
-		// sometimes it's more, sometimes less. No idea why(?)
-
-		$info['audio']['lossless']        = $info['rkau']['lossless'];
-		$info['audio']['channels']        = $info['rkau']['channels'];
-		$info['audio']['bits_per_sample'] = $info['rkau']['bits_per_sample'];
-		$info['audio']['sample_rate']     = $info['rkau']['sample_rate'];
-
-		$info['playtime_seconds']         = $info['rkau']['source_bytes'] / ($info['rkau']['sample_rate'] * $info['rkau']['channels'] * ($info['rkau']['bits_per_sample'] / 8));
-		$info['audio']['bitrate']         = ($info['rkau']['compressed_bytes'] * 8) / $info['playtime_seconds'];
-
-		return true;
-
-	}
-
-
-	function RKAUqualityLookup(&$RKAUdata) {
-		$level   = ($RKAUdata['raw']['quality'] & 0xF0) >> 4;
-		$quality =  $RKAUdata['raw']['quality'] & 0x0F;
-
-		$RKAUdata['lossless']          = (($quality == 0) ? true : false);
-		$RKAUdata['compression_level'] = $level + 1;
-		if (!$RKAUdata['lossless']) {
-			$RKAUdata['quality_setting'] = $quality;
-		}
-
-		return true;
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.shorten.php b/lib/getid3/getid3/module.audio.shorten.php
deleted file mode 100644
index 7b3d312ea..000000000
--- a/lib/getid3/getid3/module.audio.shorten.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.shorten.php                                    //
-// module for analyzing Shorten Audio files                    //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_shorten extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-
-		$ShortenHeader = fread($this->getid3->fp, 8);
-		$magic = 'ajkg';
-		if (substr($ShortenHeader, 0, 4) != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($ShortenHeader, 0, 4)).'"';
-			return false;
-		}
-		$info['fileformat']            = 'shn';
-		$info['audio']['dataformat']   = 'shn';
-		$info['audio']['lossless']     = true;
-		$info['audio']['bitrate_mode'] = 'vbr';
-
-		$info['shn']['version'] = getid3_lib::LittleEndian2Int(substr($ShortenHeader, 4, 1));
-
-		fseek($this->getid3->fp, $info['avdataend'] - 12, SEEK_SET);
-		$SeekTableSignatureTest = fread($this->getid3->fp, 12);
-		$info['shn']['seektable']['present'] = (bool) (substr($SeekTableSignatureTest, 4, 8) == 'SHNAMPSK');
-		if ($info['shn']['seektable']['present']) {
-			$info['shn']['seektable']['length'] = getid3_lib::LittleEndian2Int(substr($SeekTableSignatureTest, 0, 4));
-			$info['shn']['seektable']['offset'] = $info['avdataend'] - $info['shn']['seektable']['length'];
-			fseek($this->getid3->fp, $info['shn']['seektable']['offset'], SEEK_SET);
-			$SeekTableMagic = fread($this->getid3->fp, 4);
-			$magic = 'SEEK';
-			if ($SeekTableMagic != $magic) {
-
-				$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['shn']['seektable']['offset'].', found "'.getid3_lib::PrintHexBytes($SeekTableMagic).'"';
-				return false;
-
-			} else {
-
-				// typedef struct tag_TSeekEntry
-				// {
-				//   unsigned long SampleNumber;
-				//   unsigned long SHNFileByteOffset;
-				//   unsigned long SHNLastBufferReadPosition;
-				//   unsigned short SHNByteGet;
-				//   unsigned short SHNBufferOffset;
-				//   unsigned short SHNFileBitOffset;
-				//   unsigned long SHNGBuffer;
-				//   unsigned short SHNBitShift;
-				//   long CBuf0[3];
-				//   long CBuf1[3];
-				//   long Offset0[4];
-				//   long Offset1[4];
-				// }TSeekEntry;
-
-				$SeekTableData = fread($this->getid3->fp, $info['shn']['seektable']['length'] - 16);
-				$info['shn']['seektable']['entry_count'] = floor(strlen($SeekTableData) / 80);
-				//$info['shn']['seektable']['entries'] = array();
-				//$SeekTableOffset = 0;
-				//for ($i = 0; $i < $info['shn']['seektable']['entry_count']; $i++) {
-				//	$SeekTableEntry['sample_number'] = getid3_lib::LittleEndian2Int(substr($SeekTableData, $SeekTableOffset, 4));
-				//	$SeekTableOffset += 4;
-				//	$SeekTableEntry['shn_file_byte_offset'] = getid3_lib::LittleEndian2Int(substr($SeekTableData, $SeekTableOffset, 4));
-				//	$SeekTableOffset += 4;
-				//	$SeekTableEntry['shn_last_buffer_read_position'] = getid3_lib::LittleEndian2Int(substr($SeekTableData, $SeekTableOffset, 4));
-				//	$SeekTableOffset += 4;
-				//	$SeekTableEntry['shn_byte_get'] = getid3_lib::LittleEndian2Int(substr($SeekTableData, $SeekTableOffset, 2));
-				//	$SeekTableOffset += 2;
-				//	$SeekTableEntry['shn_buffer_offset'] = getid3_lib::LittleEndian2Int(substr($SeekTableData, $SeekTableOffset, 2));
-				//	$SeekTableOffset += 2;
-				//	$SeekTableEntry['shn_file_bit_offset'] = getid3_lib::LittleEndian2Int(substr($SeekTableData, $SeekTableOffset, 2));
-				//	$SeekTableOffset += 2;
-				//	$SeekTableEntry['shn_gbuffer'] = getid3_lib::LittleEndian2Int(substr($SeekTableData, $SeekTableOffset, 4));
-				//	$SeekTableOffset += 4;
-				//	$SeekTableEntry['shn_bit_shift'] = getid3_lib::LittleEndian2Int(substr($SeekTableData, $SeekTableOffset, 2));
-				//	$SeekTableOffset += 2;
-				//	for ($j = 0; $j < 3; $j++) {
-				//		$SeekTableEntry['cbuf0'][$j] = getid3_lib::LittleEndian2Int(substr($SeekTableData, $SeekTableOffset, 4));
-				//		$SeekTableOffset += 4;
-				//	}
-				//	for ($j = 0; $j < 3; $j++) {
-				//		$SeekTableEntry['cbuf1'][$j] = getid3_lib::LittleEndian2Int(substr($SeekTableData, $SeekTableOffset, 4));
-				//		$SeekTableOffset += 4;
-				//	}
-				//	for ($j = 0; $j < 4; $j++) {
-				//		$SeekTableEntry['offset0'][$j] = getid3_lib::LittleEndian2Int(substr($SeekTableData, $SeekTableOffset, 4));
-				//		$SeekTableOffset += 4;
-				//	}
-				//	for ($j = 0; $j < 4; $j++) {
-				//		$SeekTableEntry['offset1'][$j] = getid3_lib::LittleEndian2Int(substr($SeekTableData, $SeekTableOffset, 4));
-				//		$SeekTableOffset += 4;
-				//	}
-				//
-				//	$info['shn']['seektable']['entries'][] = $SeekTableEntry;
-				//}
-
-			}
-
-		}
-
-		if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
-			$info['error'][] = 'PHP running in Safe Mode - backtick operator not available, cannot run shntool to analyze Shorten files';
-			return false;
-		}
-
-		if (GETID3_OS_ISWINDOWS) {
-
-			$RequiredFiles = array('shorten.exe', 'cygwin1.dll', 'head.exe');
-			foreach ($RequiredFiles as $required_file) {
-				if (!is_readable(GETID3_HELPERAPPSDIR.$required_file)) {
-					$info['error'][] = GETID3_HELPERAPPSDIR.$required_file.' does not exist';
-					return false;
-				}
-			}
-			$commandline = GETID3_HELPERAPPSDIR.'shorten.exe -x "'.$info['filenamepath'].'" - | '.GETID3_HELPERAPPSDIR.'head.exe -c 64';
-			$commandline = str_replace('/', '\\', $commandline);
-
-		} else {
-
-			static $shorten_present;
-			if (!isset($shorten_present)) {
-				$shorten_present = file_exists('/usr/local/bin/shorten') || `which shorten`;
-			}
-			if (!$shorten_present) {
-				$info['error'][] = 'shorten binary was not found in path or /usr/local/bin';
-				return false;
-			}
-			$commandline = (file_exists('/usr/local/bin/shorten') ? '/usr/local/bin/' : '' ) . 'shorten -x '.escapeshellarg($info['filenamepath']).' - | head -c 64';
-
-		}
-
-		$output = `$commandline`;
-
-		if (!empty($output) && (substr($output, 12, 4) == 'fmt ')) {
-
-			getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
-
-			$fmt_size = getid3_lib::LittleEndian2Int(substr($output, 16, 4));
-			$DecodedWAVFORMATEX = getid3_riff::RIFFparseWAVEFORMATex(substr($output, 20, $fmt_size));
-			$info['audio']['channels']        = $DecodedWAVFORMATEX['channels'];
-			$info['audio']['bits_per_sample'] = $DecodedWAVFORMATEX['bits_per_sample'];
-			$info['audio']['sample_rate']     = $DecodedWAVFORMATEX['sample_rate'];
-
-			if (substr($output, 20 + $fmt_size, 4) == 'data') {
-
-				$info['playtime_seconds'] = getid3_lib::LittleEndian2Int(substr($output, 20 + 4 + $fmt_size, 4)) / $DecodedWAVFORMATEX['raw']['nAvgBytesPerSec'];
-
-			} else {
-
-				$info['error'][] = 'shorten failed to decode DATA chunk to expected location, cannot determine playtime';
-				return false;
-
-			}
-
-			$info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) / $info['playtime_seconds']) * 8;
-
-		} else {
-
-			$info['error'][] = 'shorten failed to decode file to WAV for parsing';
-			return false;
-
-		}
-
-		return true;
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.tta.php b/lib/getid3/getid3/module.audio.tta.php
deleted file mode 100644
index 1c646ee67..000000000
--- a/lib/getid3/getid3/module.audio.tta.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.tta.php                                        //
-// module for analyzing TTA Audio files                        //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_tta extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat']            = 'tta';
-		$info['audio']['dataformat']   = 'tta';
-		$info['audio']['lossless']     = true;
-		$info['audio']['bitrate_mode'] = 'vbr';
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$ttaheader = fread($this->getid3->fp, 26);
-
-		$info['tta']['magic'] = substr($ttaheader, 0, 3);
-		$magic = 'TTA';
-		if ($info['tta']['magic'] != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($info['tta']['magic']).'"';
-			unset($info['fileformat']);
-			unset($info['audio']);
-			unset($info['tta']);
-			return false;
-		}
-
-		switch ($ttaheader{3}) {
-			case "\x01": // TTA v1.x
-			case "\x02": // TTA v1.x
-			case "\x03": // TTA v1.x
-				// "It was the demo-version of the TTA encoder. There is no released format with such header. TTA encoder v1 is not supported about a year."
-				$info['tta']['major_version'] = 1;
-				$info['avdataoffset'] += 16;
-
-				$info['tta']['compression_level']   = ord($ttaheader{3});
-				$info['tta']['channels']            = getid3_lib::LittleEndian2Int(substr($ttaheader,  4,  2));
-				$info['tta']['bits_per_sample']     = getid3_lib::LittleEndian2Int(substr($ttaheader,  6,  2));
-				$info['tta']['sample_rate']         = getid3_lib::LittleEndian2Int(substr($ttaheader,  8,  4));
-				$info['tta']['samples_per_channel'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 12,  4));
-
-				$info['audio']['encoder_options']   = '-e'.$info['tta']['compression_level'];
-				$info['playtime_seconds']           = $info['tta']['samples_per_channel'] / $info['tta']['sample_rate'];
-				break;
-
-			case '2': // TTA v2.x
-				// "I have hurried to release the TTA 2.0 encoder. Format documentation is removed from our site. This format still in development. Please wait the TTA2 format, encoder v4."
-				$info['tta']['major_version'] = 2;
-				$info['avdataoffset'] += 20;
-
-				$info['tta']['compression_level']   = getid3_lib::LittleEndian2Int(substr($ttaheader,  4,  2));
-				$info['tta']['audio_format']        = getid3_lib::LittleEndian2Int(substr($ttaheader,  6,  2));
-				$info['tta']['channels']            = getid3_lib::LittleEndian2Int(substr($ttaheader,  8,  2));
-				$info['tta']['bits_per_sample']     = getid3_lib::LittleEndian2Int(substr($ttaheader, 10,  2));
-				$info['tta']['sample_rate']         = getid3_lib::LittleEndian2Int(substr($ttaheader, 12,  4));
-				$info['tta']['data_length']         = getid3_lib::LittleEndian2Int(substr($ttaheader, 16,  4));
-
-				$info['audio']['encoder_options']   = '-e'.$info['tta']['compression_level'];
-				$info['playtime_seconds']           = $info['tta']['data_length'] / $info['tta']['sample_rate'];
-				break;
-
-			case '1': // TTA v3.x
-				// "This is a first stable release of the TTA format. It will be supported by the encoders v3 or higher."
-				$info['tta']['major_version'] = 3;
-				$info['avdataoffset'] += 26;
-
-				$info['tta']['audio_format']        = getid3_lib::LittleEndian2Int(substr($ttaheader,  4,  2)); // getid3_riff::RIFFwFormatTagLookup()
-				$info['tta']['channels']            = getid3_lib::LittleEndian2Int(substr($ttaheader,  6,  2));
-				$info['tta']['bits_per_sample']     = getid3_lib::LittleEndian2Int(substr($ttaheader,  8,  2));
-				$info['tta']['sample_rate']         = getid3_lib::LittleEndian2Int(substr($ttaheader, 10,  4));
-				$info['tta']['data_length']         = getid3_lib::LittleEndian2Int(substr($ttaheader, 14,  4));
-				$info['tta']['crc32_footer']        =                              substr($ttaheader, 18,  4);
-				$info['tta']['seek_point']          = getid3_lib::LittleEndian2Int(substr($ttaheader, 22,  4));
-
-				$info['playtime_seconds']           = $info['tta']['data_length'] / $info['tta']['sample_rate'];
-				break;
-
-			default:
-				$info['error'][] = 'This version of getID3() ['.$this->getid3->version().'] only knows how to handle TTA v1 and v2 - it may not work correctly with this file which appears to be TTA v'.$ttaheader{3};
-				return false;
-				break;
-		}
-
-		$info['audio']['encoder']         = 'TTA v'.$info['tta']['major_version'];
-		$info['audio']['bits_per_sample'] = $info['tta']['bits_per_sample'];
-		$info['audio']['sample_rate']     = $info['tta']['sample_rate'];
-		$info['audio']['channels']        = $info['tta']['channels'];
-		$info['audio']['bitrate']         = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-
-		return true;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.voc.php b/lib/getid3/getid3/module.audio.voc.php
deleted file mode 100644
index 1186a4cc0..000000000
--- a/lib/getid3/getid3/module.audio.voc.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.voc.php                                        //
-// module for analyzing Creative VOC Audio files               //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_voc extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$OriginalAVdataOffset = $info['avdataoffset'];
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$VOCheader  = fread($this->getid3->fp, 26);
-
-		$magic = 'Creative Voice File';
-		if (substr($VOCheader, 0, 19) != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($VOCheader, 0, 19)).'"';
-			return false;
-		}
-
-		// shortcuts
-		$thisfile_audio = &$info['audio'];
-		$info['voc'] = array();
-		$thisfile_voc        = &$info['voc'];
-
-		$info['fileformat']        = 'voc';
-		$thisfile_audio['dataformat']      = 'voc';
-		$thisfile_audio['bitrate_mode']    = 'cbr';
-		$thisfile_audio['lossless']        = true;
-		$thisfile_audio['channels']        = 1; // might be overriden below
-		$thisfile_audio['bits_per_sample'] = 8; // might be overriden below
-
-		// byte #     Description
-		// ------     ------------------------------------------
-		// 00-12      'Creative Voice File'
-		// 13         1A (eof to abort printing of file)
-		// 14-15      Offset of first datablock in .voc file (std 1A 00 in Intel Notation)
-		// 16-17      Version number (minor,major) (VOC-HDR puts 0A 01)
-		// 18-19      2's Comp of Ver. # + 1234h (VOC-HDR puts 29 11)
-
-		$thisfile_voc['header']['datablock_offset'] = getid3_lib::LittleEndian2Int(substr($VOCheader, 20, 2));
-		$thisfile_voc['header']['minor_version']    = getid3_lib::LittleEndian2Int(substr($VOCheader, 22, 1));
-		$thisfile_voc['header']['major_version']    = getid3_lib::LittleEndian2Int(substr($VOCheader, 23, 1));
-
-		do {
-
-			$BlockOffset    = ftell($this->getid3->fp);
-			$BlockData      = fread($this->getid3->fp, 4);
-			$BlockType      = ord($BlockData{0});
-			$BlockSize      = getid3_lib::LittleEndian2Int(substr($BlockData, 1, 3));
-			$ThisBlock      = array();
-
-			getid3_lib::safe_inc($thisfile_voc['blocktypes'][$BlockType], 1);
-			switch ($BlockType) {
-				case 0:  // Terminator
-					// do nothing, we'll break out of the loop down below
-					break;
-
-				case 1:  // Sound data
-					$BlockData .= fread($this->getid3->fp, 2);
-					if ($info['avdataoffset'] <= $OriginalAVdataOffset) {
-						$info['avdataoffset'] = ftell($this->getid3->fp);
-					}
-					fseek($this->getid3->fp, $BlockSize - 2, SEEK_CUR);
-
-					$ThisBlock['sample_rate_id']   = getid3_lib::LittleEndian2Int(substr($BlockData, 4, 1));
-					$ThisBlock['compression_type'] = getid3_lib::LittleEndian2Int(substr($BlockData, 5, 1));
-
-					$ThisBlock['compression_name'] = $this->VOCcompressionTypeLookup($ThisBlock['compression_type']);
-					if ($ThisBlock['compression_type'] <= 3) {
-						$thisfile_voc['compressed_bits_per_sample'] = getid3_lib::CastAsInt(str_replace('-bit', '', $ThisBlock['compression_name']));
-					}
-
-					// Less accurate sample_rate calculation than the Extended block (#8) data (but better than nothing if Extended Block is not available)
-					if (empty($thisfile_audio['sample_rate'])) {
-						// SR byte = 256 - (1000000 / sample_rate)
-						$thisfile_audio['sample_rate'] = getid3_lib::trunc((1000000 / (256 - $ThisBlock['sample_rate_id'])) / $thisfile_audio['channels']);
-					}
-					break;
-
-				case 2:  // Sound continue
-				case 3:  // Silence
-				case 4:  // Marker
-				case 6:  // Repeat
-				case 7:  // End repeat
-					// nothing useful, just skip
-					fseek($this->getid3->fp, $BlockSize, SEEK_CUR);
-					break;
-
-				case 8:  // Extended
-					$BlockData .= fread($this->getid3->fp, 4);
-
-					//00-01  Time Constant:
-					//   Mono: 65536 - (256000000 / sample_rate)
-					// Stereo: 65536 - (256000000 / (sample_rate * 2))
-					$ThisBlock['time_constant'] =        getid3_lib::LittleEndian2Int(substr($BlockData, 4, 2));
-					$ThisBlock['pack_method']   =        getid3_lib::LittleEndian2Int(substr($BlockData, 6, 1));
-					$ThisBlock['stereo']        = (bool) getid3_lib::LittleEndian2Int(substr($BlockData, 7, 1));
-
-					$thisfile_audio['channels']    = ($ThisBlock['stereo'] ? 2 : 1);
-					$thisfile_audio['sample_rate'] = getid3_lib::trunc((256000000 / (65536 - $ThisBlock['time_constant'])) / $thisfile_audio['channels']);
-					break;
-
-				case 9:  // data block that supersedes blocks 1 and 8. Used for stereo, 16 bit
-					$BlockData .= fread($this->getid3->fp, 12);
-					if ($info['avdataoffset'] <= $OriginalAVdataOffset) {
-						$info['avdataoffset'] = ftell($this->getid3->fp);
-					}
-					fseek($this->getid3->fp, $BlockSize - 12, SEEK_CUR);
-
-					$ThisBlock['sample_rate']      = getid3_lib::LittleEndian2Int(substr($BlockData,  4, 4));
-					$ThisBlock['bits_per_sample']  = getid3_lib::LittleEndian2Int(substr($BlockData,  8, 1));
-					$ThisBlock['channels']         = getid3_lib::LittleEndian2Int(substr($BlockData,  9, 1));
-					$ThisBlock['wFormat']          = getid3_lib::LittleEndian2Int(substr($BlockData, 10, 2));
-
-					$ThisBlock['compression_name'] = $this->VOCwFormatLookup($ThisBlock['wFormat']);
-					if ($this->VOCwFormatActualBitsPerSampleLookup($ThisBlock['wFormat'])) {
-						$thisfile_voc['compressed_bits_per_sample'] = $this->VOCwFormatActualBitsPerSampleLookup($ThisBlock['wFormat']);
-					}
-
-					$thisfile_audio['sample_rate']     = $ThisBlock['sample_rate'];
-					$thisfile_audio['bits_per_sample'] = $ThisBlock['bits_per_sample'];
-					$thisfile_audio['channels']        = $ThisBlock['channels'];
-					break;
-
-				default:
-					$info['warning'][] = 'Unhandled block type "'.$BlockType.'" at offset '.$BlockOffset;
-					fseek($this->getid3->fp, $BlockSize, SEEK_CUR);
-					break;
-			}
-
-			if (!empty($ThisBlock)) {
-				$ThisBlock['block_offset']  = $BlockOffset;
-				$ThisBlock['block_size']    = $BlockSize;
-				$ThisBlock['block_type_id'] = $BlockType;
-				$thisfile_voc['blocks'][] = $ThisBlock;
-			}
-
-		} while (!feof($this->getid3->fp) && ($BlockType != 0));
-
-		// Terminator block doesn't have size field, so seek back 3 spaces
-		fseek($this->getid3->fp, -3, SEEK_CUR);
-
-		ksort($thisfile_voc['blocktypes']);
-
-		if (!empty($thisfile_voc['compressed_bits_per_sample'])) {
-			$info['playtime_seconds'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / ($thisfile_voc['compressed_bits_per_sample'] * $thisfile_audio['channels'] * $thisfile_audio['sample_rate']);
-			$thisfile_audio['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-		}
-
-		return true;
-	}
-
-	function VOCcompressionTypeLookup($index) {
-		static $VOCcompressionTypeLookup = array(
-			0 => '8-bit',
-			1 => '4-bit',
-			2 => '2.6-bit',
-			3 => '2-bit'
-		);
-		return (isset($VOCcompressionTypeLookup[$index]) ? $VOCcompressionTypeLookup[$index] : 'Multi DAC ('.($index - 3).') channels');
-	}
-
-	function VOCwFormatLookup($index) {
-		static $VOCwFormatLookup = array(
-			0x0000 => '8-bit unsigned PCM',
-			0x0001 => 'Creative 8-bit to 4-bit ADPCM',
-			0x0002 => 'Creative 8-bit to 3-bit ADPCM',
-			0x0003 => 'Creative 8-bit to 2-bit ADPCM',
-			0x0004 => '16-bit signed PCM',
-			0x0006 => 'CCITT a-Law',
-			0x0007 => 'CCITT u-Law',
-			0x2000 => 'Creative 16-bit to 4-bit ADPCM'
-		);
-		return (isset($VOCwFormatLookup[$index]) ? $VOCwFormatLookup[$index] : false);
-	}
-
-	function VOCwFormatActualBitsPerSampleLookup($index) {
-		static $VOCwFormatLookup = array(
-			0x0000 => 8,
-			0x0001 => 4,
-			0x0002 => 3,
-			0x0003 => 2,
-			0x0004 => 16,
-			0x0006 => 8,
-			0x0007 => 8,
-			0x2000 => 4
-		);
-		return (isset($VOCwFormatLookup[$index]) ? $VOCwFormatLookup[$index] : false);
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.vqf.php b/lib/getid3/getid3/module.audio.vqf.php
deleted file mode 100644
index dc6ff5ecc..000000000
--- a/lib/getid3/getid3/module.audio.vqf.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.vqf.php                                        //
-// module for analyzing VQF audio files                        //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_vqf extends getid3_handler
-{
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		// based loosely on code from TTwinVQ by Jurgen Faul <jfaul�gmx*de>
-		// http://jfaul.de/atl  or  http://j-faul.virtualave.net/atl/atl.html
-
-		$info['fileformat']            = 'vqf';
-		$info['audio']['dataformat']   = 'vqf';
-		$info['audio']['bitrate_mode'] = 'cbr';
-		$info['audio']['lossless']     = false;
-
-		// shortcut
-		$info['vqf']['raw'] = array();
-		$thisfile_vqf               = &$info['vqf'];
-		$thisfile_vqf_raw           = &$thisfile_vqf['raw'];
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$VQFheaderData = fread($this->getid3->fp, 16);
-
-		$offset = 0;
-		$thisfile_vqf_raw['header_tag'] = substr($VQFheaderData, $offset, 4);
-		$magic = 'TWIN';
-		if ($thisfile_vqf_raw['header_tag'] != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($thisfile_vqf_raw['header_tag']).'"';
-			unset($info['vqf']);
-			unset($info['fileformat']);
-			return false;
-		}
-		$offset += 4;
-		$thisfile_vqf_raw['version'] =                           substr($VQFheaderData, $offset, 8);
-		$offset += 8;
-		$thisfile_vqf_raw['size']    = getid3_lib::BigEndian2Int(substr($VQFheaderData, $offset, 4));
-		$offset += 4;
-
-		while (ftell($this->getid3->fp) < $info['avdataend']) {
-
-			$ChunkBaseOffset = ftell($this->getid3->fp);
-			$chunkoffset = 0;
-			$ChunkData = fread($this->getid3->fp, 8);
-			$ChunkName = substr($ChunkData, $chunkoffset, 4);
-			if ($ChunkName == 'DATA') {
-				$info['avdataoffset'] = $ChunkBaseOffset;
-				break;
-			}
-			$chunkoffset += 4;
-			$ChunkSize = getid3_lib::BigEndian2Int(substr($ChunkData, $chunkoffset, 4));
-			$chunkoffset += 4;
-			if ($ChunkSize > ($info['avdataend'] - ftell($this->getid3->fp))) {
-				$info['error'][] = 'Invalid chunk size ('.$ChunkSize.') for chunk "'.$ChunkName.'" at offset '.$ChunkBaseOffset;
-				break;
-			}
-			if ($ChunkSize > 0) {
-				$ChunkData .= fread($this->getid3->fp, $ChunkSize);
-			}
-
-			switch ($ChunkName) {
-				case 'COMM':
-					// shortcut
-					$thisfile_vqf['COMM'] = array();
-					$thisfile_vqf_COMM    = &$thisfile_vqf['COMM'];
-
-					$thisfile_vqf_COMM['channel_mode']   = getid3_lib::BigEndian2Int(substr($ChunkData, $chunkoffset, 4));
-					$chunkoffset += 4;
-					$thisfile_vqf_COMM['bitrate']        = getid3_lib::BigEndian2Int(substr($ChunkData, $chunkoffset, 4));
-					$chunkoffset += 4;
-					$thisfile_vqf_COMM['sample_rate']    = getid3_lib::BigEndian2Int(substr($ChunkData, $chunkoffset, 4));
-					$chunkoffset += 4;
-					$thisfile_vqf_COMM['security_level'] = getid3_lib::BigEndian2Int(substr($ChunkData, $chunkoffset, 4));
-					$chunkoffset += 4;
-
-					$info['audio']['channels']        = $thisfile_vqf_COMM['channel_mode'] + 1;
-					$info['audio']['sample_rate']     = $this->VQFchannelFrequencyLookup($thisfile_vqf_COMM['sample_rate']);
-					$info['audio']['bitrate']         = $thisfile_vqf_COMM['bitrate'] * 1000;
-					$info['audio']['encoder_options'] = 'CBR' . ceil($info['audio']['bitrate']/1000);
-
-					if ($info['audio']['bitrate'] == 0) {
-						$info['error'][] = 'Corrupt VQF file: bitrate_audio == zero';
-						return false;
-					}
-					break;
-
-				case 'NAME':
-				case 'AUTH':
-				case '(c) ':
-				case 'FILE':
-				case 'COMT':
-				case 'ALBM':
-					$thisfile_vqf['comments'][$this->VQFcommentNiceNameLookup($ChunkName)][] = trim(substr($ChunkData, 8));
-					break;
-
-				case 'DSIZ':
-					$thisfile_vqf['DSIZ'] = getid3_lib::BigEndian2Int(substr($ChunkData, 8, 4));
-					break;
-
-				default:
-					$info['warning'][] = 'Unhandled chunk type "'.$ChunkName.'" at offset '.$ChunkBaseOffset;
-					break;
-			}
-		}
-
-		$info['playtime_seconds'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['audio']['bitrate'];
-
-		if (isset($thisfile_vqf['DSIZ']) && (($thisfile_vqf['DSIZ'] != ($info['avdataend'] - $info['avdataoffset'] - strlen('DATA'))))) {
-			switch ($thisfile_vqf['DSIZ']) {
-				case 0:
-				case 1:
-					$info['warning'][] = 'Invalid DSIZ value "'.$thisfile_vqf['DSIZ'].'". This is known to happen with VQF files encoded by Ahead Nero, and seems to be its way of saying this is TwinVQF v'.($thisfile_vqf['DSIZ'] + 1).'.0';
-					$info['audio']['encoder'] = 'Ahead Nero';
-					break;
-
-				default:
-					$info['warning'][] = 'Probable corrupted file - should be '.$thisfile_vqf['DSIZ'].' bytes, actually '.($info['avdataend'] - $info['avdataoffset'] - strlen('DATA'));
-					break;
-			}
-		}
-
-		return true;
-	}
-
-	function VQFchannelFrequencyLookup($frequencyid) {
-		static $VQFchannelFrequencyLookup = array(
-			11 => 11025,
-			22 => 22050,
-			44 => 44100
-		);
-		return (isset($VQFchannelFrequencyLookup[$frequencyid]) ? $VQFchannelFrequencyLookup[$frequencyid] : $frequencyid * 1000);
-	}
-
-	function VQFcommentNiceNameLookup($shortname) {
-		static $VQFcommentNiceNameLookup = array(
-			'NAME' => 'title',
-			'AUTH' => 'artist',
-			'(c) ' => 'copyright',
-			'FILE' => 'filename',
-			'COMT' => 'comment',
-			'ALBM' => 'album'
-		);
-		return (isset($VQFcommentNiceNameLookup[$shortname]) ? $VQFcommentNiceNameLookup[$shortname] : $shortname);
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.audio.wavpack.php b/lib/getid3/getid3/module.audio.wavpack.php
deleted file mode 100644
index 6ab5b4386..000000000
--- a/lib/getid3/getid3/module.audio.wavpack.php
+++ /dev/null
@@ -1,400 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.audio.wavpack.php                                    //
-// module for analyzing WavPack v4.0+ Audio files              //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_wavpack extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-
-		while (true) {
-
-			$wavpackheader = fread($this->getid3->fp, 32);
-
-			if (ftell($this->getid3->fp) >= $info['avdataend']) {
-				break;
-			} elseif (feof($this->getid3->fp)) {
-				break;
-			} elseif (
-				isset($info['wavpack']['blockheader']['total_samples']) &&
-				isset($info['wavpack']['blockheader']['block_samples']) &&
-				($info['wavpack']['blockheader']['total_samples'] > 0) &&
-				($info['wavpack']['blockheader']['block_samples'] > 0) &&
-				(!isset($info['wavpack']['riff_trailer_size']) || ($info['wavpack']['riff_trailer_size'] <= 0)) &&
-				((isset($info['wavpack']['config_flags']['md5_checksum']) && ($info['wavpack']['config_flags']['md5_checksum'] === false)) || !empty($info['md5_data_source']))) {
-					break;
-			}
-
-			$blockheader_offset = ftell($this->getid3->fp) - 32;
-			$blockheader_magic  =                              substr($wavpackheader,  0,  4);
-			$blockheader_size   = getid3_lib::LittleEndian2Int(substr($wavpackheader,  4,  4));
-
-			$magic = 'wvpk';
-			if ($blockheader_magic != $magic) {
-				$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$blockheader_offset.', found "'.getid3_lib::PrintHexBytes($blockheader_magic).'"';
-				switch (isset($info['audio']['dataformat']) ? $info['audio']['dataformat'] : '') {
-					case 'wavpack':
-					case 'wvc':
-						break;
-					default:
-						unset($info['fileformat']);
-						unset($info['audio']);
-						unset($info['wavpack']);
-						break;
-				}
-				return false;
-			}
-
-			if (empty($info['wavpack']['blockheader']['block_samples']) ||
-				empty($info['wavpack']['blockheader']['total_samples']) ||
-				($info['wavpack']['blockheader']['block_samples'] <= 0) ||
-				($info['wavpack']['blockheader']['total_samples'] <= 0)) {
-				// Also, it is possible that the first block might not have
-				// any samples (block_samples == 0) and in this case you should skip blocks
-				// until you find one with samples because the other information (like
-				// total_samples) are not guaranteed to be correct until (block_samples > 0)
-
-				// Finally, I have defined a format for files in which the length is not known
-				// (for example when raw files are created using pipes). In these cases
-				// total_samples will be -1 and you must seek to the final block to determine
-				// the total number of samples.
-
-
-				$info['audio']['dataformat']   = 'wavpack';
-				$info['fileformat']            = 'wavpack';
-				$info['audio']['lossless']     = true;
-				$info['audio']['bitrate_mode'] = 'vbr';
-
-				$info['wavpack']['blockheader']['offset'] = $blockheader_offset;
-				$info['wavpack']['blockheader']['magic']  = $blockheader_magic;
-				$info['wavpack']['blockheader']['size']   = $blockheader_size;
-
-				if ($info['wavpack']['blockheader']['size'] >= 0x100000) {
-					$info['error'][] = 'Expecting WavPack block size less than "0x100000", found "'.$info['wavpack']['blockheader']['size'].'" at offset '.$info['wavpack']['blockheader']['offset'];
-					switch (isset($info['audio']['dataformat']) ? $info['audio']['dataformat'] : '') {
-						case 'wavpack':
-						case 'wvc':
-							break;
-						default:
-							unset($info['fileformat']);
-							unset($info['audio']);
-							unset($info['wavpack']);
-							break;
-					}
-					return false;
-				}
-
-				$info['wavpack']['blockheader']['minor_version'] = ord($wavpackheader{8});
-				$info['wavpack']['blockheader']['major_version'] = ord($wavpackheader{9});
-
-				if (($info['wavpack']['blockheader']['major_version'] != 4) ||
-					(($info['wavpack']['blockheader']['minor_version'] < 4) &&
-					($info['wavpack']['blockheader']['minor_version'] > 16))) {
-						$info['error'][] = 'Expecting WavPack version between "4.2" and "4.16", found version "'.$info['wavpack']['blockheader']['major_version'].'.'.$info['wavpack']['blockheader']['minor_version'].'" at offset '.$info['wavpack']['blockheader']['offset'];
-						switch (isset($info['audio']['dataformat']) ? $info['audio']['dataformat'] : '') {
-							case 'wavpack':
-							case 'wvc':
-								break;
-							default:
-								unset($info['fileformat']);
-								unset($info['audio']);
-								unset($info['wavpack']);
-								break;
-						}
-						return false;
-				}
-
-				$info['wavpack']['blockheader']['track_number']  = ord($wavpackheader{10}); // unused
-				$info['wavpack']['blockheader']['index_number']  = ord($wavpackheader{11}); // unused
-				$info['wavpack']['blockheader']['total_samples'] = getid3_lib::LittleEndian2Int(substr($wavpackheader, 12,  4));
-				$info['wavpack']['blockheader']['block_index']   = getid3_lib::LittleEndian2Int(substr($wavpackheader, 16,  4));
-				$info['wavpack']['blockheader']['block_samples'] = getid3_lib::LittleEndian2Int(substr($wavpackheader, 20,  4));
-				$info['wavpack']['blockheader']['flags_raw']     = getid3_lib::LittleEndian2Int(substr($wavpackheader, 24,  4));
-				$info['wavpack']['blockheader']['crc']           = getid3_lib::LittleEndian2Int(substr($wavpackheader, 28,  4));
-
-				$info['wavpack']['blockheader']['flags']['bytes_per_sample']     =    1 + ($info['wavpack']['blockheader']['flags_raw'] & 0x00000003);
-				$info['wavpack']['blockheader']['flags']['mono']                 = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000004);
-				$info['wavpack']['blockheader']['flags']['hybrid']               = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000008);
-				$info['wavpack']['blockheader']['flags']['joint_stereo']         = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000010);
-				$info['wavpack']['blockheader']['flags']['cross_decorrelation']  = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000020);
-				$info['wavpack']['blockheader']['flags']['hybrid_noiseshape']    = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000040);
-				$info['wavpack']['blockheader']['flags']['ieee_32bit_float']     = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000080);
-				$info['wavpack']['blockheader']['flags']['int_32bit']            = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000100);
-				$info['wavpack']['blockheader']['flags']['hybrid_bitrate_noise'] = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000200);
-				$info['wavpack']['blockheader']['flags']['hybrid_balance_noise'] = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000400);
-				$info['wavpack']['blockheader']['flags']['multichannel_initial'] = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000800);
-				$info['wavpack']['blockheader']['flags']['multichannel_final']   = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00001000);
-
-				$info['audio']['lossless'] = !$info['wavpack']['blockheader']['flags']['hybrid'];
-			}
-
-			while (!feof($this->getid3->fp) && (ftell($this->getid3->fp) < ($blockheader_offset + $blockheader_size + 8))) {
-
-				$metablock = array('offset'=>ftell($this->getid3->fp));
-				$metablockheader = fread($this->getid3->fp, 2);
-				if (feof($this->getid3->fp)) {
-					break;
-				}
-				$metablock['id'] = ord($metablockheader{0});
-				$metablock['function_id'] = ($metablock['id'] & 0x3F);
-				$metablock['function_name'] = $this->WavPackMetablockNameLookup($metablock['function_id']);
-
-				// The 0x20 bit in the id of the meta subblocks (which is defined as
-				// ID_OPTIONAL_DATA) is a permanent part of the id. The idea is that
-				// if a decoder encounters an id that it does not know about, it uses
-				// that "ID_OPTIONAL_DATA" flag to determine what to do. If it is set
-				// then the decoder simply ignores the metadata, but if it is zero
-				// then the decoder should quit because it means that an understanding
-				// of the metadata is required to correctly decode the audio.
-				$metablock['non_decoder'] = (bool) ($metablock['id'] & 0x20);
-
-				$metablock['padded_data'] = (bool) ($metablock['id'] & 0x40);
-				$metablock['large_block'] = (bool) ($metablock['id'] & 0x80);
-				if ($metablock['large_block']) {
-					$metablockheader .= fread($this->getid3->fp, 2);
-				}
-				$metablock['size'] = getid3_lib::LittleEndian2Int(substr($metablockheader, 1)) * 2; // size is stored in words
-				$metablock['data'] = null;
-
-				if ($metablock['size'] > 0) {
-
-					switch ($metablock['function_id']) {
-						case 0x21: // ID_RIFF_HEADER
-						case 0x22: // ID_RIFF_TRAILER
-						case 0x23: // ID_REPLAY_GAIN
-						case 0x24: // ID_CUESHEET
-						case 0x25: // ID_CONFIG_BLOCK
-						case 0x26: // ID_MD5_CHECKSUM
-							$metablock['data'] = fread($this->getid3->fp, $metablock['size']);
-
-							if ($metablock['padded_data']) {
-								// padded to the nearest even byte
-								$metablock['size']--;
-								$metablock['data'] = substr($metablock['data'], 0, -1);
-							}
-							break;
-
-						case 0x00: // ID_DUMMY
-						case 0x01: // ID_ENCODER_INFO
-						case 0x02: // ID_DECORR_TERMS
-						case 0x03: // ID_DECORR_WEIGHTS
-						case 0x04: // ID_DECORR_SAMPLES
-						case 0x05: // ID_ENTROPY_VARS
-						case 0x06: // ID_HYBRID_PROFILE
-						case 0x07: // ID_SHAPING_WEIGHTS
-						case 0x08: // ID_FLOAT_INFO
-						case 0x09: // ID_INT32_INFO
-						case 0x0A: // ID_WV_BITSTREAM
-						case 0x0B: // ID_WVC_BITSTREAM
-						case 0x0C: // ID_WVX_BITSTREAM
-						case 0x0D: // ID_CHANNEL_INFO
-							fseek($this->getid3->fp, $metablock['offset'] + ($metablock['large_block'] ? 4 : 2) + $metablock['size'], SEEK_SET);
-							break;
-
-						default:
-							$info['warning'][] = 'Unexpected metablock type "0x'.str_pad(dechex($metablock['function_id']), 2, '0', STR_PAD_LEFT).'" at offset '.$metablock['offset'];
-							fseek($this->getid3->fp, $metablock['offset'] + ($metablock['large_block'] ? 4 : 2) + $metablock['size'], SEEK_SET);
-							break;
-					}
-
-					switch ($metablock['function_id']) {
-						case 0x21: // ID_RIFF_HEADER
-							getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
-							$original_wav_filesize = getid3_lib::LittleEndian2Int(substr($metablock['data'], 4, 4));
-
-							$getid3_temp = new getID3();
-							$getid3_temp->openfile($this->getid3->filename);
-							$getid3_riff = new getid3_riff($getid3_temp);
-							$getid3_riff->ParseRIFFdata($metablock['data']);
-							$metablock['riff']            = $getid3_temp->info['riff'];
-							$info['audio']['sample_rate'] = $getid3_temp->info['riff']['raw']['fmt ']['nSamplesPerSec'];
-							unset($getid3_riff, $getid3_temp);
-
-							$metablock['riff']['original_filesize'] = $original_wav_filesize;
-							$info['wavpack']['riff_trailer_size'] = $original_wav_filesize - $metablock['riff']['WAVE']['data'][0]['size'] - $metablock['riff']['header_size'];
-							$info['playtime_seconds'] = $info['wavpack']['blockheader']['total_samples'] / $info['audio']['sample_rate'];
-
-							// Safe RIFF header in case there's a RIFF footer later
-							$metablockRIFFheader = $metablock['data'];
-							break;
-
-
-						case 0x22: // ID_RIFF_TRAILER
-							$metablockRIFFfooter = $metablockRIFFheader.$metablock['data'];
-							getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
-
-							$startoffset = $metablock['offset'] + ($metablock['large_block'] ? 4 : 2);
-							$getid3_temp = new getID3();
-							$getid3_temp->openfile($this->getid3->filename);
-							$getid3_temp->info['avdataend']  = $info['avdataend'];
-							$getid3_temp->info['fileformat'] = 'riff';
-							$getid3_riff = new getid3_riff($getid3_temp);
-							$metablock['riff'] = $getid3_riff->ParseRIFF($startoffset, $startoffset + $metablock['size']);
-
-							if (!empty($metablock['riff']['INFO'])) {
-								$getid3_riff->RIFFcommentsParse($metablock['riff']['INFO'], $metablock['comments']);
-								$info['tags']['riff'] = $metablock['comments'];
-							}
-							unset($getid3_temp, $getid3_riff);
-							break;
-
-
-						case 0x23: // ID_REPLAY_GAIN
-							$info['warning'][] = 'WavPack "Replay Gain" contents not yet handled by getID3() in metablock at offset '.$metablock['offset'];
-							break;
-
-
-						case 0x24: // ID_CUESHEET
-							$info['warning'][] = 'WavPack "Cuesheet" contents not yet handled by getID3() in metablock at offset '.$metablock['offset'];
-							break;
-
-
-						case 0x25: // ID_CONFIG_BLOCK
-							$metablock['flags_raw'] = getid3_lib::LittleEndian2Int(substr($metablock['data'], 0, 3));
-
-							$metablock['flags']['adobe_mode']     = (bool) ($metablock['flags_raw'] & 0x000001); // "adobe" mode for 32-bit floats
-							$metablock['flags']['fast_flag']      = (bool) ($metablock['flags_raw'] & 0x000002); // fast mode
-							$metablock['flags']['very_fast_flag'] = (bool) ($metablock['flags_raw'] & 0x000004); // double fast
-							$metablock['flags']['high_flag']      = (bool) ($metablock['flags_raw'] & 0x000008); // high quality mode
-							$metablock['flags']['very_high_flag'] = (bool) ($metablock['flags_raw'] & 0x000010); // double high (not used yet)
-							$metablock['flags']['bitrate_kbps']   = (bool) ($metablock['flags_raw'] & 0x000020); // bitrate is kbps, not bits / sample
-							$metablock['flags']['auto_shaping']   = (bool) ($metablock['flags_raw'] & 0x000040); // automatic noise shaping
-							$metablock['flags']['shape_override'] = (bool) ($metablock['flags_raw'] & 0x000080); // shaping mode specified
-							$metablock['flags']['joint_override'] = (bool) ($metablock['flags_raw'] & 0x000100); // joint-stereo mode specified
-							$metablock['flags']['copy_time']      = (bool) ($metablock['flags_raw'] & 0x000200); // copy file-time from source
-							$metablock['flags']['create_exe']     = (bool) ($metablock['flags_raw'] & 0x000400); // create executable
-							$metablock['flags']['create_wvc']     = (bool) ($metablock['flags_raw'] & 0x000800); // create correction file
-							$metablock['flags']['optimize_wvc']   = (bool) ($metablock['flags_raw'] & 0x001000); // maximize bybrid compression
-							$metablock['flags']['quality_mode']   = (bool) ($metablock['flags_raw'] & 0x002000); // psychoacoustic quality mode
-							$metablock['flags']['raw_flag']       = (bool) ($metablock['flags_raw'] & 0x004000); // raw mode (not implemented yet)
-							$metablock['flags']['calc_noise']     = (bool) ($metablock['flags_raw'] & 0x008000); // calc noise in hybrid mode
-							$metablock['flags']['lossy_mode']     = (bool) ($metablock['flags_raw'] & 0x010000); // obsolete (for information)
-							$metablock['flags']['extra_mode']     = (bool) ($metablock['flags_raw'] & 0x020000); // extra processing mode
-							$metablock['flags']['skip_wvx']       = (bool) ($metablock['flags_raw'] & 0x040000); // no wvx stream w/ floats & big ints
-							$metablock['flags']['md5_checksum']   = (bool) ($metablock['flags_raw'] & 0x080000); // compute & store MD5 signature
-							$metablock['flags']['quiet_mode']     = (bool) ($metablock['flags_raw'] & 0x100000); // don't report progress %
-
-							$info['wavpack']['config_flags'] = $metablock['flags'];
-
-
-							$info['audio']['encoder_options'] = '';
-							if ($info['wavpack']['blockheader']['flags']['hybrid']) {
-								$info['audio']['encoder_options'] .= ' -b???';
-							}
-							$info['audio']['encoder_options'] .= ($metablock['flags']['adobe_mode']     ? ' -a' : '');
-							$info['audio']['encoder_options'] .= ($metablock['flags']['optimize_wvc']   ? ' -cc' : '');
-							$info['audio']['encoder_options'] .= ($metablock['flags']['create_exe']     ? ' -e' : '');
-							$info['audio']['encoder_options'] .= ($metablock['flags']['fast_flag']      ? ' -f' : '');
-							$info['audio']['encoder_options'] .= ($metablock['flags']['joint_override'] ? ' -j?' : '');
-							$info['audio']['encoder_options'] .= ($metablock['flags']['high_flag']      ? ' -h' : '');
-							$info['audio']['encoder_options'] .= ($metablock['flags']['md5_checksum']   ? ' -m' : '');
-							$info['audio']['encoder_options'] .= ($metablock['flags']['calc_noise']     ? ' -n' : '');
-							$info['audio']['encoder_options'] .= ($metablock['flags']['shape_override'] ? ' -s?' : '');
-							$info['audio']['encoder_options'] .= ($metablock['flags']['extra_mode']     ? ' -x?' : '');
-							if (!empty($info['audio']['encoder_options'])) {
-								$info['audio']['encoder_options'] = trim($info['audio']['encoder_options']);
-							} elseif (isset($info['audio']['encoder_options'])) {
-								unset($info['audio']['encoder_options']);
-							}
-							break;
-
-
-						case 0x26: // ID_MD5_CHECKSUM
-							if (strlen($metablock['data']) == 16) {
-								$info['md5_data_source'] = strtolower(getid3_lib::PrintHexBytes($metablock['data'], true, false, false));
-							} else {
-								$info['warning'][] = 'Expecting 16 bytes of WavPack "MD5 Checksum" in metablock at offset '.$metablock['offset'].', but found '.strlen($metablock['data']).' bytes';
-							}
-							break;
-
-
-						case 0x00: // ID_DUMMY
-						case 0x01: // ID_ENCODER_INFO
-						case 0x02: // ID_DECORR_TERMS
-						case 0x03: // ID_DECORR_WEIGHTS
-						case 0x04: // ID_DECORR_SAMPLES
-						case 0x05: // ID_ENTROPY_VARS
-						case 0x06: // ID_HYBRID_PROFILE
-						case 0x07: // ID_SHAPING_WEIGHTS
-						case 0x08: // ID_FLOAT_INFO
-						case 0x09: // ID_INT32_INFO
-						case 0x0A: // ID_WV_BITSTREAM
-						case 0x0B: // ID_WVC_BITSTREAM
-						case 0x0C: // ID_WVX_BITSTREAM
-						case 0x0D: // ID_CHANNEL_INFO
-							unset($metablock);
-							break;
-					}
-
-				}
-				if (!empty($metablock)) {
-					$info['wavpack']['metablocks'][] = $metablock;
-				}
-
-			}
-
-		}
-
-		$info['audio']['encoder']         = 'WavPack v'.$info['wavpack']['blockheader']['major_version'].'.'.str_pad($info['wavpack']['blockheader']['minor_version'], 2, '0', STR_PAD_LEFT);
-		$info['audio']['bits_per_sample'] = $info['wavpack']['blockheader']['flags']['bytes_per_sample'] * 8;
-		$info['audio']['channels']        = ($info['wavpack']['blockheader']['flags']['mono'] ? 1 : 2);
-
-		if (!empty($info['playtime_seconds'])) {
-
-			$info['audio']['bitrate']     = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-
-		} else {
-
-			$info['audio']['dataformat']  = 'wvc';
-
-		}
-
-		return true;
-	}
-
-
-	function WavPackMetablockNameLookup(&$id) {
-		static $WavPackMetablockNameLookup = array(
-			0x00 => 'Dummy',
-			0x01 => 'Encoder Info',
-			0x02 => 'Decorrelation Terms',
-			0x03 => 'Decorrelation Weights',
-			0x04 => 'Decorrelation Samples',
-			0x05 => 'Entropy Variables',
-			0x06 => 'Hybrid Profile',
-			0x07 => 'Shaping Weights',
-			0x08 => 'Float Info',
-			0x09 => 'Int32 Info',
-			0x0A => 'WV Bitstream',
-			0x0B => 'WVC Bitstream',
-			0x0C => 'WVX Bitstream',
-			0x0D => 'Channel Info',
-			0x21 => 'RIFF header',
-			0x22 => 'RIFF trailer',
-			0x23 => 'Replay Gain',
-			0x24 => 'Cuesheet',
-			0x25 => 'Config Block',
-			0x26 => 'MD5 Checksum',
-		);
-		return (isset($WavPackMetablockNameLookup[$id]) ? $WavPackMetablockNameLookup[$id] : '');
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.graphic.bmp.php b/lib/getid3/getid3/module.graphic.bmp.php
deleted file mode 100644
index 5ac671fbc..000000000
--- a/lib/getid3/getid3/module.graphic.bmp.php
+++ /dev/null
@@ -1,690 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.graphic.bmp.php                                      //
-// module for analyzing BMP Image files                        //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_bmp extends getid3_handler
-{
-	var $ExtractPalette = false;
-	var $ExtractData    = false;
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		// shortcuts
-		$info['bmp']['header']['raw'] = array();
-		$thisfile_bmp                         = &$info['bmp'];
-		$thisfile_bmp_header                  = &$thisfile_bmp['header'];
-		$thisfile_bmp_header_raw              = &$thisfile_bmp_header['raw'];
-
-		// BITMAPFILEHEADER [14 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_62uq.asp
-		// all versions
-		// WORD    bfType;
-		// DWORD   bfSize;
-		// WORD    bfReserved1;
-		// WORD    bfReserved2;
-		// DWORD   bfOffBits;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$offset = 0;
-		$BMPheader = fread($this->getid3->fp, 14 + 40);
-
-		$thisfile_bmp_header_raw['identifier']  = substr($BMPheader, $offset, 2);
-		$offset += 2;
-
-		$magic = 'BM';
-		if ($thisfile_bmp_header_raw['identifier'] != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($thisfile_bmp_header_raw['identifier']).'"';
-			unset($info['fileformat']);
-			unset($info['bmp']);
-			return false;
-		}
-
-		$thisfile_bmp_header_raw['filesize']    = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-		$offset += 4;
-		$thisfile_bmp_header_raw['reserved1']   = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 2));
-		$offset += 2;
-		$thisfile_bmp_header_raw['reserved2']   = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 2));
-		$offset += 2;
-		$thisfile_bmp_header_raw['data_offset'] = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-		$offset += 4;
-		$thisfile_bmp_header_raw['header_size'] = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-		$offset += 4;
-
-
-		// check if the hardcoded-to-1 "planes" is at offset 22 or 26
-		$planes22 = getid3_lib::LittleEndian2Int(substr($BMPheader, 22, 2));
-		$planes26 = getid3_lib::LittleEndian2Int(substr($BMPheader, 26, 2));
-		if (($planes22 == 1) && ($planes26 != 1)) {
-			$thisfile_bmp['type_os']      = 'OS/2';
-			$thisfile_bmp['type_version'] = 1;
-		} elseif (($planes26 == 1) && ($planes22 != 1)) {
-			$thisfile_bmp['type_os']      = 'Windows';
-			$thisfile_bmp['type_version'] = 1;
-		} elseif ($thisfile_bmp_header_raw['header_size'] == 12) {
-			$thisfile_bmp['type_os']      = 'OS/2';
-			$thisfile_bmp['type_version'] = 1;
-		} elseif ($thisfile_bmp_header_raw['header_size'] == 40) {
-			$thisfile_bmp['type_os']      = 'Windows';
-			$thisfile_bmp['type_version'] = 1;
-		} elseif ($thisfile_bmp_header_raw['header_size'] == 84) {
-			$thisfile_bmp['type_os']      = 'Windows';
-			$thisfile_bmp['type_version'] = 4;
-		} elseif ($thisfile_bmp_header_raw['header_size'] == 100) {
-			$thisfile_bmp['type_os']      = 'Windows';
-			$thisfile_bmp['type_version'] = 5;
-		} else {
-			$info['error'][] = 'Unknown BMP subtype (or not a BMP file)';
-			unset($info['fileformat']);
-			unset($info['bmp']);
-			return false;
-		}
-
-		$info['fileformat']                  = 'bmp';
-		$info['video']['dataformat']         = 'bmp';
-		$info['video']['lossless']           = true;
-		$info['video']['pixel_aspect_ratio'] = (float) 1;
-
-		if ($thisfile_bmp['type_os'] == 'OS/2') {
-
-			// OS/2-format BMP
-			// http://netghost.narod.ru/gff/graphics/summary/os2bmp.htm
-
-			// DWORD  Size;             /* Size of this structure in bytes */
-			// DWORD  Width;            /* Bitmap width in pixels */
-			// DWORD  Height;           /* Bitmap height in pixel */
-			// WORD   NumPlanes;        /* Number of bit planes (color depth) */
-			// WORD   BitsPerPixel;     /* Number of bits per pixel per plane */
-
-			$thisfile_bmp_header_raw['width']          = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 2));
-			$offset += 2;
-			$thisfile_bmp_header_raw['height']         = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 2));
-			$offset += 2;
-			$thisfile_bmp_header_raw['planes']         = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 2));
-			$offset += 2;
-			$thisfile_bmp_header_raw['bits_per_pixel'] = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 2));
-			$offset += 2;
-
-			$info['video']['resolution_x']    = $thisfile_bmp_header_raw['width'];
-			$info['video']['resolution_y']    = $thisfile_bmp_header_raw['height'];
-			$info['video']['codec']           = 'BI_RGB '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
-			$info['video']['bits_per_sample'] = $thisfile_bmp_header_raw['bits_per_pixel'];
-
-			if ($thisfile_bmp['type_version'] >= 2) {
-				// DWORD  Compression;      /* Bitmap compression scheme */
-				// DWORD  ImageDataSize;    /* Size of bitmap data in bytes */
-				// DWORD  XResolution;      /* X resolution of display device */
-				// DWORD  YResolution;      /* Y resolution of display device */
-				// DWORD  ColorsUsed;       /* Number of color table indices used */
-				// DWORD  ColorsImportant;  /* Number of important color indices */
-				// WORD   Units;            /* Type of units used to measure resolution */
-				// WORD   Reserved;         /* Pad structure to 4-byte boundary */
-				// WORD   Recording;        /* Recording algorithm */
-				// WORD   Rendering;        /* Halftoning algorithm used */
-				// DWORD  Size1;            /* Reserved for halftoning algorithm use */
-				// DWORD  Size2;            /* Reserved for halftoning algorithm use */
-				// DWORD  ColorEncoding;    /* Color model used in bitmap */
-				// DWORD  Identifier;       /* Reserved for application use */
-
-				$thisfile_bmp_header_raw['compression']      = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['bmp_data_size']    = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['resolution_h']     = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['resolution_v']     = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['colors_used']      = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['colors_important'] = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['resolution_units'] = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 2));
-				$offset += 2;
-				$thisfile_bmp_header_raw['reserved1']        = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 2));
-				$offset += 2;
-				$thisfile_bmp_header_raw['recording']        = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 2));
-				$offset += 2;
-				$thisfile_bmp_header_raw['rendering']        = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 2));
-				$offset += 2;
-				$thisfile_bmp_header_raw['size1']            = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['size2']            = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['color_encoding']   = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['identifier']       = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-
-				$thisfile_bmp_header['compression'] = $this->BMPcompressionOS2Lookup($thisfile_bmp_header_raw['compression']);
-
-				$info['video']['codec'] = $thisfile_bmp_header['compression'].' '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
-			}
-
-		} elseif ($thisfile_bmp['type_os'] == 'Windows') {
-
-			// Windows-format BMP
-
-			// BITMAPINFOHEADER - [40 bytes] http://msdn.microsoft.com/library/en-us/gdi/bitmaps_1rw2.asp
-			// all versions
-			// DWORD  biSize;
-			// LONG   biWidth;
-			// LONG   biHeight;
-			// WORD   biPlanes;
-			// WORD   biBitCount;
-			// DWORD  biCompression;
-			// DWORD  biSizeImage;
-			// LONG   biXPelsPerMeter;
-			// LONG   biYPelsPerMeter;
-			// DWORD  biClrUsed;
-			// DWORD  biClrImportant;
-
-			// possibly integrate this section and module.audio-video.riff.php::ParseBITMAPINFOHEADER() ?
-
-			$thisfile_bmp_header_raw['width']            = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4), true);
-			$offset += 4;
-			$thisfile_bmp_header_raw['height']           = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4), true);
-			$offset += 4;
-			$thisfile_bmp_header_raw['planes']           = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 2));
-			$offset += 2;
-			$thisfile_bmp_header_raw['bits_per_pixel']   = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 2));
-			$offset += 2;
-			$thisfile_bmp_header_raw['compression']      = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-			$offset += 4;
-			$thisfile_bmp_header_raw['bmp_data_size']    = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-			$offset += 4;
-			$thisfile_bmp_header_raw['resolution_h']     = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4), true);
-			$offset += 4;
-			$thisfile_bmp_header_raw['resolution_v']     = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4), true);
-			$offset += 4;
-			$thisfile_bmp_header_raw['colors_used']      = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-			$offset += 4;
-			$thisfile_bmp_header_raw['colors_important'] = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-			$offset += 4;
-
-			$thisfile_bmp_header['compression']  = $this->BMPcompressionWindowsLookup($thisfile_bmp_header_raw['compression']);
-			$info['video']['resolution_x']    = $thisfile_bmp_header_raw['width'];
-			$info['video']['resolution_y']    = $thisfile_bmp_header_raw['height'];
-			$info['video']['codec']           = $thisfile_bmp_header['compression'].' '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
-			$info['video']['bits_per_sample'] = $thisfile_bmp_header_raw['bits_per_pixel'];
-
-			if (($thisfile_bmp['type_version'] >= 4) || ($thisfile_bmp_header_raw['compression'] == 3)) {
-				// should only be v4+, but BMPs with type_version==1 and BI_BITFIELDS compression have been seen
-				$BMPheader .= fread($this->getid3->fp, 44);
-
-				// BITMAPV4HEADER - [44 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_2k1e.asp
-				// Win95+, WinNT4.0+
-				// DWORD        bV4RedMask;
-				// DWORD        bV4GreenMask;
-				// DWORD        bV4BlueMask;
-				// DWORD        bV4AlphaMask;
-				// DWORD        bV4CSType;
-				// CIEXYZTRIPLE bV4Endpoints;
-				// DWORD        bV4GammaRed;
-				// DWORD        bV4GammaGreen;
-				// DWORD        bV4GammaBlue;
-				$thisfile_bmp_header_raw['red_mask']     = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['green_mask']   = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['blue_mask']    = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['alpha_mask']   = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['cs_type']      = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['ciexyz_red']   =                  substr($BMPheader, $offset, 4);
-				$offset += 4;
-				$thisfile_bmp_header_raw['ciexyz_green'] =                  substr($BMPheader, $offset, 4);
-				$offset += 4;
-				$thisfile_bmp_header_raw['ciexyz_blue']  =                  substr($BMPheader, $offset, 4);
-				$offset += 4;
-				$thisfile_bmp_header_raw['gamma_red']    = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['gamma_green']  = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['gamma_blue']   = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-
-				$thisfile_bmp_header['ciexyz_red']   = getid3_lib::FixedPoint2_30(strrev($thisfile_bmp_header_raw['ciexyz_red']));
-				$thisfile_bmp_header['ciexyz_green'] = getid3_lib::FixedPoint2_30(strrev($thisfile_bmp_header_raw['ciexyz_green']));
-				$thisfile_bmp_header['ciexyz_blue']  = getid3_lib::FixedPoint2_30(strrev($thisfile_bmp_header_raw['ciexyz_blue']));
-			}
-
-			if ($thisfile_bmp['type_version'] >= 5) {
-				$BMPheader .= fread($this->getid3->fp, 16);
-
-				// BITMAPV5HEADER - [16 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_7c36.asp
-				// Win98+, Win2000+
-				// DWORD        bV5Intent;
-				// DWORD        bV5ProfileData;
-				// DWORD        bV5ProfileSize;
-				// DWORD        bV5Reserved;
-				$thisfile_bmp_header_raw['intent']              = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['profile_data_offset'] = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['profile_data_size']   = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-				$thisfile_bmp_header_raw['reserved3']           = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
-				$offset += 4;
-			}
-
-		} else {
-
-			$info['error'][] = 'Unknown BMP format in header.';
-			return false;
-
-		}
-
-
-		if ($this->ExtractPalette || $this->ExtractData) {
-			$PaletteEntries = 0;
-			if ($thisfile_bmp_header_raw['bits_per_pixel'] < 16) {
-				$PaletteEntries = pow(2, $thisfile_bmp_header_raw['bits_per_pixel']);
-			} elseif (isset($thisfile_bmp_header_raw['colors_used']) && ($thisfile_bmp_header_raw['colors_used'] > 0) && ($thisfile_bmp_header_raw['colors_used'] <= 256)) {
-				$PaletteEntries = $thisfile_bmp_header_raw['colors_used'];
-			}
-			if ($PaletteEntries > 0) {
-				$BMPpalette = fread($this->getid3->fp, 4 * $PaletteEntries);
-				$paletteoffset = 0;
-				for ($i = 0; $i < $PaletteEntries; $i++) {
-					// RGBQUAD          - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_5f8y.asp
-					// BYTE    rgbBlue;
-					// BYTE    rgbGreen;
-					// BYTE    rgbRed;
-					// BYTE    rgbReserved;
-					$blue  = getid3_lib::LittleEndian2Int(substr($BMPpalette, $paletteoffset++, 1));
-					$green = getid3_lib::LittleEndian2Int(substr($BMPpalette, $paletteoffset++, 1));
-					$red   = getid3_lib::LittleEndian2Int(substr($BMPpalette, $paletteoffset++, 1));
-					if (($thisfile_bmp['type_os'] == 'OS/2') && ($thisfile_bmp['type_version'] == 1)) {
-						// no padding byte
-					} else {
-						$paletteoffset++; // padding byte
-					}
-					$thisfile_bmp['palette'][$i] = (($red << 16) | ($green << 8) | $blue);
-				}
-			}
-		}
-
-		if ($this->ExtractData) {
-			fseek($this->getid3->fp, $thisfile_bmp_header_raw['data_offset'], SEEK_SET);
-			$RowByteLength = ceil(($thisfile_bmp_header_raw['width'] * ($thisfile_bmp_header_raw['bits_per_pixel'] / 8)) / 4) * 4; // round up to nearest DWORD boundry
-			$BMPpixelData = fread($this->getid3->fp, $thisfile_bmp_header_raw['height'] * $RowByteLength);
-			$pixeldataoffset = 0;
-			$thisfile_bmp_header_raw['compression'] = (isset($thisfile_bmp_header_raw['compression']) ? $thisfile_bmp_header_raw['compression'] : '');
-			switch ($thisfile_bmp_header_raw['compression']) {
-
-				case 0: // BI_RGB
-					switch ($thisfile_bmp_header_raw['bits_per_pixel']) {
-						case 1:
-							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
-								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
-									$paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
-									for ($i = 7; $i >= 0; $i--) {
-										$paletteindex = ($paletteindexbyte & (0x01 << $i)) >> $i;
-										$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
-										$col++;
-									}
-								}
-								while (($pixeldataoffset % 4) != 0) {
-									// lines are padded to nearest DWORD
-									$pixeldataoffset++;
-								}
-							}
-							break;
-
-						case 4:
-							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
-								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
-									$paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
-									for ($i = 1; $i >= 0; $i--) {
-										$paletteindex = ($paletteindexbyte & (0x0F << (4 * $i))) >> (4 * $i);
-										$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
-										$col++;
-									}
-								}
-								while (($pixeldataoffset % 4) != 0) {
-									// lines are padded to nearest DWORD
-									$pixeldataoffset++;
-								}
-							}
-							break;
-
-						case 8:
-							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
-								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-									$paletteindex = ord($BMPpixelData{$pixeldataoffset++});
-									$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
-								}
-								while (($pixeldataoffset % 4) != 0) {
-									// lines are padded to nearest DWORD
-									$pixeldataoffset++;
-								}
-							}
-							break;
-
-						case 24:
-							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
-								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-									$thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset+2}) << 16) | (ord($BMPpixelData{$pixeldataoffset+1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
-									$pixeldataoffset += 3;
-								}
-								while (($pixeldataoffset % 4) != 0) {
-									// lines are padded to nearest DWORD
-									$pixeldataoffset++;
-								}
-							}
-							break;
-
-						case 32:
-							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
-								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-									$thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset+3}) << 24) | (ord($BMPpixelData{$pixeldataoffset+2}) << 16) | (ord($BMPpixelData{$pixeldataoffset+1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
-									$pixeldataoffset += 4;
-								}
-								while (($pixeldataoffset % 4) != 0) {
-									// lines are padded to nearest DWORD
-									$pixeldataoffset++;
-								}
-							}
-							break;
-
-						case 16:
-							// ?
-							break;
-
-						default:
-							$info['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
-							break;
-					}
-					break;
-
-
-				case 1: // BI_RLE8 - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_6x0u.asp
-					switch ($thisfile_bmp_header_raw['bits_per_pixel']) {
-						case 8:
-							$pixelcounter = 0;
-							while ($pixeldataoffset < strlen($BMPpixelData)) {
-								$firstbyte  = getid3_lib::LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
-								$secondbyte = getid3_lib::LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
-								if ($firstbyte == 0) {
-
-									// escaped/absolute mode - the first byte of the pair can be set to zero to
-									// indicate an escape character that denotes the end of a line, the end of
-									// a bitmap, or a delta, depending on the value of the second byte.
-									switch ($secondbyte) {
-										case 0:
-											// end of line
-											// no need for special processing, just ignore
-											break;
-
-										case 1:
-											// end of bitmap
-											$pixeldataoffset = strlen($BMPpixelData); // force to exit loop just in case
-											break;
-
-										case 2:
-											// delta - The 2 bytes following the escape contain unsigned values
-											// indicating the horizontal and vertical offsets of the next pixel
-											// from the current position.
-											$colincrement = getid3_lib::LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
-											$rowincrement = getid3_lib::LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
-											$col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement;
-											$row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement;
-											$pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col;
-											break;
-
-										default:
-											// In absolute mode, the first byte is zero and the second byte is a
-											// value in the range 03H through FFH. The second byte represents the
-											// number of bytes that follow, each of which contains the color index
-											// of a single pixel. Each run must be aligned on a word boundary.
-											for ($i = 0; $i < $secondbyte; $i++) {
-												$paletteindex = getid3_lib::LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
-												$col = $pixelcounter % $thisfile_bmp_header_raw['width'];
-												$row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
-												$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
-												$pixelcounter++;
-											}
-											while (($pixeldataoffset % 2) != 0) {
-												// Each run must be aligned on a word boundary.
-												$pixeldataoffset++;
-											}
-											break;
-									}
-
-								} else {
-
-									// encoded mode - the first byte specifies the number of consecutive pixels
-									// to be drawn using the color index contained in the second byte.
-									for ($i = 0; $i < $firstbyte; $i++) {
-										$col = $pixelcounter % $thisfile_bmp_header_raw['width'];
-										$row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
-										$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$secondbyte];
-										$pixelcounter++;
-									}
-
-								}
-							}
-							break;
-
-						default:
-							$info['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
-							break;
-					}
-					break;
-
-
-
-				case 2: // BI_RLE4 - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_6x0u.asp
-					switch ($thisfile_bmp_header_raw['bits_per_pixel']) {
-						case 4:
-							$pixelcounter = 0;
-							while ($pixeldataoffset < strlen($BMPpixelData)) {
-								$firstbyte  = getid3_lib::LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
-								$secondbyte = getid3_lib::LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
-								if ($firstbyte == 0) {
-
-									// escaped/absolute mode - the first byte of the pair can be set to zero to
-									// indicate an escape character that denotes the end of a line, the end of
-									// a bitmap, or a delta, depending on the value of the second byte.
-									switch ($secondbyte) {
-										case 0:
-											// end of line
-											// no need for special processing, just ignore
-											break;
-
-										case 1:
-											// end of bitmap
-											$pixeldataoffset = strlen($BMPpixelData); // force to exit loop just in case
-											break;
-
-										case 2:
-											// delta - The 2 bytes following the escape contain unsigned values
-											// indicating the horizontal and vertical offsets of the next pixel
-											// from the current position.
-											$colincrement = getid3_lib::LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
-											$rowincrement = getid3_lib::LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
-											$col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement;
-											$row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement;
-											$pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col;
-											break;
-
-										default:
-											// In absolute mode, the first byte is zero. The second byte contains the number
-											// of color indexes that follow. Subsequent bytes contain color indexes in their
-											// high- and low-order 4 bits, one color index for each pixel. In absolute mode,
-											// each run must be aligned on a word boundary.
-											unset($paletteindexes);
-											for ($i = 0; $i < ceil($secondbyte / 2); $i++) {
-												$paletteindexbyte = getid3_lib::LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
-												$paletteindexes[] = ($paletteindexbyte & 0xF0) >> 4;
-												$paletteindexes[] = ($paletteindexbyte & 0x0F);
-											}
-											while (($pixeldataoffset % 2) != 0) {
-												// Each run must be aligned on a word boundary.
-												$pixeldataoffset++;
-											}
-
-											foreach ($paletteindexes as $paletteindex) {
-												$col = $pixelcounter % $thisfile_bmp_header_raw['width'];
-												$row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
-												$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
-												$pixelcounter++;
-											}
-											break;
-									}
-
-								} else {
-
-									// encoded mode - the first byte of the pair contains the number of pixels to be
-									// drawn using the color indexes in the second byte. The second byte contains two
-									// color indexes, one in its high-order 4 bits and one in its low-order 4 bits.
-									// The first of the pixels is drawn using the color specified by the high-order
-									// 4 bits, the second is drawn using the color in the low-order 4 bits, the third
-									// is drawn using the color in the high-order 4 bits, and so on, until all the
-									// pixels specified by the first byte have been drawn.
-									$paletteindexes[0] = ($secondbyte & 0xF0) >> 4;
-									$paletteindexes[1] = ($secondbyte & 0x0F);
-									for ($i = 0; $i < $firstbyte; $i++) {
-										$col = $pixelcounter % $thisfile_bmp_header_raw['width'];
-										$row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
-										$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindexes[($i % 2)]];
-										$pixelcounter++;
-									}
-
-								}
-							}
-							break;
-
-						default:
-							$info['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
-							break;
-					}
-					break;
-
-
-				case 3: // BI_BITFIELDS
-					switch ($thisfile_bmp_header_raw['bits_per_pixel']) {
-						case 16:
-						case 32:
-							$redshift   = 0;
-							$greenshift = 0;
-							$blueshift  = 0;
-							while ((($thisfile_bmp_header_raw['red_mask'] >> $redshift) & 0x01) == 0) {
-								$redshift++;
-							}
-							while ((($thisfile_bmp_header_raw['green_mask'] >> $greenshift) & 0x01) == 0) {
-								$greenshift++;
-							}
-							while ((($thisfile_bmp_header_raw['blue_mask'] >> $blueshift) & 0x01) == 0) {
-								$blueshift++;
-							}
-							for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
-								for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-									$pixelvalue = getid3_lib::LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset, $thisfile_bmp_header_raw['bits_per_pixel'] / 8));
-									$pixeldataoffset += $thisfile_bmp_header_raw['bits_per_pixel'] / 8;
-
-									$red   = intval(round(((($pixelvalue & $thisfile_bmp_header_raw['red_mask'])   >> $redshift)   / ($thisfile_bmp_header_raw['red_mask']   >> $redshift))   * 255));
-									$green = intval(round(((($pixelvalue & $thisfile_bmp_header_raw['green_mask']) >> $greenshift) / ($thisfile_bmp_header_raw['green_mask'] >> $greenshift)) * 255));
-									$blue  = intval(round(((($pixelvalue & $thisfile_bmp_header_raw['blue_mask'])  >> $blueshift)  / ($thisfile_bmp_header_raw['blue_mask']  >> $blueshift))  * 255));
-									$thisfile_bmp['data'][$row][$col] = (($red << 16) | ($green << 8) | ($blue));
-								}
-								while (($pixeldataoffset % 4) != 0) {
-									// lines are padded to nearest DWORD
-									$pixeldataoffset++;
-								}
-							}
-							break;
-
-						default:
-							$info['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
-							break;
-					}
-					break;
-
-
-				default: // unhandled compression type
-					$info['error'][] = 'Unknown/unhandled compression type value ('.$thisfile_bmp_header_raw['compression'].') - cannot decompress pixel data';
-					break;
-			}
-		}
-
-		return true;
-	}
-
-
-	function PlotBMP(&$BMPinfo) {
-		$starttime = time();
-		if (!isset($BMPinfo['bmp']['data']) || !is_array($BMPinfo['bmp']['data'])) {
-			echo 'ERROR: no pixel data<BR>';
-			return false;
-		}
-		set_time_limit(intval(round($BMPinfo['resolution_x'] * $BMPinfo['resolution_y'] / 10000)));
-		if ($im = ImageCreateTrueColor($BMPinfo['resolution_x'], $BMPinfo['resolution_y'])) {
-			for ($row = 0; $row < $BMPinfo['resolution_y']; $row++) {
-				for ($col = 0; $col < $BMPinfo['resolution_x']; $col++) {
-					if (isset($BMPinfo['bmp']['data'][$row][$col])) {
-						$red   = ($BMPinfo['bmp']['data'][$row][$col] & 0x00FF0000) >> 16;
-						$green = ($BMPinfo['bmp']['data'][$row][$col] & 0x0000FF00) >> 8;
-						$blue  = ($BMPinfo['bmp']['data'][$row][$col] & 0x000000FF);
-						$pixelcolor = ImageColorAllocate($im, $red, $green, $blue);
-						ImageSetPixel($im, $col, $row, $pixelcolor);
-					} else {
-						//echo 'ERROR: no data for pixel '.$row.' x '.$col.'<BR>';
-						//return false;
-					}
-				}
-			}
-			if (headers_sent()) {
-				echo 'plotted '.($BMPinfo['resolution_x'] * $BMPinfo['resolution_y']).' pixels in '.(time() - $starttime).' seconds<BR>';
-				ImageDestroy($im);
-				exit;
-			} else {
-				header('Content-type: image/png');
-				ImagePNG($im);
-				ImageDestroy($im);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	function BMPcompressionWindowsLookup($compressionid) {
-		static $BMPcompressionWindowsLookup = array(
-			0 => 'BI_RGB',
-			1 => 'BI_RLE8',
-			2 => 'BI_RLE4',
-			3 => 'BI_BITFIELDS',
-			4 => 'BI_JPEG',
-			5 => 'BI_PNG'
-		);
-		return (isset($BMPcompressionWindowsLookup[$compressionid]) ? $BMPcompressionWindowsLookup[$compressionid] : 'invalid');
-	}
-
-	function BMPcompressionOS2Lookup($compressionid) {
-		static $BMPcompressionOS2Lookup = array(
-			0 => 'BI_RGB',
-			1 => 'BI_RLE8',
-			2 => 'BI_RLE4',
-			3 => 'Huffman 1D',
-			4 => 'BI_RLE24',
-		);
-		return (isset($BMPcompressionOS2Lookup[$compressionid]) ? $BMPcompressionOS2Lookup[$compressionid] : 'invalid');
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.graphic.efax.php b/lib/getid3/getid3/module.graphic.efax.php
deleted file mode 100644
index 2a57302e1..000000000
--- a/lib/getid3/getid3/module.graphic.efax.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.archive.efax.php                                     //
-// module for analyzing eFax files                             //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_efax extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$efaxheader = fread($this->getid3->fp, 1024);
-
-		$info['efax']['header']['magic'] = substr($efaxheader, 0, 2);
-		if ($info['efax']['header']['magic'] != "\xDC\xFE") {
-			$info['error'][] = 'Invalid eFax byte order identifier (expecting DC FE, found '.getid3_lib::PrintHexBytes($info['efax']['header']['magic']).') at offset '.$info['avdataoffset'];
-			return false;
-		}
-		$info['fileformat'] = 'efax';
-
-		$info['efax']['header']['filesize'] = getid3_lib::LittleEndian2Int(substr($efaxheader, 2, 4));
-		if ($info['efax']['header']['filesize'] != $info['filesize']) {
-			$info['error'][] = 'Probable '.(($info['efax']['header']['filesize'] > $info['filesize']) ? 'truncated' : 'corrupt').' file, expecting '.$info['efax']['header']['filesize'].' bytes, found '.$info['filesize'].' bytes';
-		}
-		$info['efax']['header']['software1'] =                        rtrim(substr($efaxheader,  26, 32), "\x00");
-		$info['efax']['header']['software2'] =                        rtrim(substr($efaxheader,  58, 32), "\x00");
-		$info['efax']['header']['software3'] =                        rtrim(substr($efaxheader,  90, 32), "\x00");
-
-		$info['efax']['header']['pages']      = getid3_lib::LittleEndian2Int(substr($efaxheader, 198, 2));
-		$info['efax']['header']['data_bytes'] = getid3_lib::LittleEndian2Int(substr($efaxheader, 202, 4));
-
-$info['error'][] = 'eFax parsing not enabled in this version of getID3() ['.$this->getid3->version().']';
-return false;
-
-		return true;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.graphic.gif.php b/lib/getid3/getid3/module.graphic.gif.php
deleted file mode 100644
index 0b3e1379f..000000000
--- a/lib/getid3/getid3/module.graphic.gif.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.graphic.gif.php                                      //
-// module for analyzing GIF Image files                        //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_gif extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat']                  = 'gif';
-		$info['video']['dataformat']         = 'gif';
-		$info['video']['lossless']           = true;
-		$info['video']['pixel_aspect_ratio'] = (float) 1;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$GIFheader = fread($this->getid3->fp, 13);
-		$offset = 0;
-
-		$info['gif']['header']['raw']['identifier']            =                              substr($GIFheader, $offset, 3);
-		$offset += 3;
-
-		$magic = 'GIF';
-		if ($info['gif']['header']['raw']['identifier'] != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($info['gif']['header']['raw']['identifier']).'"';
-			unset($info['fileformat']);
-			unset($info['gif']);
-			return false;
-		}
-
-		$info['gif']['header']['raw']['version']               =                              substr($GIFheader, $offset, 3);
-		$offset += 3;
-		$info['gif']['header']['raw']['width']                 = getid3_lib::LittleEndian2Int(substr($GIFheader, $offset, 2));
-		$offset += 2;
-		$info['gif']['header']['raw']['height']                = getid3_lib::LittleEndian2Int(substr($GIFheader, $offset, 2));
-		$offset += 2;
-		$info['gif']['header']['raw']['flags']                 = getid3_lib::LittleEndian2Int(substr($GIFheader, $offset, 1));
-		$offset += 1;
-		$info['gif']['header']['raw']['bg_color_index']        = getid3_lib::LittleEndian2Int(substr($GIFheader, $offset, 1));
-		$offset += 1;
-		$info['gif']['header']['raw']['aspect_ratio']          = getid3_lib::LittleEndian2Int(substr($GIFheader, $offset, 1));
-		$offset += 1;
-
-		$info['video']['resolution_x']                         = $info['gif']['header']['raw']['width'];
-		$info['video']['resolution_y']                         = $info['gif']['header']['raw']['height'];
-		$info['gif']['version']                                = $info['gif']['header']['raw']['version'];
-		$info['gif']['header']['flags']['global_color_table']  = (bool) ($info['gif']['header']['raw']['flags'] & 0x80);
-		if ($info['gif']['header']['raw']['flags'] & 0x80) {
-			// Number of bits per primary color available to the original image, minus 1
-			$info['gif']['header']['bits_per_pixel']  = 3 * ((($info['gif']['header']['raw']['flags'] & 0x70) >> 4) + 1);
-		} else {
-			$info['gif']['header']['bits_per_pixel']  = 0;
-		}
-		$info['gif']['header']['flags']['global_color_sorted'] = (bool) ($info['gif']['header']['raw']['flags'] & 0x40);
-		if ($info['gif']['header']['flags']['global_color_table']) {
-			// the number of bytes contained in the Global Color Table. To determine that
-			// actual size of the color table, raise 2 to [the value of the field + 1]
-			$info['gif']['header']['global_color_size'] = pow(2, ($info['gif']['header']['raw']['flags'] & 0x07) + 1);
-			$info['video']['bits_per_sample']           = ($info['gif']['header']['raw']['flags'] & 0x07) + 1;
-		} else {
-			$info['gif']['header']['global_color_size'] = 0;
-		}
-		if ($info['gif']['header']['raw']['aspect_ratio'] != 0) {
-			// Aspect Ratio = (Pixel Aspect Ratio + 15) / 64
-			$info['gif']['header']['aspect_ratio'] = ($info['gif']['header']['raw']['aspect_ratio'] + 15) / 64;
-		}
-
-//		if ($info['gif']['header']['flags']['global_color_table']) {
-//			$GIFcolorTable = fread($this->getid3->fp, 3 * $info['gif']['header']['global_color_size']);
-//			$offset = 0;
-//			for ($i = 0; $i < $info['gif']['header']['global_color_size']; $i++) {
-//				$red   = getid3_lib::LittleEndian2Int(substr($GIFcolorTable, $offset++, 1));
-//				$green = getid3_lib::LittleEndian2Int(substr($GIFcolorTable, $offset++, 1));
-//				$blue  = getid3_lib::LittleEndian2Int(substr($GIFcolorTable, $offset++, 1));
-//				$info['gif']['global_color_table'][$i] = (($red << 16) | ($green << 8) | ($blue));
-//			}
-//		}
-//
-//		// Image Descriptor
-//		while (!feof($this->getid3->fp)) {
-//			$NextBlockTest = fread($this->getid3->fp, 1);
-//			switch ($NextBlockTest) {
-//
-//				case ',': // ',' - Image separator character
-//
-//					$ImageDescriptorData = $NextBlockTest.fread($this->getid3->fp, 9);
-//					$ImageDescriptor = array();
-//					$ImageDescriptor['image_left']   = getid3_lib::LittleEndian2Int(substr($ImageDescriptorData, 1, 2));
-//					$ImageDescriptor['image_top']    = getid3_lib::LittleEndian2Int(substr($ImageDescriptorData, 3, 2));
-//					$ImageDescriptor['image_width']  = getid3_lib::LittleEndian2Int(substr($ImageDescriptorData, 5, 2));
-//					$ImageDescriptor['image_height'] = getid3_lib::LittleEndian2Int(substr($ImageDescriptorData, 7, 2));
-//					$ImageDescriptor['flags_raw']    = getid3_lib::LittleEndian2Int(substr($ImageDescriptorData, 9, 1));
-//					$ImageDescriptor['flags']['use_local_color_map'] = (bool) ($ImageDescriptor['flags_raw'] & 0x80);
-//					$ImageDescriptor['flags']['image_interlaced']    = (bool) ($ImageDescriptor['flags_raw'] & 0x40);
-//					$info['gif']['image_descriptor'][] = $ImageDescriptor;
-//
-//					if ($ImageDescriptor['flags']['use_local_color_map']) {
-//
-//						$info['warning'][] = 'This version of getID3() cannot parse local color maps for GIFs';
-//						return true;
-//
-//					}
-//echo 'Start of raster data: '.ftell($this->getid3->fp).'<BR>';
-//					$RasterData = array();
-//					$RasterData['code_size']        = getid3_lib::LittleEndian2Int(fread($this->getid3->fp, 1));
-//					$RasterData['block_byte_count'] = getid3_lib::LittleEndian2Int(fread($this->getid3->fp, 1));
-//					$info['gif']['raster_data'][count($info['gif']['image_descriptor']) - 1] = $RasterData;
-//
-//					$CurrentCodeSize = $RasterData['code_size'] + 1;
-//					for ($i = 0; $i < pow(2, $RasterData['code_size']); $i++) {
-//						$DefaultDataLookupTable[$i] = chr($i);
-//					}
-//					$DefaultDataLookupTable[pow(2, $RasterData['code_size']) + 0] = ''; // Clear Code
-//					$DefaultDataLookupTable[pow(2, $RasterData['code_size']) + 1] = ''; // End Of Image Code
-//
-//
-//					$NextValue = $this->GetLSBits($CurrentCodeSize);
-//					echo 'Clear Code: '.$NextValue.'<BR>';
-//
-//					$NextValue = $this->GetLSBits($CurrentCodeSize);
-//					echo 'First Color: '.$NextValue.'<BR>';
-//
-//					$Prefix = $NextValue;
-//$i = 0;
-//					while ($i++ < 20) {
-//						$NextValue = $this->GetLSBits($CurrentCodeSize);
-//						echo $NextValue.'<BR>';
-//					}
-//return true;
-//					break;
-//
-//				case '!':
-//					// GIF Extension Block
-//					$ExtensionBlockData = $NextBlockTest.fread($this->getid3->fp, 2);
-//					$ExtensionBlock = array();
-//					$ExtensionBlock['function_code']  = getid3_lib::LittleEndian2Int(substr($ExtensionBlockData, 1, 1));
-//					$ExtensionBlock['byte_length']    = getid3_lib::LittleEndian2Int(substr($ExtensionBlockData, 2, 1));
-//					$ExtensionBlock['data']           = fread($this->getid3->fp, $ExtensionBlock['byte_length']);
-//					$info['gif']['extension_blocks'][] = $ExtensionBlock;
-//					break;
-//
-//				case ';':
-//					$info['gif']['terminator_offset'] = ftell($this->getid3->fp) - 1;
-//					// GIF Terminator
-//					break;
-//
-//				default:
-//					break;
-//
-//
-//			}
-//		}
-
-		return true;
-	}
-
-
-	function GetLSBits($bits) {
-		static $bitbuffer = '';
-		while (strlen($bitbuffer) < $bits) {
-			$bitbuffer = str_pad(decbin(ord(fread($this->getid3->fp, 1))), 8, '0', STR_PAD_LEFT).$bitbuffer;
-		}
-		$value = bindec(substr($bitbuffer, 0 - $bits));
-		$bitbuffer = substr($bitbuffer, 0, 0 - $bits);
-
-		return $value;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.graphic.jpg.php b/lib/getid3/getid3/module.graphic.jpg.php
deleted file mode 100644
index 153ebcd0e..000000000
--- a/lib/getid3/getid3/module.graphic.jpg.php
+++ /dev/null
@@ -1,338 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.graphic.jpg.php                                      //
-// module for analyzing JPEG Image files                       //
-// dependencies: PHP compiled with --enable-exif (optional)    //
-//               module.tag.xmp.php (optional)                 //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_jpg extends getid3_handler
-{
-
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat']                  = 'jpg';
-		$info['video']['dataformat']         = 'jpg';
-		$info['video']['lossless']           = false;
-		$info['video']['bits_per_sample']    = 24;
-		$info['video']['pixel_aspect_ratio'] = (float) 1;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-
-		$imageinfo = array();
-		list($width, $height, $type) = getid3_lib::GetDataImageSize(fread($this->getid3->fp, $info['filesize']), $imageinfo);
-
-
-		if (isset($imageinfo['APP13'])) {
-			// http://php.net/iptcparse
-			// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/IPTC.html
-			$iptc_parsed = iptcparse($imageinfo['APP13']);
-			if (is_array($iptc_parsed)) {
-				foreach ($iptc_parsed as $iptc_key_raw => $iptc_values) {
-					list($iptc_record, $iptc_tagkey) = explode('#', $iptc_key_raw);
-					$iptc_tagkey = intval(ltrim($iptc_tagkey, '0'));
-					foreach ($iptc_values as $key => $value) {
-						$IPTCrecordName = $this->IPTCrecordName($iptc_record);
-						$IPTCrecordTagName = $this->IPTCrecordTagName($iptc_record, $iptc_tagkey);
-						if (isset($info['iptc'][$IPTCrecordName][$IPTCrecordTagName])) {
-							$info['iptc'][$IPTCrecordName][$IPTCrecordTagName][] = $value;
-						} else {
-							$info['iptc'][$IPTCrecordName][$IPTCrecordTagName] = array($value);
-						}
-					}
-				}
-			}
-		}
-
-		$returnOK = false;
-		switch ($type) {
-			case IMG_JPG:
-				$info['video']['resolution_x'] = $width;
-				$info['video']['resolution_y'] = $height;
-
-				if (isset($imageinfo['APP1'])) {
-					if (function_exists('exif_read_data')) {
-						if (substr($imageinfo['APP1'], 0, 4) == 'Exif') {
-							$info['jpg']['exif'] = @exif_read_data($info['filenamepath'], '', true, false);
-						} else {
-							$info['warning'][] = 'exif_read_data() cannot parse non-EXIF data in APP1 (expected "Exif", found "'.substr($imageinfo['APP1'], 0, 4).'")';
-						}
-					} else {
-						$info['warning'][] = 'EXIF parsing only available when '.(GETID3_OS_ISWINDOWS ? 'php_exif.dll enabled' : 'compiled with --enable-exif');
-					}
-				}
-				$returnOK = true;
-				break;
-
-			default:
-				break;
-		}
-
-
-		$cast_as_appropriate_keys = array('EXIF', 'IFD0', 'THUMBNAIL');
-		foreach ($cast_as_appropriate_keys as $exif_key) {
-			if (isset($info['jpg']['exif'][$exif_key])) {
-				foreach ($info['jpg']['exif'][$exif_key] as $key => $value) {
-					$info['jpg']['exif'][$exif_key][$key] = $this->CastAsAppropriate($value);
-				}
-			}
-		}
-
-
-		if (isset($info['jpg']['exif']['GPS'])) {
-
-			if (isset($info['jpg']['exif']['GPS']['GPSVersion'])) {
-				for ($i = 0; $i < 4; $i++) {
-					$version_subparts[$i] = ord(substr($info['jpg']['exif']['GPS']['GPSVersion'], $i, 1));
-				}
-				$info['jpg']['exif']['GPS']['computed']['version'] = 'v'.implode('.', $version_subparts);
-			}
-
-			if (isset($info['jpg']['exif']['GPS']['GPSDateStamp'])) {
-				$explodedGPSDateStamp = explode(':', $info['jpg']['exif']['GPS']['GPSDateStamp']);
-				$computed_time[5] = (isset($explodedGPSDateStamp[0]) ? $explodedGPSDateStamp[0] : '');
-				$computed_time[3] = (isset($explodedGPSDateStamp[1]) ? $explodedGPSDateStamp[1] : '');
-				$computed_time[4] = (isset($explodedGPSDateStamp[2]) ? $explodedGPSDateStamp[2] : '');
-
-				if (function_exists('date_default_timezone_set')) {
-					date_default_timezone_set('UTC');
-				} else {
-					ini_set('date.timezone', 'UTC');
-				}
-
-				$computed_time = array(0=>0, 1=>0, 2=>0, 3=>0, 4=>0, 5=>0);
-				if (isset($info['jpg']['exif']['GPS']['GPSTimeStamp']) && is_array($info['jpg']['exif']['GPS']['GPSTimeStamp'])) {
-					foreach ($info['jpg']['exif']['GPS']['GPSTimeStamp'] as $key => $value) {
-						$computed_time[$key] = getid3_lib::DecimalizeFraction($value);
-					}
-				}
-				$info['jpg']['exif']['GPS']['computed']['timestamp'] = mktime($computed_time[0], $computed_time[1], $computed_time[2], $computed_time[3], $computed_time[4], $computed_time[5]);
-			}
-
-			if (isset($info['jpg']['exif']['GPS']['GPSLatitude']) && is_array($info['jpg']['exif']['GPS']['GPSLatitude'])) {
-				$direction_multiplier = ((isset($info['jpg']['exif']['GPS']['GPSLatitudeRef']) && ($info['jpg']['exif']['GPS']['GPSLatitudeRef'] == 'S')) ? -1 : 1);
-				foreach ($info['jpg']['exif']['GPS']['GPSLatitude'] as $key => $value) {
-					$computed_latitude[$key] = getid3_lib::DecimalizeFraction($value);
-				}
-				$info['jpg']['exif']['GPS']['computed']['latitude'] = $direction_multiplier * ($computed_latitude[0] + ($computed_latitude[1] / 60) + ($computed_latitude[2] / 3600));
-			}
-
-			if (isset($info['jpg']['exif']['GPS']['GPSLongitude']) && is_array($info['jpg']['exif']['GPS']['GPSLongitude'])) {
-				$direction_multiplier = ((isset($info['jpg']['exif']['GPS']['GPSLongitudeRef']) && ($info['jpg']['exif']['GPS']['GPSLongitudeRef'] == 'W')) ? -1 : 1);
-				foreach ($info['jpg']['exif']['GPS']['GPSLongitude'] as $key => $value) {
-					$computed_longitude[$key] = getid3_lib::DecimalizeFraction($value);
-				}
-				$info['jpg']['exif']['GPS']['computed']['longitude'] = $direction_multiplier * ($computed_longitude[0] + ($computed_longitude[1] / 60) + ($computed_longitude[2] / 3600));
-			}
-
-			if (isset($info['jpg']['exif']['GPS']['GPSAltitude'])) {
-				$direction_multiplier = ((isset($info['jpg']['exif']['GPS']['GPSAltitudeRef']) && ($info['jpg']['exif']['GPS']['GPSAltitudeRef'] === chr(1))) ? -1 : 1);
-				$info['jpg']['exif']['GPS']['computed']['altitude'] = $direction_multiplier * getid3_lib::DecimalizeFraction($info['jpg']['exif']['GPS']['GPSAltitude']);
-			}
-
-		}
-
-
-		if (getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.xmp.php', __FILE__, false)) {
-			if (isset($info['filenamepath'])) {
-				$image_xmp = new Image_XMP($info['filenamepath']);
-				$xmp_raw = $image_xmp->getAllTags();
-				foreach ($xmp_raw as $key => $value) {
-					list($subsection, $tagname) = explode(':', $key);
-					$info['xmp'][$subsection][$tagname] = $this->CastAsAppropriate($value);
-				}
-			}
-		}
-
-		if (!$returnOK) {
-			unset($info['fileformat']);
-			return false;
-		}
-		return true;
-	}
-
-
-	function CastAsAppropriate($value) {
-		if (is_array($value)) {
-			return $value;
-		} elseif (preg_match('#^[0-9]+/[0-9]+$#', $value)) {
-			return getid3_lib::DecimalizeFraction($value);
-		} elseif (preg_match('#^[0-9]+$#', $value)) {
-			return getid3_lib::CastAsInt($value);
-		} elseif (preg_match('#^[0-9\.]+$#', $value)) {
-			return (float) $value;
-		}
-		return $value;
-	}
-
-
-	function IPTCrecordName($iptc_record) {
-		// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/IPTC.html
-		static $IPTCrecordName = array();
-		if (empty($IPTCrecordName)) {
-			$IPTCrecordName = array(
-				1 => 'IPTCEnvelope',
-				2 => 'IPTCApplication',
-				3 => 'IPTCNewsPhoto',
-				7 => 'IPTCPreObjectData',
-				8 => 'IPTCObjectData',
-				9 => 'IPTCPostObjectData',
-			);
-		}
-		return (isset($IPTCrecordName[$iptc_record]) ? $IPTCrecordName[$iptc_record] : '');
-	}
-
-
-	function IPTCrecordTagName($iptc_record, $iptc_tagkey) {
-		// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/IPTC.html
-		static $IPTCrecordTagName = array();
-		if (empty($IPTCrecordTagName)) {
-			$IPTCrecordTagName = array(
-				1 => array( // IPTC EnvelopeRecord Tags
-					0   => 'EnvelopeRecordVersion',
-					5   => 'Destination',
-					20  => 'FileFormat',
-					22  => 'FileVersion',
-					30  => 'ServiceIdentifier',
-					40  => 'EnvelopeNumber',
-					50  => 'ProductID',
-					60  => 'EnvelopePriority',
-					70  => 'DateSent',
-					80  => 'TimeSent',
-					90  => 'CodedCharacterSet',
-					100 => 'UniqueObjectName',
-					120 => 'ARMIdentifier',
-					122 => 'ARMVersion',
-				),
-				2 => array( // IPTC ApplicationRecord Tags
-					0   => 'ApplicationRecordVersion',
-					3   => 'ObjectTypeReference',
-					4   => 'ObjectAttributeReference',
-					5   => 'ObjectName',
-					7   => 'EditStatus',
-					8   => 'EditorialUpdate',
-					10  => 'Urgency',
-					12  => 'SubjectReference',
-					15  => 'Category',
-					20  => 'SupplementalCategories',
-					22  => 'FixtureIdentifier',
-					25  => 'Keywords',
-					26  => 'ContentLocationCode',
-					27  => 'ContentLocationName',
-					30  => 'ReleaseDate',
-					35  => 'ReleaseTime',
-					37  => 'ExpirationDate',
-					38  => 'ExpirationTime',
-					40  => 'SpecialInstructions',
-					42  => 'ActionAdvised',
-					45  => 'ReferenceService',
-					47  => 'ReferenceDate',
-					50  => 'ReferenceNumber',
-					55  => 'DateCreated',
-					60  => 'TimeCreated',
-					62  => 'DigitalCreationDate',
-					63  => 'DigitalCreationTime',
-					65  => 'OriginatingProgram',
-					70  => 'ProgramVersion',
-					75  => 'ObjectCycle',
-					80  => 'By-line',
-					85  => 'By-lineTitle',
-					90  => 'City',
-					92  => 'Sub-location',
-					95  => 'Province-State',
-					100 => 'Country-PrimaryLocationCode',
-					101 => 'Country-PrimaryLocationName',
-					103 => 'OriginalTransmissionReference',
-					105 => 'Headline',
-					110 => 'Credit',
-					115 => 'Source',
-					116 => 'CopyrightNotice',
-					118 => 'Contact',
-					120 => 'Caption-Abstract',
-					121 => 'LocalCaption',
-					122 => 'Writer-Editor',
-					125 => 'RasterizedCaption',
-					130 => 'ImageType',
-					131 => 'ImageOrientation',
-					135 => 'LanguageIdentifier',
-					150 => 'AudioType',
-					151 => 'AudioSamplingRate',
-					152 => 'AudioSamplingResolution',
-					153 => 'AudioDuration',
-					154 => 'AudioOutcue',
-					184 => 'JobID',
-					185 => 'MasterDocumentID',
-					186 => 'ShortDocumentID',
-					187 => 'UniqueDocumentID',
-					188 => 'OwnerID',
-					200 => 'ObjectPreviewFileFormat',
-					201 => 'ObjectPreviewFileVersion',
-					202 => 'ObjectPreviewData',
-					221 => 'Prefs',
-					225 => 'ClassifyState',
-					228 => 'SimilarityIndex',
-					230 => 'DocumentNotes',
-					231 => 'DocumentHistory',
-					232 => 'ExifCameraInfo',
-				),
-				3 => array( // IPTC NewsPhoto Tags
-					0   => 'NewsPhotoVersion',
-					10  => 'IPTCPictureNumber',
-					20  => 'IPTCImageWidth',
-					30  => 'IPTCImageHeight',
-					40  => 'IPTCPixelWidth',
-					50  => 'IPTCPixelHeight',
-					55  => 'SupplementalType',
-					60  => 'ColorRepresentation',
-					64  => 'InterchangeColorSpace',
-					65  => 'ColorSequence',
-					66  => 'ICC_Profile',
-					70  => 'ColorCalibrationMatrix',
-					80  => 'LookupTable',
-					84  => 'NumIndexEntries',
-					85  => 'ColorPalette',
-					86  => 'IPTCBitsPerSample',
-					90  => 'SampleStructure',
-					100 => 'ScanningDirection',
-					102 => 'IPTCImageRotation',
-					110 => 'DataCompressionMethod',
-					120 => 'QuantizationMethod',
-					125 => 'EndPoints',
-					130 => 'ExcursionTolerance',
-					135 => 'BitsPerComponent',
-					140 => 'MaximumDensityRange',
-					145 => 'GammaCompensatedValue',
-				),
-				7 => array( // IPTC PreObjectData Tags
-					10  => 'SizeMode',
-					20  => 'MaxSubfileSize',
-					90  => 'ObjectSizeAnnounced',
-					95  => 'MaximumObjectSize',
-				),
-				8 => array( // IPTC ObjectData Tags
-					10  => 'SubFile',
-				),
-				9 => array( // IPTC PostObjectData Tags
-					10  => 'ConfirmedObjectSize',
-				),
-			);
-
-		}
-		return (isset($IPTCrecordTagName[$iptc_record][$iptc_tagkey]) ? $IPTCrecordTagName[$iptc_record][$iptc_tagkey] : $iptc_tagkey);
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.graphic.pcd.php b/lib/getid3/getid3/module.graphic.pcd.php
deleted file mode 100644
index dcbc67636..000000000
--- a/lib/getid3/getid3/module.graphic.pcd.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.graphic.pcd.php                                      //
-// module for analyzing PhotoCD (PCD) Image files              //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_pcd extends getid3_handler
-{
-	var $ExtractData = 0;
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat']          = 'pcd';
-		$info['video']['dataformat'] = 'pcd';
-		$info['video']['lossless']   = false;
-
-
-		fseek($this->getid3->fp, $info['avdataoffset'] + 72, SEEK_SET);
-
-		$PCDflags = fread($this->getid3->fp, 1);
-		$PCDisVertical = ((ord($PCDflags) & 0x01) ? true : false);
-
-
-		if ($PCDisVertical) {
-			$info['video']['resolution_x'] = 3072;
-			$info['video']['resolution_y'] = 2048;
-		} else {
-			$info['video']['resolution_x'] = 2048;
-			$info['video']['resolution_y'] = 3072;
-		}
-
-
-		if ($this->ExtractData > 3) {
-
-			$info['error'][] = 'Cannot extract PSD image data for detail levels above BASE (level-3) because encrypted with Kodak-proprietary compression/encryption.';
-
-		} elseif ($this->ExtractData > 0) {
-
-			$PCD_levels[1] = array( 192,  128, 0x02000); // BASE/16
-			$PCD_levels[2] = array( 384,  256, 0x0B800); // BASE/4
-			$PCD_levels[3] = array( 768,  512, 0x30000); // BASE
-			//$PCD_levels[4] = array(1536, 1024,    ??); // BASE*4  - encrypted with Kodak-proprietary compression/encryption
-			//$PCD_levels[5] = array(3072, 2048,    ??); // BASE*16 - encrypted with Kodak-proprietary compression/encryption
-			//$PCD_levels[6] = array(6144, 4096,    ??); // BASE*64 - encrypted with Kodak-proprietary compression/encryption; PhotoCD-Pro only
-
-			list($PCD_width, $PCD_height, $PCD_dataOffset) = $PCD_levels[3];
-
-			fseek($this->getid3->fp, $info['avdataoffset'] + $PCD_dataOffset, SEEK_SET);
-
-			for ($y = 0; $y < $PCD_height; $y += 2) {
-				// The image-data of these subtypes start at the respective offsets of 02000h, 0b800h and 30000h.
-				// To decode the YcbYr to the more usual RGB-code, three lines of data have to be read, each
-				// consisting of �w� bytes, where �w� is the width of the image-subtype. The first �w� bytes and
-				// the first half of the third �w� bytes contain data for the first RGB-line, the second �w� bytes
-				// and the second half of the third �w� bytes contain data for a second RGB-line.
-
-				$PCD_data_Y1 = fread($this->getid3->fp, $PCD_width);
-				$PCD_data_Y2 = fread($this->getid3->fp, $PCD_width);
-				$PCD_data_Cb = fread($this->getid3->fp, intval(round($PCD_width / 2)));
-				$PCD_data_Cr = fread($this->getid3->fp, intval(round($PCD_width / 2)));
-
-				for ($x = 0; $x < $PCD_width; $x++) {
-					if ($PCDisVertical) {
-						$info['pcd']['data'][$PCD_width - $x][$y]     = $this->YCbCr2RGB(ord($PCD_data_Y1{$x}), ord($PCD_data_Cb{floor($x / 2)}), ord($PCD_data_Cr{floor($x / 2)}));
-						$info['pcd']['data'][$PCD_width - $x][$y + 1] = $this->YCbCr2RGB(ord($PCD_data_Y2{$x}), ord($PCD_data_Cb{floor($x / 2)}), ord($PCD_data_Cr{floor($x / 2)}));
-					} else {
-						$info['pcd']['data'][$y][$x]                  = $this->YCbCr2RGB(ord($PCD_data_Y1{$x}), ord($PCD_data_Cb{floor($x / 2)}), ord($PCD_data_Cr{floor($x / 2)}));
-						$info['pcd']['data'][$y + 1][$x]              = $this->YCbCr2RGB(ord($PCD_data_Y2{$x}), ord($PCD_data_Cb{floor($x / 2)}), ord($PCD_data_Cr{floor($x / 2)}));
-					}
-				}
-			}
-
-			// Example for plotting extracted data
-			//getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ac3.php', __FILE__, true);
-			//if ($PCDisVertical) {
-			//	$BMPinfo['resolution_x'] = $PCD_height;
-			//	$BMPinfo['resolution_y'] = $PCD_width;
-			//} else {
-			//	$BMPinfo['resolution_x'] = $PCD_width;
-			//	$BMPinfo['resolution_y'] = $PCD_height;
-			//}
-			//$BMPinfo['bmp']['data'] = $info['pcd']['data'];
-			//getid3_bmp::PlotBMP($BMPinfo);
-			//exit;
-
-		}
-
-	}
-
-	function YCbCr2RGB($Y, $Cb, $Cr) {
-		static $YCbCr_constants = array();
-		if (empty($YCbCr_constants)) {
-			$YCbCr_constants['red']['Y']    =  0.0054980 * 256;
-			$YCbCr_constants['red']['Cb']   =  0.0000000 * 256;
-			$YCbCr_constants['red']['Cr']   =  0.0051681 * 256;
-			$YCbCr_constants['green']['Y']  =  0.0054980 * 256;
-			$YCbCr_constants['green']['Cb'] = -0.0015446 * 256;
-			$YCbCr_constants['green']['Cr'] = -0.0026325 * 256;
-			$YCbCr_constants['blue']['Y']   =  0.0054980 * 256;
-			$YCbCr_constants['blue']['Cb']  =  0.0079533 * 256;
-			$YCbCr_constants['blue']['Cr']  =  0.0000000 * 256;
-		}
-
-		$RGBcolor = array('red'=>0, 'green'=>0, 'blue'=>0);
-		foreach ($RGBcolor as $rgbname => $dummy) {
-			$RGBcolor[$rgbname] = max(0,
-										min(255,
-											intval(
-												round(
-													($YCbCr_constants[$rgbname]['Y'] * $Y) +
-													($YCbCr_constants[$rgbname]['Cb'] * ($Cb - 156)) +
-													($YCbCr_constants[$rgbname]['Cr'] * ($Cr - 137))
-												)
-											)
-										)
-									);
-		}
-		return (($RGBcolor['red'] * 65536) + ($RGBcolor['green'] * 256) + $RGBcolor['blue']);
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.graphic.png.php b/lib/getid3/getid3/module.graphic.png.php
deleted file mode 100644
index 9109c4368..000000000
--- a/lib/getid3/getid3/module.graphic.png.php
+++ /dev/null
@@ -1,520 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.graphic.png.php                                      //
-// module for analyzing PNG Image files                        //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_png extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		// shortcut
-		$info['png'] = array();
-		$thisfile_png = &$info['png'];
-
-		$info['fileformat']          = 'png';
-		$info['video']['dataformat'] = 'png';
-		$info['video']['lossless']   = false;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$PNGfiledata = fread($this->getid3->fp, $this->getid3->fread_buffer_size());
-		$offset = 0;
-
-		$PNGidentifier = substr($PNGfiledata, $offset, 8); // $89 $50 $4E $47 $0D $0A $1A $0A
-		$offset += 8;
-
-		if ($PNGidentifier != "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A") {
-			$info['error'][] = 'First 8 bytes of file ('.getid3_lib::PrintHexBytes($PNGidentifier).') did not match expected PNG identifier';
-			unset($info['fileformat']);
-			return false;
-		}
-
-		while (((ftell($this->getid3->fp) - (strlen($PNGfiledata) - $offset)) < $info['filesize'])) {
-			$chunk['data_length'] = getid3_lib::BigEndian2Int(substr($PNGfiledata, $offset, 4));
-			$offset += 4;
-			while (((strlen($PNGfiledata) - $offset) < ($chunk['data_length'] + 4)) && (ftell($this->getid3->fp) < $info['filesize'])) {
-				$PNGfiledata .= fread($this->getid3->fp, $this->getid3->fread_buffer_size());
-			}
-			$chunk['type_text']   =               substr($PNGfiledata, $offset, 4);
-			$offset += 4;
-			$chunk['type_raw']    = getid3_lib::BigEndian2Int($chunk['type_text']);
-			$chunk['data']        =               substr($PNGfiledata, $offset, $chunk['data_length']);
-			$offset += $chunk['data_length'];
-			$chunk['crc']         = getid3_lib::BigEndian2Int(substr($PNGfiledata, $offset, 4));
-			$offset += 4;
-
-			$chunk['flags']['ancilliary']   = (bool) ($chunk['type_raw'] & 0x20000000);
-			$chunk['flags']['private']      = (bool) ($chunk['type_raw'] & 0x00200000);
-			$chunk['flags']['reserved']     = (bool) ($chunk['type_raw'] & 0x00002000);
-			$chunk['flags']['safe_to_copy'] = (bool) ($chunk['type_raw'] & 0x00000020);
-
-			// shortcut
-			$thisfile_png[$chunk['type_text']] = array();
-			$thisfile_png_chunk_type_text = &$thisfile_png[$chunk['type_text']];
-
-			switch ($chunk['type_text']) {
-
-				case 'IHDR': // Image Header
-					$thisfile_png_chunk_type_text['header'] = $chunk;
-					$thisfile_png_chunk_type_text['width']                     = getid3_lib::BigEndian2Int(substr($chunk['data'],  0, 4));
-					$thisfile_png_chunk_type_text['height']                    = getid3_lib::BigEndian2Int(substr($chunk['data'],  4, 4));
-					$thisfile_png_chunk_type_text['raw']['bit_depth']          = getid3_lib::BigEndian2Int(substr($chunk['data'],  8, 1));
-					$thisfile_png_chunk_type_text['raw']['color_type']         = getid3_lib::BigEndian2Int(substr($chunk['data'],  9, 1));
-					$thisfile_png_chunk_type_text['raw']['compression_method'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 10, 1));
-					$thisfile_png_chunk_type_text['raw']['filter_method']      = getid3_lib::BigEndian2Int(substr($chunk['data'], 11, 1));
-					$thisfile_png_chunk_type_text['raw']['interlace_method']   = getid3_lib::BigEndian2Int(substr($chunk['data'], 12, 1));
-
-					$thisfile_png_chunk_type_text['compression_method_text']   = $this->PNGcompressionMethodLookup($thisfile_png_chunk_type_text['raw']['compression_method']);
-					$thisfile_png_chunk_type_text['color_type']['palette']     = (bool) ($thisfile_png_chunk_type_text['raw']['color_type'] & 0x01);
-					$thisfile_png_chunk_type_text['color_type']['true_color']  = (bool) ($thisfile_png_chunk_type_text['raw']['color_type'] & 0x02);
-					$thisfile_png_chunk_type_text['color_type']['alpha']       = (bool) ($thisfile_png_chunk_type_text['raw']['color_type'] & 0x04);
-
-					$info['video']['resolution_x']    = $thisfile_png_chunk_type_text['width'];
-					$info['video']['resolution_y']    = $thisfile_png_chunk_type_text['height'];
-
-					$info['video']['bits_per_sample'] = $this->IHDRcalculateBitsPerSample($thisfile_png_chunk_type_text['raw']['color_type'], $thisfile_png_chunk_type_text['raw']['bit_depth']);
-					break;
-
-
-				case 'PLTE': // Palette
-					$thisfile_png_chunk_type_text['header'] = $chunk;
-					$paletteoffset = 0;
-					for ($i = 0; $i <= 255; $i++) {
-						//$thisfile_png_chunk_type_text['red'][$i]   = getid3_lib::BigEndian2Int(substr($chunk['data'], $paletteoffset++, 1));
-						//$thisfile_png_chunk_type_text['green'][$i] = getid3_lib::BigEndian2Int(substr($chunk['data'], $paletteoffset++, 1));
-						//$thisfile_png_chunk_type_text['blue'][$i]  = getid3_lib::BigEndian2Int(substr($chunk['data'], $paletteoffset++, 1));
-						$red   = getid3_lib::BigEndian2Int(substr($chunk['data'], $paletteoffset++, 1));
-						$green = getid3_lib::BigEndian2Int(substr($chunk['data'], $paletteoffset++, 1));
-						$blue  = getid3_lib::BigEndian2Int(substr($chunk['data'], $paletteoffset++, 1));
-						$thisfile_png_chunk_type_text[$i] = (($red << 16) | ($green << 8) | ($blue));
-					}
-					break;
-
-
-				case 'tRNS': // Transparency
-					$thisfile_png_chunk_type_text['header'] = $chunk;
-					switch ($thisfile_png['IHDR']['raw']['color_type']) {
-						case 0:
-							$thisfile_png_chunk_type_text['transparent_color_gray']  = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 2));
-							break;
-
-						case 2:
-							$thisfile_png_chunk_type_text['transparent_color_red']   = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 2));
-							$thisfile_png_chunk_type_text['transparent_color_green'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 2, 2));
-							$thisfile_png_chunk_type_text['transparent_color_blue']  = getid3_lib::BigEndian2Int(substr($chunk['data'], 4, 2));
-							break;
-
-						case 3:
-							for ($i = 0; $i < strlen($chunk['data']); $i++) {
-								$thisfile_png_chunk_type_text['palette_opacity'][$i] = getid3_lib::BigEndian2Int(substr($chunk['data'], $i, 1));
-							}
-							break;
-
-						case 4:
-						case 6:
-							$info['error'][] = 'Invalid color_type in tRNS chunk: '.$thisfile_png['IHDR']['raw']['color_type'];
-
-						default:
-							$info['warning'][] = 'Unhandled color_type in tRNS chunk: '.$thisfile_png['IHDR']['raw']['color_type'];
-							break;
-					}
-					break;
-
-
-				case 'gAMA': // Image Gamma
-					$thisfile_png_chunk_type_text['header'] = $chunk;
-					$thisfile_png_chunk_type_text['gamma']  = getid3_lib::BigEndian2Int($chunk['data']) / 100000;
-					break;
-
-
-				case 'cHRM': // Primary Chromaticities
-					$thisfile_png_chunk_type_text['header']  = $chunk;
-					$thisfile_png_chunk_type_text['white_x'] = getid3_lib::BigEndian2Int(substr($chunk['data'],  0, 4)) / 100000;
-					$thisfile_png_chunk_type_text['white_y'] = getid3_lib::BigEndian2Int(substr($chunk['data'],  4, 4)) / 100000;
-					$thisfile_png_chunk_type_text['red_y']   = getid3_lib::BigEndian2Int(substr($chunk['data'],  8, 4)) / 100000;
-					$thisfile_png_chunk_type_text['red_y']   = getid3_lib::BigEndian2Int(substr($chunk['data'], 12, 4)) / 100000;
-					$thisfile_png_chunk_type_text['green_y'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 16, 4)) / 100000;
-					$thisfile_png_chunk_type_text['green_y'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 20, 4)) / 100000;
-					$thisfile_png_chunk_type_text['blue_y']  = getid3_lib::BigEndian2Int(substr($chunk['data'], 24, 4)) / 100000;
-					$thisfile_png_chunk_type_text['blue_y']  = getid3_lib::BigEndian2Int(substr($chunk['data'], 28, 4)) / 100000;
-					break;
-
-
-				case 'sRGB': // Standard RGB Color Space
-					$thisfile_png_chunk_type_text['header']                 = $chunk;
-					$thisfile_png_chunk_type_text['reindering_intent']      = getid3_lib::BigEndian2Int($chunk['data']);
-					$thisfile_png_chunk_type_text['reindering_intent_text'] = $this->PNGsRGBintentLookup($thisfile_png_chunk_type_text['reindering_intent']);
-					break;
-
-
-				case 'iCCP': // Embedded ICC Profile
-					$thisfile_png_chunk_type_text['header']                  = $chunk;
-					list($profilename, $compressiondata)                                 = explode("\x00", $chunk['data'], 2);
-					$thisfile_png_chunk_type_text['profile_name']            = $profilename;
-					$thisfile_png_chunk_type_text['compression_method']      = getid3_lib::BigEndian2Int(substr($compressiondata, 0, 1));
-					$thisfile_png_chunk_type_text['compression_profile']     = substr($compressiondata, 1);
-
-					$thisfile_png_chunk_type_text['compression_method_text'] = $this->PNGcompressionMethodLookup($thisfile_png_chunk_type_text['compression_method']);
-					break;
-
-
-				case 'tEXt': // Textual Data
-					$thisfile_png_chunk_type_text['header']  = $chunk;
-					list($keyword, $text)                                = explode("\x00", $chunk['data'], 2);
-					$thisfile_png_chunk_type_text['keyword'] = $keyword;
-					$thisfile_png_chunk_type_text['text']    = $text;
-
-					$thisfile_png['comments'][$thisfile_png_chunk_type_text['keyword']][] = $thisfile_png_chunk_type_text['text'];
-					break;
-
-
-				case 'zTXt': // Compressed Textual Data
-					$thisfile_png_chunk_type_text['header']                  = $chunk;
-					list($keyword, $otherdata)                                           = explode("\x00", $chunk['data'], 2);
-					$thisfile_png_chunk_type_text['keyword']                 = $keyword;
-					$thisfile_png_chunk_type_text['compression_method']      = getid3_lib::BigEndian2Int(substr($otherdata, 0, 1));
-					$thisfile_png_chunk_type_text['compressed_text']         = substr($otherdata, 1);
-					$thisfile_png_chunk_type_text['compression_method_text'] = $this->PNGcompressionMethodLookup($thisfile_png_chunk_type_text['compression_method']);
-					switch ($thisfile_png_chunk_type_text['compression_method']) {
-						case 0:
-							$thisfile_png_chunk_type_text['text']            = gzuncompress($thisfile_png_chunk_type_text['compressed_text']);
-							break;
-
-						default:
-							// unknown compression method
-							break;
-					}
-
-					if (isset($thisfile_png_chunk_type_text['text'])) {
-						$thisfile_png['comments'][$thisfile_png_chunk_type_text['keyword']][] = $thisfile_png_chunk_type_text['text'];
-					}
-					break;
-
-
-				case 'iTXt': // International Textual Data
-					$thisfile_png_chunk_type_text['header']                  = $chunk;
-					list($keyword, $otherdata)                                           = explode("\x00", $chunk['data'], 2);
-					$thisfile_png_chunk_type_text['keyword']                 = $keyword;
-					$thisfile_png_chunk_type_text['compression']             = (bool) getid3_lib::BigEndian2Int(substr($otherdata, 0, 1));
-					$thisfile_png_chunk_type_text['compression_method']      = getid3_lib::BigEndian2Int(substr($otherdata, 1, 1));
-					$thisfile_png_chunk_type_text['compression_method_text'] = $this->PNGcompressionMethodLookup($thisfile_png_chunk_type_text['compression_method']);
-					list($languagetag, $translatedkeyword, $text)                        = explode("\x00", substr($otherdata, 2), 3);
-					$thisfile_png_chunk_type_text['language_tag']            = $languagetag;
-					$thisfile_png_chunk_type_text['translated_keyword']      = $translatedkeyword;
-
-					if ($thisfile_png_chunk_type_text['compression']) {
-
-						switch ($thisfile_png_chunk_type_text['compression_method']) {
-							case 0:
-								$thisfile_png_chunk_type_text['text']        = gzuncompress($text);
-								break;
-
-							default:
-								// unknown compression method
-								break;
-						}
-
-					} else {
-
-						$thisfile_png_chunk_type_text['text']                = $text;
-
-					}
-
-					if (isset($thisfile_png_chunk_type_text['text'])) {
-						$thisfile_png['comments'][$thisfile_png_chunk_type_text['keyword']][] = $thisfile_png_chunk_type_text['text'];
-					}
-					break;
-
-
-				case 'bKGD': // Background Color
-					$thisfile_png_chunk_type_text['header']                   = $chunk;
-					switch ($thisfile_png['IHDR']['raw']['color_type']) {
-						case 0:
-						case 4:
-							$thisfile_png_chunk_type_text['background_gray']  = getid3_lib::BigEndian2Int($chunk['data']);
-							break;
-
-						case 2:
-						case 6:
-							$thisfile_png_chunk_type_text['background_red']   = getid3_lib::BigEndian2Int(substr($chunk['data'], 0 * $thisfile_png['IHDR']['raw']['bit_depth'], $thisfile_png['IHDR']['raw']['bit_depth']));
-							$thisfile_png_chunk_type_text['background_green'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 1 * $thisfile_png['IHDR']['raw']['bit_depth'], $thisfile_png['IHDR']['raw']['bit_depth']));
-							$thisfile_png_chunk_type_text['background_blue']  = getid3_lib::BigEndian2Int(substr($chunk['data'], 2 * $thisfile_png['IHDR']['raw']['bit_depth'], $thisfile_png['IHDR']['raw']['bit_depth']));
-							break;
-
-						case 3:
-							$thisfile_png_chunk_type_text['background_index'] = getid3_lib::BigEndian2Int($chunk['data']);
-							break;
-
-						default:
-							break;
-					}
-					break;
-
-
-				case 'pHYs': // Physical Pixel Dimensions
-					$thisfile_png_chunk_type_text['header']                 = $chunk;
-					$thisfile_png_chunk_type_text['pixels_per_unit_x']      = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 4));
-					$thisfile_png_chunk_type_text['pixels_per_unit_y']      = getid3_lib::BigEndian2Int(substr($chunk['data'], 4, 4));
-					$thisfile_png_chunk_type_text['unit_specifier']         = getid3_lib::BigEndian2Int(substr($chunk['data'], 8, 1));
-					$thisfile_png_chunk_type_text['unit']                   = $this->PNGpHYsUnitLookup($thisfile_png_chunk_type_text['unit_specifier']);
-					break;
-
-
-				case 'sBIT': // Significant Bits
-					$thisfile_png_chunk_type_text['header'] = $chunk;
-					switch ($thisfile_png['IHDR']['raw']['color_type']) {
-						case 0:
-							$thisfile_png_chunk_type_text['significant_bits_gray']  = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 1));
-							break;
-
-						case 2:
-						case 3:
-							$thisfile_png_chunk_type_text['significant_bits_red']   = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 1));
-							$thisfile_png_chunk_type_text['significant_bits_green'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 1, 1));
-							$thisfile_png_chunk_type_text['significant_bits_blue']  = getid3_lib::BigEndian2Int(substr($chunk['data'], 2, 1));
-							break;
-
-						case 4:
-							$thisfile_png_chunk_type_text['significant_bits_gray']  = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 1));
-							$thisfile_png_chunk_type_text['significant_bits_alpha'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 1, 1));
-							break;
-
-						case 6:
-							$thisfile_png_chunk_type_text['significant_bits_red']   = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 1));
-							$thisfile_png_chunk_type_text['significant_bits_green'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 1, 1));
-							$thisfile_png_chunk_type_text['significant_bits_blue']  = getid3_lib::BigEndian2Int(substr($chunk['data'], 2, 1));
-							$thisfile_png_chunk_type_text['significant_bits_alpha'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 3, 1));
-							break;
-
-						default:
-							break;
-					}
-					break;
-
-
-				case 'sPLT': // Suggested Palette
-					$thisfile_png_chunk_type_text['header']                           = $chunk;
-					list($palettename, $otherdata)                                                = explode("\x00", $chunk['data'], 2);
-					$thisfile_png_chunk_type_text['palette_name']                     = $palettename;
-					$sPLToffset = 0;
-					$thisfile_png_chunk_type_text['sample_depth_bits']                = getid3_lib::BigEndian2Int(substr($otherdata, $sPLToffset, 1));
-					$sPLToffset += 1;
-					$thisfile_png_chunk_type_text['sample_depth_bytes']               = $thisfile_png_chunk_type_text['sample_depth_bits'] / 8;
-					$paletteCounter = 0;
-					while ($sPLToffset < strlen($otherdata)) {
-						$thisfile_png_chunk_type_text['red'][$paletteCounter]       = getid3_lib::BigEndian2Int(substr($otherdata, $sPLToffset, $thisfile_png_chunk_type_text['sample_depth_bytes']));
-						$sPLToffset += $thisfile_png_chunk_type_text['sample_depth_bytes'];
-						$thisfile_png_chunk_type_text['green'][$paletteCounter]     = getid3_lib::BigEndian2Int(substr($otherdata, $sPLToffset, $thisfile_png_chunk_type_text['sample_depth_bytes']));
-						$sPLToffset += $thisfile_png_chunk_type_text['sample_depth_bytes'];
-						$thisfile_png_chunk_type_text['blue'][$paletteCounter]      = getid3_lib::BigEndian2Int(substr($otherdata, $sPLToffset, $thisfile_png_chunk_type_text['sample_depth_bytes']));
-						$sPLToffset += $thisfile_png_chunk_type_text['sample_depth_bytes'];
-						$thisfile_png_chunk_type_text['alpha'][$paletteCounter]     = getid3_lib::BigEndian2Int(substr($otherdata, $sPLToffset, $thisfile_png_chunk_type_text['sample_depth_bytes']));
-						$sPLToffset += $thisfile_png_chunk_type_text['sample_depth_bytes'];
-						$thisfile_png_chunk_type_text['frequency'][$paletteCounter] = getid3_lib::BigEndian2Int(substr($otherdata, $sPLToffset, 2));
-						$sPLToffset += 2;
-						$paletteCounter++;
-					}
-					break;
-
-
-				case 'hIST': // Palette Histogram
-					$thisfile_png_chunk_type_text['header'] = $chunk;
-					$hISTcounter = 0;
-					while ($hISTcounter < strlen($chunk['data'])) {
-						$thisfile_png_chunk_type_text[$hISTcounter] = getid3_lib::BigEndian2Int(substr($chunk['data'], $hISTcounter / 2, 2));
-						$hISTcounter += 2;
-					}
-					break;
-
-
-				case 'tIME': // Image Last-Modification Time
-					$thisfile_png_chunk_type_text['header'] = $chunk;
-					$thisfile_png_chunk_type_text['year']   = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 2));
-					$thisfile_png_chunk_type_text['month']  = getid3_lib::BigEndian2Int(substr($chunk['data'], 2, 1));
-					$thisfile_png_chunk_type_text['day']    = getid3_lib::BigEndian2Int(substr($chunk['data'], 3, 1));
-					$thisfile_png_chunk_type_text['hour']   = getid3_lib::BigEndian2Int(substr($chunk['data'], 4, 1));
-					$thisfile_png_chunk_type_text['minute'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 5, 1));
-					$thisfile_png_chunk_type_text['second'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 6, 1));
-					$thisfile_png_chunk_type_text['unix']   = gmmktime($thisfile_png_chunk_type_text['hour'], $thisfile_png_chunk_type_text['minute'], $thisfile_png_chunk_type_text['second'], $thisfile_png_chunk_type_text['month'], $thisfile_png_chunk_type_text['day'], $thisfile_png_chunk_type_text['year']);
-					break;
-
-
-				case 'oFFs': // Image Offset
-					$thisfile_png_chunk_type_text['header']         = $chunk;
-					$thisfile_png_chunk_type_text['position_x']     = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 4), false, true);
-					$thisfile_png_chunk_type_text['position_y']     = getid3_lib::BigEndian2Int(substr($chunk['data'], 4, 4), false, true);
-					$thisfile_png_chunk_type_text['unit_specifier'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 8, 1));
-					$thisfile_png_chunk_type_text['unit']           = $this->PNGoFFsUnitLookup($thisfile_png_chunk_type_text['unit_specifier']);
-					break;
-
-
-				case 'pCAL': // Calibration Of Pixel Values
-					$thisfile_png_chunk_type_text['header']             = $chunk;
-					list($calibrationname, $otherdata)                              = explode("\x00", $chunk['data'], 2);
-					$thisfile_png_chunk_type_text['calibration_name']   = $calibrationname;
-					$pCALoffset = 0;
-					$thisfile_png_chunk_type_text['original_zero']      = getid3_lib::BigEndian2Int(substr($chunk['data'], $pCALoffset, 4), false, true);
-					$pCALoffset += 4;
-					$thisfile_png_chunk_type_text['original_max']       = getid3_lib::BigEndian2Int(substr($chunk['data'], $pCALoffset, 4), false, true);
-					$pCALoffset += 4;
-					$thisfile_png_chunk_type_text['equation_type']      = getid3_lib::BigEndian2Int(substr($chunk['data'], $pCALoffset, 1));
-					$pCALoffset += 1;
-					$thisfile_png_chunk_type_text['equation_type_text'] = $this->PNGpCALequationTypeLookup($thisfile_png_chunk_type_text['equation_type']);
-					$thisfile_png_chunk_type_text['parameter_count']    = getid3_lib::BigEndian2Int(substr($chunk['data'], $pCALoffset, 1));
-					$pCALoffset += 1;
-					$thisfile_png_chunk_type_text['parameters']         = explode("\x00", substr($chunk['data'], $pCALoffset));
-					break;
-
-
-				case 'sCAL': // Physical Scale Of Image Subject
-					$thisfile_png_chunk_type_text['header']         = $chunk;
-					$thisfile_png_chunk_type_text['unit_specifier'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 1));
-					$thisfile_png_chunk_type_text['unit']           = $this->PNGsCALUnitLookup($thisfile_png_chunk_type_text['unit_specifier']);
-					list($pixelwidth, $pixelheight)                             = explode("\x00", substr($chunk['data'], 1));
-					$thisfile_png_chunk_type_text['pixel_width']    = $pixelwidth;
-					$thisfile_png_chunk_type_text['pixel_height']   = $pixelheight;
-					break;
-
-
-				case 'gIFg': // GIF Graphic Control Extension
-					$gIFgCounter = 0;
-					if (isset($thisfile_png_chunk_type_text) && is_array($thisfile_png_chunk_type_text)) {
-						$gIFgCounter = count($thisfile_png_chunk_type_text);
-					}
-					$thisfile_png_chunk_type_text[$gIFgCounter]['header']          = $chunk;
-					$thisfile_png_chunk_type_text[$gIFgCounter]['disposal_method'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 1));
-					$thisfile_png_chunk_type_text[$gIFgCounter]['user_input_flag'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 1, 1));
-					$thisfile_png_chunk_type_text[$gIFgCounter]['delay_time']      = getid3_lib::BigEndian2Int(substr($chunk['data'], 2, 2));
-					break;
-
-
-				case 'gIFx': // GIF Application Extension
-					$gIFxCounter = 0;
-					if (isset($thisfile_png_chunk_type_text) && is_array($thisfile_png_chunk_type_text)) {
-						$gIFxCounter = count($thisfile_png_chunk_type_text);
-					}
-					$thisfile_png_chunk_type_text[$gIFxCounter]['header']                 = $chunk;
-					$thisfile_png_chunk_type_text[$gIFxCounter]['application_identifier'] = substr($chunk['data'],  0, 8);
-					$thisfile_png_chunk_type_text[$gIFxCounter]['authentication_code']    = substr($chunk['data'],  8, 3);
-					$thisfile_png_chunk_type_text[$gIFxCounter]['application_data']       = substr($chunk['data'], 11);
-					break;
-
-
-				case 'IDAT': // Image Data
-					$idatinformationfieldindex = 0;
-					if (isset($thisfile_png['IDAT']) && is_array($thisfile_png['IDAT'])) {
-						$idatinformationfieldindex = count($thisfile_png['IDAT']);
-					}
-					unset($chunk['data']);
-					$thisfile_png_chunk_type_text[$idatinformationfieldindex]['header'] = $chunk;
-					break;
-
-
-				case 'IEND': // Image Trailer
-					$thisfile_png_chunk_type_text['header'] = $chunk;
-					break;
-
-
-				default:
-					//unset($chunk['data']);
-					$thisfile_png_chunk_type_text['header'] = $chunk;
-					$info['warning'][] = 'Unhandled chunk type: '.$chunk['type_text'];
-					break;
-			}
-		}
-
-		return true;
-	}
-
-	function PNGsRGBintentLookup($sRGB) {
-		static $PNGsRGBintentLookup = array(
-			0 => 'Perceptual',
-			1 => 'Relative colorimetric',
-			2 => 'Saturation',
-			3 => 'Absolute colorimetric'
-		);
-		return (isset($PNGsRGBintentLookup[$sRGB]) ? $PNGsRGBintentLookup[$sRGB] : 'invalid');
-	}
-
-	function PNGcompressionMethodLookup($compressionmethod) {
-		static $PNGcompressionMethodLookup = array(
-			0 => 'deflate/inflate'
-		);
-		return (isset($PNGcompressionMethodLookup[$compressionmethod]) ? $PNGcompressionMethodLookup[$compressionmethod] : 'invalid');
-	}
-
-	function PNGpHYsUnitLookup($unitid) {
-		static $PNGpHYsUnitLookup = array(
-			0 => 'unknown',
-			1 => 'meter'
-		);
-		return (isset($PNGpHYsUnitLookup[$unitid]) ? $PNGpHYsUnitLookup[$unitid] : 'invalid');
-	}
-
-	function PNGoFFsUnitLookup($unitid) {
-		static $PNGoFFsUnitLookup = array(
-			0 => 'pixel',
-			1 => 'micrometer'
-		);
-		return (isset($PNGoFFsUnitLookup[$unitid]) ? $PNGoFFsUnitLookup[$unitid] : 'invalid');
-	}
-
-	function PNGpCALequationTypeLookup($equationtype) {
-		static $PNGpCALequationTypeLookup = array(
-			0 => 'Linear mapping',
-			1 => 'Base-e exponential mapping',
-			2 => 'Arbitrary-base exponential mapping',
-			3 => 'Hyperbolic mapping'
-		);
-		return (isset($PNGpCALequationTypeLookup[$equationtype]) ? $PNGpCALequationTypeLookup[$equationtype] : 'invalid');
-	}
-
-	function PNGsCALUnitLookup($unitid) {
-		static $PNGsCALUnitLookup = array(
-			0 => 'meter',
-			1 => 'radian'
-		);
-		return (isset($PNGsCALUnitLookup[$unitid]) ? $PNGsCALUnitLookup[$unitid] : 'invalid');
-	}
-
-	function IHDRcalculateBitsPerSample($color_type, $bit_depth) {
-		switch ($color_type) {
-			case 0: // Each pixel is a grayscale sample.
-				return $bit_depth;
-				break;
-
-			case 2: // Each pixel is an R,G,B triple
-				return 3 * $bit_depth;
-				break;
-
-			case 3: // Each pixel is a palette index; a PLTE chunk must appear.
-				return $bit_depth;
-				break;
-
-			case 4: // Each pixel is a grayscale sample, followed by an alpha sample.
-				return 2 * $bit_depth;
-				break;
-
-			case 6: // Each pixel is an R,G,B triple, followed by an alpha sample.
-				return 4 * $bit_depth;
-				break;
-		}
-		return false;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.graphic.svg.php b/lib/getid3/getid3/module.graphic.svg.php
deleted file mode 100644
index d9d52d74d..000000000
--- a/lib/getid3/getid3/module.graphic.svg.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.graphic.svg.php                                      //
-// module for analyzing SVG Image files                        //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_svg extends getid3_handler
-{
-
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-
-		$SVGheader = fread($this->getid3->fp, 4096);
-		if (preg_match('#\<\?xml([^\>]+)\?\>#i', $SVGheader, $matches)) {
-			$info['svg']['xml']['raw'] = $matches;
-		}
-		if (preg_match('#\<\!DOCTYPE([^\>]+)\>#i', $SVGheader, $matches)) {
-			$info['svg']['doctype']['raw'] = $matches;
-		}
-		if (preg_match('#\<svg([^\>]+)\>#i', $SVGheader, $matches)) {
-			$info['svg']['svg']['raw'] = $matches;
-		}
-		if (isset($info['svg']['svg']['raw'])) {
-
-			$sections_to_fix = array('xml', 'doctype', 'svg');
-			foreach ($sections_to_fix as $section_to_fix) {
-				if (!isset($info['svg'][$section_to_fix])) {
-					continue;
-				}
-				$section_data = array();
-				while (preg_match('/ "([^"]+)"/', $info['svg'][$section_to_fix]['raw'][1], $matches)) {
-					$section_data[] = $matches[1];
-					$info['svg'][$section_to_fix]['raw'][1] = str_replace($matches[0], '', $info['svg'][$section_to_fix]['raw'][1]);
-				}
-				while (preg_match('/([^\s]+)="([^"]+)"/', $info['svg'][$section_to_fix]['raw'][1], $matches)) {
-					$section_data[] = $matches[0];
-					$info['svg'][$section_to_fix]['raw'][1] = str_replace($matches[0], '', $info['svg'][$section_to_fix]['raw'][1]);
-				}
-				$section_data = array_merge($section_data, preg_split('/[\s,]+/', $info['svg'][$section_to_fix]['raw'][1]));
-				foreach ($section_data as $keyvaluepair) {
-					$keyvaluepair = trim($keyvaluepair);
-					if ($keyvaluepair) {
-						$keyvalueexploded = explode('=', $keyvaluepair);
-						$key   = (isset($keyvalueexploded[0]) ? $keyvalueexploded[0] : '');
-						$value = (isset($keyvalueexploded[1]) ? $keyvalueexploded[1] : '');
-						$info['svg'][$section_to_fix]['sections'][$key] = trim($value, '"');
-					}
-				}
-			}
-
-			$info['fileformat']                  = 'svg';
-			$info['video']['dataformat']         = 'svg';
-			$info['video']['lossless']           = true;
-			//$info['video']['bits_per_sample']    = 24;
-			$info['video']['pixel_aspect_ratio'] = (float) 1;
-
-			if (!empty($info['svg']['svg']['sections']['width'])) {
-				$info['svg']['width']  = intval($info['svg']['svg']['sections']['width']);
-			}
-			if (!empty($info['svg']['svg']['sections']['height'])) {
-				$info['svg']['height'] = intval($info['svg']['svg']['sections']['height']);
-			}
-			if (!empty($info['svg']['svg']['sections']['version'])) {
-				$info['svg']['version'] = $info['svg']['svg']['sections']['version'];
-			}
-			if (!isset($info['svg']['version']) && isset($info['svg']['doctype']['sections'])) {
-				foreach ($info['svg']['doctype']['sections'] as $key => $value) {
-					if (preg_match('#//W3C//DTD SVG ([0-9\.]+)//#i', $key, $matches)) {
-						$info['svg']['version'] = $matches[1];
-						break;
-					}
-				}
-			}
-
-			if (!empty($info['svg']['width'])) {
-				$info['video']['resolution_x'] = $info['svg']['width'];
-			}
-			if (!empty($info['svg']['height'])) {
-				$info['video']['resolution_y'] = $info['svg']['height'];
-			}
-
-			return true;
-		}
-		$info['error'][] = 'Did not find expected <svg> tag';
-		return false;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.graphic.tiff.php b/lib/getid3/getid3/module.graphic.tiff.php
deleted file mode 100644
index e97712421..000000000
--- a/lib/getid3/getid3/module.graphic.tiff.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.archive.tiff.php                                     //
-// module for analyzing TIFF files                             //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_tiff extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$TIFFheader = fread($this->getid3->fp, 4);
-
-		switch (substr($TIFFheader, 0, 2)) {
-			case 'II':
-				$info['tiff']['byte_order'] = 'Intel';
-				break;
-			case 'MM':
-				$info['tiff']['byte_order'] = 'Motorola';
-				break;
-			default:
-				$info['error'][] = 'Invalid TIFF byte order identifier ('.substr($TIFFheader, 0, 2).') at offset '.$info['avdataoffset'];
-				return false;
-				break;
-		}
-
-		$info['fileformat']          = 'tiff';
-		$info['video']['dataformat'] = 'tiff';
-		$info['video']['lossless']   = true;
-		$info['tiff']['ifd']         = array();
-		$CurrentIFD                          = array();
-
-		$FieldTypeByteLength = array(1=>1, 2=>1, 3=>2, 4=>4, 5=>8);
-
-		$nextIFDoffset = $this->TIFFendian2Int(fread($this->getid3->fp, 4), $info['tiff']['byte_order']);
-
-		while ($nextIFDoffset > 0) {
-
-			$CurrentIFD['offset'] = $nextIFDoffset;
-
-			fseek($this->getid3->fp, $info['avdataoffset'] + $nextIFDoffset, SEEK_SET);
-			$CurrentIFD['fieldcount'] = $this->TIFFendian2Int(fread($this->getid3->fp, 2), $info['tiff']['byte_order']);
-
-			for ($i = 0; $i < $CurrentIFD['fieldcount']; $i++) {
-				$CurrentIFD['fields'][$i]['raw']['tag']    = $this->TIFFendian2Int(fread($this->getid3->fp, 2), $info['tiff']['byte_order']);
-				$CurrentIFD['fields'][$i]['raw']['type']   = $this->TIFFendian2Int(fread($this->getid3->fp, 2), $info['tiff']['byte_order']);
-				$CurrentIFD['fields'][$i]['raw']['length'] = $this->TIFFendian2Int(fread($this->getid3->fp, 4), $info['tiff']['byte_order']);
-				$CurrentIFD['fields'][$i]['raw']['offset'] =                       fread($this->getid3->fp, 4);
-
-				switch ($CurrentIFD['fields'][$i]['raw']['type']) {
-					case 1: // BYTE  An 8-bit unsigned integer.
-						if ($CurrentIFD['fields'][$i]['raw']['length'] <= 4) {
-							$CurrentIFD['fields'][$i]['value']  = $this->TIFFendian2Int(substr($CurrentIFD['fields'][$i]['raw']['offset'], 0, 1), $info['tiff']['byte_order']);
-						} else {
-							$CurrentIFD['fields'][$i]['offset'] = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['offset'], $info['tiff']['byte_order']);
-						}
-						break;
-
-					case 2: // ASCII 8-bit bytes  that store ASCII codes; the last byte must be null.
-						if ($CurrentIFD['fields'][$i]['raw']['length'] <= 4) {
-							$CurrentIFD['fields'][$i]['value']  = substr($CurrentIFD['fields'][$i]['raw']['offset'], 3);
-						} else {
-							$CurrentIFD['fields'][$i]['offset'] = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['offset'], $info['tiff']['byte_order']);
-						}
-						break;
-
-					case 3: // SHORT A 16-bit (2-byte) unsigned integer.
-						if ($CurrentIFD['fields'][$i]['raw']['length'] <= 2) {
-							$CurrentIFD['fields'][$i]['value']  = $this->TIFFendian2Int(substr($CurrentIFD['fields'][$i]['raw']['offset'], 0, 2), $info['tiff']['byte_order']);
-						} else {
-							$CurrentIFD['fields'][$i]['offset'] = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['offset'], $info['tiff']['byte_order']);
-						}
-						break;
-
-					case 4: // LONG  A 32-bit (4-byte) unsigned integer.
-						if ($CurrentIFD['fields'][$i]['raw']['length'] <= 1) {
-							$CurrentIFD['fields'][$i]['value']  = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['offset'], $info['tiff']['byte_order']);
-						} else {
-							$CurrentIFD['fields'][$i]['offset'] = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['offset'], $info['tiff']['byte_order']);
-						}
-						break;
-
-					case 5: // RATIONAL   Two LONG_s:  the first represents the numerator of a fraction, the second the denominator.
-						break;
-				}
-			}
-
-			$info['tiff']['ifd'][] = $CurrentIFD;
-			$CurrentIFD = array();
-			$nextIFDoffset = $this->TIFFendian2Int(fread($this->getid3->fp, 4), $info['tiff']['byte_order']);
-
-		}
-
-		foreach ($info['tiff']['ifd'] as $IFDid => $IFDarray) {
-			foreach ($IFDarray['fields'] as $key => $fieldarray) {
-				switch ($fieldarray['raw']['tag']) {
-					case 256: // ImageWidth
-					case 257: // ImageLength
-					case 258: // BitsPerSample
-					case 259: // Compression
-						if (!isset($fieldarray['value'])) {
-							fseek($this->getid3->fp, $fieldarray['offset'], SEEK_SET);
-							$info['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data'] = fread($this->getid3->fp, $fieldarray['raw']['length'] * $FieldTypeByteLength[$fieldarray['raw']['type']]);
-
-						}
-						break;
-
-					case 270: // ImageDescription
-					case 271: // Make
-					case 272: // Model
-					case 305: // Software
-					case 306: // DateTime
-					case 315: // Artist
-					case 316: // HostComputer
-						if (isset($fieldarray['value'])) {
-							$info['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data'] = $fieldarray['value'];
-						} else {
-							fseek($this->getid3->fp, $fieldarray['offset'], SEEK_SET);
-							$info['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data'] = fread($this->getid3->fp, $fieldarray['raw']['length'] * $FieldTypeByteLength[$fieldarray['raw']['type']]);
-
-						}
-						break;
-				}
-				switch ($fieldarray['raw']['tag']) {
-					case 256: // ImageWidth
-						$info['video']['resolution_x'] = $fieldarray['value'];
-						break;
-
-					case 257: // ImageLength
-						$info['video']['resolution_y'] = $fieldarray['value'];
-						break;
-
-					case 258: // BitsPerSample
-						if (isset($fieldarray['value'])) {
-							$info['video']['bits_per_sample'] = $fieldarray['value'];
-						} else {
-							$info['video']['bits_per_sample'] = 0;
-							for ($i = 0; $i < $fieldarray['raw']['length']; $i++) {
-								$info['video']['bits_per_sample'] += $this->TIFFendian2Int(substr($info['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data'], $i * $FieldTypeByteLength[$fieldarray['raw']['type']], $FieldTypeByteLength[$fieldarray['raw']['type']]), $info['tiff']['byte_order']);
-							}
-						}
-						break;
-
-					case 259: // Compression
-						$info['video']['codec'] = $this->TIFFcompressionMethod($fieldarray['value']);
-						break;
-
-					case 270: // ImageDescription
-					case 271: // Make
-					case 272: // Model
-					case 305: // Software
-					case 306: // DateTime
-					case 315: // Artist
-					case 316: // HostComputer
-						$TIFFcommentName = $this->TIFFcommentName($fieldarray['raw']['tag']);
-						if (isset($info['tiff']['comments'][$TIFFcommentName])) {
-							$info['tiff']['comments'][$TIFFcommentName][] =       $info['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data'];
-						} else {
-							$info['tiff']['comments'][$TIFFcommentName]   = array($info['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data']);
-						}
-						break;
-
-					default:
-						break;
-				}
-			}
-		}
-
-		return true;
-	}
-
-
-	function TIFFendian2Int($bytestring, $byteorder) {
-		if ($byteorder == 'Intel') {
-			return getid3_lib::LittleEndian2Int($bytestring);
-		} elseif ($byteorder == 'Motorola') {
-			return getid3_lib::BigEndian2Int($bytestring);
-		}
-		return false;
-	}
-
-	function TIFFcompressionMethod($id) {
-		static $TIFFcompressionMethod = array();
-		if (empty($TIFFcompressionMethod)) {
-			$TIFFcompressionMethod = array(
-				1     => 'Uncompressed',
-				2     => 'Huffman',
-				3     => 'Fax - CCITT 3',
-				5     => 'LZW',
-				32773 => 'PackBits',
-			);
-		}
-		return (isset($TIFFcompressionMethod[$id]) ? $TIFFcompressionMethod[$id] : 'unknown/invalid ('.$id.')');
-	}
-
-	function TIFFcommentName($id) {
-		static $TIFFcommentName = array();
-		if (empty($TIFFcommentName)) {
-			$TIFFcommentName = array(
-				270 => 'imagedescription',
-				271 => 'make',
-				272 => 'model',
-				305 => 'software',
-				306 => 'datetime',
-				315 => 'artist',
-				316 => 'hostcomputer',
-			);
-		}
-		return (isset($TIFFcommentName[$id]) ? $TIFFcommentName[$id] : 'unknown/invalid ('.$id.')');
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.misc.cue.php b/lib/getid3/getid3/module.misc.cue.php
deleted file mode 100644
index c99ce2479..000000000
--- a/lib/getid3/getid3/module.misc.cue.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.misc.cue.php                                         //
-// module for analyzing CUEsheet files                         //
-// dependencies: NONE                                          //
-//                                                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// Module originally written [2009-Mar-25] by                  //
-//      Nigel Barnes <ngbarnes�hotmail*com>                    //
-// Minor reformatting and similar small changes to integrate   //
-//   into getID3 by James Heinrich <info@getid3.org>           //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-/*
- * CueSheet parser by Nigel Barnes.
- *
- * This is a PHP conversion of CueSharp 0.5 by Wyatt O'Day (wyday.com/cuesharp)
- */
-
-/**
- * A CueSheet class used to open and parse cuesheets.
- *
- */
-class getid3_cue extends getid3_handler
-{
-	var $cuesheet = array();
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat'] = 'cue';
-		$this->readCueSheetFilename($info['filenamepath']);
-		$info['cue'] = $this->cuesheet;
-		return true;
-	}
-
-
-
-	function readCueSheetFilename($filename)
-	{
-		$filedata = file_get_contents($filename);
-		return $this->readCueSheet($filedata);
-	}
-	/**
-	* Parses a cue sheet file.
-	*
-	* @param string $filename - The filename for the cue sheet to open.
-	*/
-	function readCueSheet(&$filedata)
-	{
-		$cue_lines = array();
-		foreach (explode("\n", str_replace("\r", null, $filedata)) as $line)
-		{
-			if ( (strlen($line) > 0) && ($line[0] != '#'))
-			{
-				$cue_lines[] = trim($line);
-			}
-		}
-		$this->parseCueSheet($cue_lines);
-
-		return $this->cuesheet;
-	}
-
-	/**
-	* Parses the cue sheet array.
-	*
-	* @param array $file - The cuesheet as an array of each line.
-	*/
-	function parseCueSheet($file)
-	{
-		//-1 means still global, all others are track specific
-		$track_on = -1;
-
-		for ($i=0; $i < count($file); $i++)
-		{
-			list($key) = explode(' ', strtolower($file[$i]), 2);
-			switch ($key)
-			{
-				case 'catalog':
-				case 'cdtextfile':
-				case 'isrc':
-				case 'performer':
-				case 'songwriter':
-				case 'title':
-					$this->parseString($file[$i], $track_on);
-					break;
-				case 'file':
-					$currentFile = $this->parseFile($file[$i]);
-					break;
-				case 'flags':
-					$this->parseFlags($file[$i], $track_on);
-					break;
-				case 'index':
-				case 'postgap':
-				case 'pregap':
-					$this->parseIndex($file[$i], $track_on);
-					break;
-				case 'rem':
-					$this->parseComment($file[$i], $track_on);
-					break;
-				case 'track':
-					$track_on++;
-					$this->parseTrack($file[$i], $track_on);
-					if (isset($currentFile)) // if there's a file
-					{
-						$this->cuesheet['tracks'][$track_on]['datafile'] = $currentFile;
-					}
-					break;
-				default:
-					//save discarded junk and place string[] with track it was found in
-					$this->parseGarbage($file[$i], $track_on);
-					break;
-			}
-		}
-	}
-
-	/**
-	* Parses the REM command.
-	*
-	* @param string $line - The line in the cue file that contains the TRACK command.
-	* @param integer $track_on - The track currently processing.
-	*/
-	function parseComment($line, $track_on)
-	{
-		$explodedline = explode(' ', $line, 3);
-		$comment_REM  = (isset($explodedline[0]) ? $explodedline[0] : '');
-		$comment_type = (isset($explodedline[1]) ? $explodedline[1] : '');
-		$comment_data = (isset($explodedline[2]) ? $explodedline[2] : '');
-		if (($comment_REM == 'REM') && $comment_type) {
-			$comment_type  = strtolower($comment_type);
-			$commment_data = trim($comment_data, ' "');
-			if ($track_on != -1) {
-				$this->cuesheet['tracks'][$track_on]['comments'][$comment_type][] = $comment_data;
-			} else {
-				$this->cuesheet['comments'][$comment_type][] = $comment_data;
-			}
-		}
-	}
-
-	/**
-	* Parses the FILE command.
-	*
-	* @param string $line - The line in the cue file that contains the FILE command.
-	* @return array - Array of FILENAME and TYPE of file..
-	*/
-	function parseFile($line)
-	{
-		$line =            substr($line, strpos($line, ' ') + 1);
-		$type = strtolower(substr($line, strrpos($line, ' ')));
-
-		//remove type
-		$line = substr($line, 0, strrpos($line, ' ') - 1);
-
-		//if quotes around it, remove them.
-		$line = trim($line, '"');
-
-		return array('filename'=>$line, 'type'=>$type);
-	}
-
-	/**
-	* Parses the FLAG command.
-	*
-	* @param string $line - The line in the cue file that contains the TRACK command.
-	* @param integer $track_on - The track currently processing.
-	*/
-	function parseFlags($line, $track_on)
-	{
-		if ($track_on != -1)
-		{
-			foreach (explode(' ', strtolower($line)) as $type)
-			{
-				switch ($type)
-				{
-					case 'flags':
-						// first entry in this line
-						$this->cuesheet['tracks'][$track_on]['flags'] = array(
-							'4ch'  => false,
-							'data' => false,
-							'dcp'  => false,
-							'pre'  => false,
-							'scms' => false,
-						);
-						break;
-					case 'data':
-					case 'dcp':
-					case '4ch':
-					case 'pre':
-					case 'scms':
-						$this->cuesheet['tracks'][$track_on]['flags'][$type] = true;
-						break;
-					default:
-						break;
-				}
-			}
-		}
-	}
-
-	/**
-	* Collect any unidentified data.
-	*
-	* @param string $line - The line in the cue file that contains the TRACK command.
-	* @param integer $track_on - The track currently processing.
-	*/
-	function parseGarbage($line, $track_on)
-	{
-		if ( strlen($line) > 0 )
-		{
-			if ($track_on == -1)
-			{
-				$this->cuesheet['garbage'][] = $line;
-			}
-			else
-			{
-				$this->cuesheet['tracks'][$track_on]['garbage'][] = $line;
-			}
-		}
-	}
-
-	/**
-	* Parses the INDEX command of a TRACK.
-	*
-	* @param string $line - The line in the cue file that contains the TRACK command.
-	* @param integer $track_on - The track currently processing.
-	*/
-	function parseIndex($line, $track_on)
-	{
-		$type = strtolower(substr($line, 0, strpos($line, ' ')));
-		$line =            substr($line, strpos($line, ' ') + 1);
-
-		if ($type == 'index')
-		{
-			//read the index number
-			$number = intval(substr($line, 0, strpos($line, ' ')));
-			$line   =        substr($line, strpos($line, ' ') + 1);
-		}
-
-		//extract the minutes, seconds, and frames
-		$explodedline = explode(':', $line);
-		$minutes = (isset($explodedline[0]) ? $explodedline[0] : '');
-		$seconds = (isset($explodedline[1]) ? $explodedline[1] : '');
-		$frames  = (isset($explodedline[2]) ? $explodedline[2] : '');
-
-		switch ($type) {
-			case 'index':
-				$this->cuesheet['tracks'][$track_on][$type][$number] = array('minutes'=>intval($minutes), 'seconds'=>intval($seconds), 'frames'=>intval($frames));
-				break;
-			case 'pregap':
-			case 'postgap':
-				$this->cuesheet['tracks'][$track_on][$type]          = array('minutes'=>intval($minutes), 'seconds'=>intval($seconds), 'frames'=>intval($frames));
-				break;
-		}
-	}
-
-	function parseString($line, $track_on)
-	{
-		$category = strtolower(substr($line, 0, strpos($line, ' ')));
-		$line     =            substr($line, strpos($line, ' ') + 1);
-
-		//get rid of the quotes
-		$line = trim($line, '"');
-
-		switch ($category)
-		{
-			case 'catalog':
-			case 'cdtextfile':
-			case 'isrc':
-			case 'performer':
-			case 'songwriter':
-			case 'title':
-				if ($track_on == -1)
-				{
-					$this->cuesheet[$category] = $line;
-				}
-				else
-				{
-					$this->cuesheet['tracks'][$track_on][$category] = $line;
-				}
-				break;
-			default:
-				break;
-		}
-	}
-
-	/**
-	* Parses the TRACK command.
-	*
-	* @param string $line - The line in the cue file that contains the TRACK command.
-	* @param integer $track_on - The track currently processing.
-	*/
-	function parseTrack($line, $track_on)
-	{
-		$line = substr($line, strpos($line, ' ') + 1);
-		$track = ltrim(substr($line, 0, strpos($line, ' ')), '0');
-
-		//find the data type.
-		$datatype = strtolower(substr($line, strpos($line, ' ') + 1));
-
-		$this->cuesheet['tracks'][$track_on] = array('track_number'=>$track, 'datatype'=>$datatype);
-	}
-
-}
-
-?>
diff --git a/lib/getid3/getid3/module.misc.exe.php b/lib/getid3/getid3/module.misc.exe.php
deleted file mode 100644
index 108e62ecd..000000000
--- a/lib/getid3/getid3/module.misc.exe.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.misc.exe.php                                         //
-// module for analyzing EXE files                              //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_exe extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$EXEheader = fread($this->getid3->fp, 28);
-
-		$magic = 'MZ';
-		if (substr($EXEheader, 0, 2) != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($EXEheader, 0, 2)).'"';
-			return false;
-		}
-
-		$info['fileformat'] = 'exe';
-		$info['exe']['mz']['magic'] = 'MZ';
-
-		$info['exe']['mz']['raw']['last_page_size']          = getid3_lib::LittleEndian2Int(substr($EXEheader,  2, 2));
-		$info['exe']['mz']['raw']['page_count']              = getid3_lib::LittleEndian2Int(substr($EXEheader,  4, 2));
-		$info['exe']['mz']['raw']['relocation_count']        = getid3_lib::LittleEndian2Int(substr($EXEheader,  6, 2));
-		$info['exe']['mz']['raw']['header_paragraphs']       = getid3_lib::LittleEndian2Int(substr($EXEheader,  8, 2));
-		$info['exe']['mz']['raw']['min_memory_paragraphs']   = getid3_lib::LittleEndian2Int(substr($EXEheader, 10, 2));
-		$info['exe']['mz']['raw']['max_memory_paragraphs']   = getid3_lib::LittleEndian2Int(substr($EXEheader, 12, 2));
-		$info['exe']['mz']['raw']['initial_ss']              = getid3_lib::LittleEndian2Int(substr($EXEheader, 14, 2));
-		$info['exe']['mz']['raw']['initial_sp']              = getid3_lib::LittleEndian2Int(substr($EXEheader, 16, 2));
-		$info['exe']['mz']['raw']['checksum']                = getid3_lib::LittleEndian2Int(substr($EXEheader, 18, 2));
-		$info['exe']['mz']['raw']['cs_ip']                   = getid3_lib::LittleEndian2Int(substr($EXEheader, 20, 4));
-		$info['exe']['mz']['raw']['relocation_table_offset'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 24, 2));
-		$info['exe']['mz']['raw']['overlay_number']          = getid3_lib::LittleEndian2Int(substr($EXEheader, 26, 2));
-
-		$info['exe']['mz']['byte_size']          = (($info['exe']['mz']['raw']['page_count'] - 1)) * 512 + $info['exe']['mz']['raw']['last_page_size'];
-		$info['exe']['mz']['header_size']        = $info['exe']['mz']['raw']['header_paragraphs'] * 16;
-		$info['exe']['mz']['memory_minimum']     = $info['exe']['mz']['raw']['min_memory_paragraphs'] * 16;
-		$info['exe']['mz']['memory_recommended'] = $info['exe']['mz']['raw']['max_memory_paragraphs'] * 16;
-
-$info['error'][] = 'EXE parsing not enabled in this version of getID3() ['.$this->getid3->version().']';
-return false;
-
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.misc.iso.php b/lib/getid3/getid3/module.misc.iso.php
deleted file mode 100644
index 727fdf870..000000000
--- a/lib/getid3/getid3/module.misc.iso.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.misc.iso.php                                         //
-// module for analyzing ISO files                              //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_iso extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat'] = 'iso';
-
-		for ($i = 16; $i <= 19; $i++) {
-			fseek($this->getid3->fp, 2048 * $i, SEEK_SET);
-			$ISOheader = fread($this->getid3->fp, 2048);
-			if (substr($ISOheader, 1, 5) == 'CD001') {
-				switch (ord($ISOheader{0})) {
-					case 1:
-						$info['iso']['primary_volume_descriptor']['offset'] = 2048 * $i;
-						$this->ParsePrimaryVolumeDescriptor($ISOheader);
-						break;
-
-					case 2:
-						$info['iso']['supplementary_volume_descriptor']['offset'] = 2048 * $i;
-						$this->ParseSupplementaryVolumeDescriptor($ISOheader);
-						break;
-
-					default:
-						// skip
-						break;
-				}
-			}
-		}
-
-		$this->ParsePathTable();
-
-		$info['iso']['files'] = array();
-		foreach ($info['iso']['path_table']['directories'] as $directorynum => $directorydata) {
-			$info['iso']['directories'][$directorynum] = $this->ParseDirectoryRecord($directorydata);
-		}
-
-		return true;
-	}
-
-
-	function ParsePrimaryVolumeDescriptor(&$ISOheader) {
-		// ISO integer values are stored *BOTH* Little-Endian AND Big-Endian format!!
-		// ie 12345 == 0x3039  is stored as $39 $30 $30 $39 in a 4-byte field
-
-		// shortcuts
-		$info = &$this->getid3->info;
-		$info['iso']['primary_volume_descriptor']['raw'] = array();
-		$thisfile_iso_primaryVD     = &$info['iso']['primary_volume_descriptor'];
-		$thisfile_iso_primaryVD_raw = &$thisfile_iso_primaryVD['raw'];
-
-		$thisfile_iso_primaryVD_raw['volume_descriptor_type']         = getid3_lib::LittleEndian2Int(substr($ISOheader,    0, 1));
-		$thisfile_iso_primaryVD_raw['standard_identifier']            =                  substr($ISOheader,    1, 5);
-		if ($thisfile_iso_primaryVD_raw['standard_identifier'] != 'CD001') {
-			$info['error'][] = 'Expected "CD001" at offset ('.($thisfile_iso_primaryVD['offset'] + 1).'), found "'.$thisfile_iso_primaryVD_raw['standard_identifier'].'" instead';
-			unset($info['fileformat']);
-			unset($info['iso']);
-			return false;
-		}
-
-
-		$thisfile_iso_primaryVD_raw['volume_descriptor_version']     = getid3_lib::LittleEndian2Int(substr($ISOheader,    6, 1));
-		//$thisfile_iso_primaryVD_raw['unused_1']                      =                              substr($ISOheader,    7, 1);
-		$thisfile_iso_primaryVD_raw['system_identifier']             =                              substr($ISOheader,    8, 32);
-		$thisfile_iso_primaryVD_raw['volume_identifier']             =                              substr($ISOheader,   40, 32);
-		//$thisfile_iso_primaryVD_raw['unused_2']                      =                              substr($ISOheader,   72, 8);
-		$thisfile_iso_primaryVD_raw['volume_space_size']             = getid3_lib::LittleEndian2Int(substr($ISOheader,   80, 4));
-		//$thisfile_iso_primaryVD_raw['unused_3']                      =                              substr($ISOheader,   88, 32);
-		$thisfile_iso_primaryVD_raw['volume_set_size']               = getid3_lib::LittleEndian2Int(substr($ISOheader,  120, 2));
-		$thisfile_iso_primaryVD_raw['volume_sequence_number']        = getid3_lib::LittleEndian2Int(substr($ISOheader,  124, 2));
-		$thisfile_iso_primaryVD_raw['logical_block_size']            = getid3_lib::LittleEndian2Int(substr($ISOheader,  128, 2));
-		$thisfile_iso_primaryVD_raw['path_table_size']               = getid3_lib::LittleEndian2Int(substr($ISOheader,  132, 4));
-		$thisfile_iso_primaryVD_raw['path_table_l_location']         = getid3_lib::LittleEndian2Int(substr($ISOheader,  140, 2));
-		$thisfile_iso_primaryVD_raw['path_table_l_opt_location']     = getid3_lib::LittleEndian2Int(substr($ISOheader,  144, 2));
-		$thisfile_iso_primaryVD_raw['path_table_m_location']         = getid3_lib::LittleEndian2Int(substr($ISOheader,  148, 2));
-		$thisfile_iso_primaryVD_raw['path_table_m_opt_location']     = getid3_lib::LittleEndian2Int(substr($ISOheader,  152, 2));
-		$thisfile_iso_primaryVD_raw['root_directory_record']         =                              substr($ISOheader,  156, 34);
-		$thisfile_iso_primaryVD_raw['volume_set_identifier']         =                              substr($ISOheader,  190, 128);
-		$thisfile_iso_primaryVD_raw['publisher_identifier']          =                              substr($ISOheader,  318, 128);
-		$thisfile_iso_primaryVD_raw['data_preparer_identifier']      =                              substr($ISOheader,  446, 128);
-		$thisfile_iso_primaryVD_raw['application_identifier']        =                              substr($ISOheader,  574, 128);
-		$thisfile_iso_primaryVD_raw['copyright_file_identifier']     =                              substr($ISOheader,  702, 37);
-		$thisfile_iso_primaryVD_raw['abstract_file_identifier']      =                              substr($ISOheader,  739, 37);
-		$thisfile_iso_primaryVD_raw['bibliographic_file_identifier'] =                              substr($ISOheader,  776, 37);
-		$thisfile_iso_primaryVD_raw['volume_creation_date_time']     =                              substr($ISOheader,  813, 17);
-		$thisfile_iso_primaryVD_raw['volume_modification_date_time'] =                              substr($ISOheader,  830, 17);
-		$thisfile_iso_primaryVD_raw['volume_expiration_date_time']   =                              substr($ISOheader,  847, 17);
-		$thisfile_iso_primaryVD_raw['volume_effective_date_time']    =                              substr($ISOheader,  864, 17);
-		$thisfile_iso_primaryVD_raw['file_structure_version']        = getid3_lib::LittleEndian2Int(substr($ISOheader,  881, 1));
-		//$thisfile_iso_primaryVD_raw['unused_4']                      = getid3_lib::LittleEndian2Int(substr($ISOheader,  882, 1));
-		$thisfile_iso_primaryVD_raw['application_data']              =                              substr($ISOheader,  883, 512);
-		//$thisfile_iso_primaryVD_raw['unused_5']                      =                              substr($ISOheader, 1395, 653);
-
-		$thisfile_iso_primaryVD['system_identifier']             = trim($thisfile_iso_primaryVD_raw['system_identifier']);
-		$thisfile_iso_primaryVD['volume_identifier']             = trim($thisfile_iso_primaryVD_raw['volume_identifier']);
-		$thisfile_iso_primaryVD['volume_set_identifier']         = trim($thisfile_iso_primaryVD_raw['volume_set_identifier']);
-		$thisfile_iso_primaryVD['publisher_identifier']          = trim($thisfile_iso_primaryVD_raw['publisher_identifier']);
-		$thisfile_iso_primaryVD['data_preparer_identifier']      = trim($thisfile_iso_primaryVD_raw['data_preparer_identifier']);
-		$thisfile_iso_primaryVD['application_identifier']        = trim($thisfile_iso_primaryVD_raw['application_identifier']);
-		$thisfile_iso_primaryVD['copyright_file_identifier']     = trim($thisfile_iso_primaryVD_raw['copyright_file_identifier']);
-		$thisfile_iso_primaryVD['abstract_file_identifier']      = trim($thisfile_iso_primaryVD_raw['abstract_file_identifier']);
-		$thisfile_iso_primaryVD['bibliographic_file_identifier'] = trim($thisfile_iso_primaryVD_raw['bibliographic_file_identifier']);
-		$thisfile_iso_primaryVD['volume_creation_date_time']     = $this->ISOtimeText2UNIXtime($thisfile_iso_primaryVD_raw['volume_creation_date_time']);
-		$thisfile_iso_primaryVD['volume_modification_date_time'] = $this->ISOtimeText2UNIXtime($thisfile_iso_primaryVD_raw['volume_modification_date_time']);
-		$thisfile_iso_primaryVD['volume_expiration_date_time']   = $this->ISOtimeText2UNIXtime($thisfile_iso_primaryVD_raw['volume_expiration_date_time']);
-		$thisfile_iso_primaryVD['volume_effective_date_time']    = $this->ISOtimeText2UNIXtime($thisfile_iso_primaryVD_raw['volume_effective_date_time']);
-
-		if (($thisfile_iso_primaryVD_raw['volume_space_size'] * 2048) > $info['filesize']) {
-			$info['error'][] = 'Volume Space Size ('.($thisfile_iso_primaryVD_raw['volume_space_size'] * 2048).' bytes) is larger than the file size ('.$info['filesize'].' bytes) (truncated file?)';
-		}
-
-		return true;
-	}
-
-
-	function ParseSupplementaryVolumeDescriptor(&$ISOheader) {
-		// ISO integer values are stored Both-Endian format!!
-		// ie 12345 == 0x3039  is stored as $39 $30 $30 $39 in a 4-byte field
-
-		// shortcuts
-		$info = &$this->getid3->info;
-		$info['iso']['supplementary_volume_descriptor']['raw'] = array();
-		$thisfile_iso_supplementaryVD     = &$info['iso']['supplementary_volume_descriptor'];
-		$thisfile_iso_supplementaryVD_raw = &$thisfile_iso_supplementaryVD['raw'];
-
-		$thisfile_iso_supplementaryVD_raw['volume_descriptor_type'] = getid3_lib::LittleEndian2Int(substr($ISOheader,    0, 1));
-		$thisfile_iso_supplementaryVD_raw['standard_identifier']    =                  substr($ISOheader,    1, 5);
-		if ($thisfile_iso_supplementaryVD_raw['standard_identifier'] != 'CD001') {
-			$info['error'][] = 'Expected "CD001" at offset ('.($thisfile_iso_supplementaryVD['offset'] + 1).'), found "'.$thisfile_iso_supplementaryVD_raw['standard_identifier'].'" instead';
-			unset($info['fileformat']);
-			unset($info['iso']);
-			return false;
-		}
-
-		$thisfile_iso_supplementaryVD_raw['volume_descriptor_version'] = getid3_lib::LittleEndian2Int(substr($ISOheader,    6, 1));
-		//$thisfile_iso_supplementaryVD_raw['unused_1']                  =                              substr($ISOheader,    7, 1);
-		$thisfile_iso_supplementaryVD_raw['system_identifier']         =                              substr($ISOheader,    8, 32);
-		$thisfile_iso_supplementaryVD_raw['volume_identifier']         =                              substr($ISOheader,   40, 32);
-		//$thisfile_iso_supplementaryVD_raw['unused_2']                  =                              substr($ISOheader,   72, 8);
-		$thisfile_iso_supplementaryVD_raw['volume_space_size']         = getid3_lib::LittleEndian2Int(substr($ISOheader,   80, 4));
-		if ($thisfile_iso_supplementaryVD_raw['volume_space_size'] == 0) {
-			// Supplementary Volume Descriptor not used
-			//unset($thisfile_iso_supplementaryVD);
-			//return false;
-		}
-
-		//$thisfile_iso_supplementaryVD_raw['unused_3']                       =                              substr($ISOheader,   88, 32);
-		$thisfile_iso_supplementaryVD_raw['volume_set_size']                = getid3_lib::LittleEndian2Int(substr($ISOheader,  120, 2));
-		$thisfile_iso_supplementaryVD_raw['volume_sequence_number']         = getid3_lib::LittleEndian2Int(substr($ISOheader,  124, 2));
-		$thisfile_iso_supplementaryVD_raw['logical_block_size']             = getid3_lib::LittleEndian2Int(substr($ISOheader,  128, 2));
-		$thisfile_iso_supplementaryVD_raw['path_table_size']                = getid3_lib::LittleEndian2Int(substr($ISOheader,  132, 4));
-		$thisfile_iso_supplementaryVD_raw['path_table_l_location']          = getid3_lib::LittleEndian2Int(substr($ISOheader,  140, 2));
-		$thisfile_iso_supplementaryVD_raw['path_table_l_opt_location']      = getid3_lib::LittleEndian2Int(substr($ISOheader,  144, 2));
-		$thisfile_iso_supplementaryVD_raw['path_table_m_location']          = getid3_lib::LittleEndian2Int(substr($ISOheader,  148, 2));
-		$thisfile_iso_supplementaryVD_raw['path_table_m_opt_location']      = getid3_lib::LittleEndian2Int(substr($ISOheader,  152, 2));
-		$thisfile_iso_supplementaryVD_raw['root_directory_record']          =                              substr($ISOheader,  156, 34);
-		$thisfile_iso_supplementaryVD_raw['volume_set_identifier']          =                              substr($ISOheader,  190, 128);
-		$thisfile_iso_supplementaryVD_raw['publisher_identifier']           =                              substr($ISOheader,  318, 128);
-		$thisfile_iso_supplementaryVD_raw['data_preparer_identifier']       =                              substr($ISOheader,  446, 128);
-		$thisfile_iso_supplementaryVD_raw['application_identifier']         =                              substr($ISOheader,  574, 128);
-		$thisfile_iso_supplementaryVD_raw['copyright_file_identifier']      =                              substr($ISOheader,  702, 37);
-		$thisfile_iso_supplementaryVD_raw['abstract_file_identifier']       =                              substr($ISOheader,  739, 37);
-		$thisfile_iso_supplementaryVD_raw['bibliographic_file_identifier']  =                              substr($ISOheader,  776, 37);
-		$thisfile_iso_supplementaryVD_raw['volume_creation_date_time']      =                              substr($ISOheader,  813, 17);
-		$thisfile_iso_supplementaryVD_raw['volume_modification_date_time']  =                              substr($ISOheader,  830, 17);
-		$thisfile_iso_supplementaryVD_raw['volume_expiration_date_time']    =                              substr($ISOheader,  847, 17);
-		$thisfile_iso_supplementaryVD_raw['volume_effective_date_time']     =                              substr($ISOheader,  864, 17);
-		$thisfile_iso_supplementaryVD_raw['file_structure_version']         = getid3_lib::LittleEndian2Int(substr($ISOheader,  881, 1));
-		//$thisfile_iso_supplementaryVD_raw['unused_4']                       = getid3_lib::LittleEndian2Int(substr($ISOheader,  882, 1));
-		$thisfile_iso_supplementaryVD_raw['application_data']               =                              substr($ISOheader,  883, 512);
-		//$thisfile_iso_supplementaryVD_raw['unused_5']                       =                              substr($ISOheader, 1395, 653);
-
-		$thisfile_iso_supplementaryVD['system_identifier']              = trim($thisfile_iso_supplementaryVD_raw['system_identifier']);
-		$thisfile_iso_supplementaryVD['volume_identifier']              = trim($thisfile_iso_supplementaryVD_raw['volume_identifier']);
-		$thisfile_iso_supplementaryVD['volume_set_identifier']          = trim($thisfile_iso_supplementaryVD_raw['volume_set_identifier']);
-		$thisfile_iso_supplementaryVD['publisher_identifier']           = trim($thisfile_iso_supplementaryVD_raw['publisher_identifier']);
-		$thisfile_iso_supplementaryVD['data_preparer_identifier']       = trim($thisfile_iso_supplementaryVD_raw['data_preparer_identifier']);
-		$thisfile_iso_supplementaryVD['application_identifier']         = trim($thisfile_iso_supplementaryVD_raw['application_identifier']);
-		$thisfile_iso_supplementaryVD['copyright_file_identifier']      = trim($thisfile_iso_supplementaryVD_raw['copyright_file_identifier']);
-		$thisfile_iso_supplementaryVD['abstract_file_identifier']       = trim($thisfile_iso_supplementaryVD_raw['abstract_file_identifier']);
-		$thisfile_iso_supplementaryVD['bibliographic_file_identifier']  = trim($thisfile_iso_supplementaryVD_raw['bibliographic_file_identifier']);
-		$thisfile_iso_supplementaryVD['volume_creation_date_time']      = $this->ISOtimeText2UNIXtime($thisfile_iso_supplementaryVD_raw['volume_creation_date_time']);
-		$thisfile_iso_supplementaryVD['volume_modification_date_time']  = $this->ISOtimeText2UNIXtime($thisfile_iso_supplementaryVD_raw['volume_modification_date_time']);
-		$thisfile_iso_supplementaryVD['volume_expiration_date_time']    = $this->ISOtimeText2UNIXtime($thisfile_iso_supplementaryVD_raw['volume_expiration_date_time']);
-		$thisfile_iso_supplementaryVD['volume_effective_date_time']     = $this->ISOtimeText2UNIXtime($thisfile_iso_supplementaryVD_raw['volume_effective_date_time']);
-
-		if (($thisfile_iso_supplementaryVD_raw['volume_space_size'] * $thisfile_iso_supplementaryVD_raw['logical_block_size']) > $info['filesize']) {
-			$info['error'][] = 'Volume Space Size ('.($thisfile_iso_supplementaryVD_raw['volume_space_size'] * $thisfile_iso_supplementaryVD_raw['logical_block_size']).' bytes) is larger than the file size ('.$info['filesize'].' bytes) (truncated file?)';
-		}
-
-		return true;
-	}
-
-
-	function ParsePathTable() {
-		$info = &$this->getid3->info;
-		if (!isset($info['iso']['supplementary_volume_descriptor']['raw']['path_table_l_location']) && !isset($info['iso']['primary_volume_descriptor']['raw']['path_table_l_location'])) {
-			return false;
-		}
-		if (isset($info['iso']['supplementary_volume_descriptor']['raw']['path_table_l_location'])) {
-			$PathTableLocation = $info['iso']['supplementary_volume_descriptor']['raw']['path_table_l_location'];
-			$PathTableSize     = $info['iso']['supplementary_volume_descriptor']['raw']['path_table_size'];
-			$TextEncoding      = 'UTF-16BE'; // Big-Endian Unicode
-		} else {
-			$PathTableLocation = $info['iso']['primary_volume_descriptor']['raw']['path_table_l_location'];
-			$PathTableSize     = $info['iso']['primary_volume_descriptor']['raw']['path_table_size'];
-			$TextEncoding      = 'ISO-8859-1'; // Latin-1
-		}
-
-		if (($PathTableLocation * 2048) > $info['filesize']) {
-			$info['error'][] = 'Path Table Location specifies an offset ('.($PathTableLocation * 2048).') beyond the end-of-file ('.$info['filesize'].')';
-			return false;
-		}
-
-		$info['iso']['path_table']['offset'] = $PathTableLocation * 2048;
-		fseek($this->getid3->fp, $info['iso']['path_table']['offset'], SEEK_SET);
-		$info['iso']['path_table']['raw'] = fread($this->getid3->fp, $PathTableSize);
-
-		$offset = 0;
-		$pathcounter = 1;
-		while ($offset < $PathTableSize) {
-			// shortcut
-			$info['iso']['path_table']['directories'][$pathcounter] = array();
-			$thisfile_iso_pathtable_directories_current = &$info['iso']['path_table']['directories'][$pathcounter];
-
-			$thisfile_iso_pathtable_directories_current['length']           = getid3_lib::LittleEndian2Int(substr($info['iso']['path_table']['raw'], $offset, 1));
-			$offset += 1;
-			$thisfile_iso_pathtable_directories_current['extended_length']  = getid3_lib::LittleEndian2Int(substr($info['iso']['path_table']['raw'], $offset, 1));
-			$offset += 1;
-			$thisfile_iso_pathtable_directories_current['location_logical'] = getid3_lib::LittleEndian2Int(substr($info['iso']['path_table']['raw'], $offset, 4));
-			$offset += 4;
-			$thisfile_iso_pathtable_directories_current['parent_directory'] = getid3_lib::LittleEndian2Int(substr($info['iso']['path_table']['raw'], $offset, 2));
-			$offset += 2;
-			$thisfile_iso_pathtable_directories_current['name']             =                  substr($info['iso']['path_table']['raw'], $offset, $thisfile_iso_pathtable_directories_current['length']);
-			$offset += $thisfile_iso_pathtable_directories_current['length'] + ($thisfile_iso_pathtable_directories_current['length'] % 2);
-
-			$thisfile_iso_pathtable_directories_current['name_ascii']       = getid3_lib::iconv_fallback($TextEncoding, $info['encoding'], $thisfile_iso_pathtable_directories_current['name']);
-
-			$thisfile_iso_pathtable_directories_current['location_bytes'] = $thisfile_iso_pathtable_directories_current['location_logical'] * 2048;
-			if ($pathcounter == 1) {
-				$thisfile_iso_pathtable_directories_current['full_path'] = '/';
-			} else {
-				$thisfile_iso_pathtable_directories_current['full_path'] = $info['iso']['path_table']['directories'][$thisfile_iso_pathtable_directories_current['parent_directory']]['full_path'].$thisfile_iso_pathtable_directories_current['name_ascii'].'/';
-			}
-			$FullPathArray[] = $thisfile_iso_pathtable_directories_current['full_path'];
-
-			$pathcounter++;
-		}
-
-		return true;
-	}
-
-
-	function ParseDirectoryRecord($directorydata) {
-		$info = &$this->getid3->info;
-		if (isset($info['iso']['supplementary_volume_descriptor'])) {
-			$TextEncoding = 'UTF-16BE';   // Big-Endian Unicode
-		} else {
-			$TextEncoding = 'ISO-8859-1'; // Latin-1
-		}
-
-		fseek($this->getid3->fp, $directorydata['location_bytes'], SEEK_SET);
-		$DirectoryRecordData = fread($this->getid3->fp, 1);
-
-		while (ord($DirectoryRecordData{0}) > 33) {
-
-			$DirectoryRecordData .= fread($this->getid3->fp, ord($DirectoryRecordData{0}) - 1);
-
-			$ThisDirectoryRecord['raw']['length']                    = getid3_lib::LittleEndian2Int(substr($DirectoryRecordData,  0, 1));
-			$ThisDirectoryRecord['raw']['extended_attribute_length'] = getid3_lib::LittleEndian2Int(substr($DirectoryRecordData,  1, 1));
-			$ThisDirectoryRecord['raw']['offset_logical']            = getid3_lib::LittleEndian2Int(substr($DirectoryRecordData,  2, 4));
-			$ThisDirectoryRecord['raw']['filesize']                  = getid3_lib::LittleEndian2Int(substr($DirectoryRecordData, 10, 4));
-			$ThisDirectoryRecord['raw']['recording_date_time']       =                  substr($DirectoryRecordData, 18, 7);
-			$ThisDirectoryRecord['raw']['file_flags']                = getid3_lib::LittleEndian2Int(substr($DirectoryRecordData, 25, 1));
-			$ThisDirectoryRecord['raw']['file_unit_size']            = getid3_lib::LittleEndian2Int(substr($DirectoryRecordData, 26, 1));
-			$ThisDirectoryRecord['raw']['interleave_gap_size']       = getid3_lib::LittleEndian2Int(substr($DirectoryRecordData, 27, 1));
-			$ThisDirectoryRecord['raw']['volume_sequence_number']    = getid3_lib::LittleEndian2Int(substr($DirectoryRecordData, 28, 2));
-			$ThisDirectoryRecord['raw']['file_identifier_length']    = getid3_lib::LittleEndian2Int(substr($DirectoryRecordData, 32, 1));
-			$ThisDirectoryRecord['raw']['file_identifier']           =                  substr($DirectoryRecordData, 33, $ThisDirectoryRecord['raw']['file_identifier_length']);
-
-			$ThisDirectoryRecord['file_identifier_ascii']            = getid3_lib::iconv_fallback($TextEncoding, $info['encoding'], $ThisDirectoryRecord['raw']['file_identifier']);
-
-			$ThisDirectoryRecord['filesize']                  = $ThisDirectoryRecord['raw']['filesize'];
-			$ThisDirectoryRecord['offset_bytes']              = $ThisDirectoryRecord['raw']['offset_logical'] * 2048;
-			$ThisDirectoryRecord['file_flags']['hidden']      = (bool) ($ThisDirectoryRecord['raw']['file_flags'] & 0x01);
-			$ThisDirectoryRecord['file_flags']['directory']   = (bool) ($ThisDirectoryRecord['raw']['file_flags'] & 0x02);
-			$ThisDirectoryRecord['file_flags']['associated']  = (bool) ($ThisDirectoryRecord['raw']['file_flags'] & 0x04);
-			$ThisDirectoryRecord['file_flags']['extended']    = (bool) ($ThisDirectoryRecord['raw']['file_flags'] & 0x08);
-			$ThisDirectoryRecord['file_flags']['permissions'] = (bool) ($ThisDirectoryRecord['raw']['file_flags'] & 0x10);
-			$ThisDirectoryRecord['file_flags']['multiple']    = (bool) ($ThisDirectoryRecord['raw']['file_flags'] & 0x80);
-			$ThisDirectoryRecord['recording_timestamp']       = $this->ISOtime2UNIXtime($ThisDirectoryRecord['raw']['recording_date_time']);
-
-			if ($ThisDirectoryRecord['file_flags']['directory']) {
-				$ThisDirectoryRecord['filename'] = $directorydata['full_path'];
-			} else {
-				$ThisDirectoryRecord['filename'] = $directorydata['full_path'].$this->ISOstripFilenameVersion($ThisDirectoryRecord['file_identifier_ascii']);
-				$info['iso']['files'] = getid3_lib::array_merge_clobber($info['iso']['files'], getid3_lib::CreateDeepArray($ThisDirectoryRecord['filename'], '/', $ThisDirectoryRecord['filesize']));
-			}
-
-			$DirectoryRecord[] = $ThisDirectoryRecord;
-			$DirectoryRecordData = fread($this->getid3->fp, 1);
-		}
-
-		return $DirectoryRecord;
-	}
-
-	function ISOstripFilenameVersion($ISOfilename) {
-		// convert 'filename.ext;1' to 'filename.ext'
-		if (!strstr($ISOfilename, ';')) {
-			return $ISOfilename;
-		} else {
-			return substr($ISOfilename, 0, strpos($ISOfilename, ';'));
-		}
-	}
-
-	function ISOtimeText2UNIXtime($ISOtime) {
-
-		$UNIXyear   = (int) substr($ISOtime,  0, 4);
-		$UNIXmonth  = (int) substr($ISOtime,  4, 2);
-		$UNIXday    = (int) substr($ISOtime,  6, 2);
-		$UNIXhour   = (int) substr($ISOtime,  8, 2);
-		$UNIXminute = (int) substr($ISOtime, 10, 2);
-		$UNIXsecond = (int) substr($ISOtime, 12, 2);
-
-		if (!$UNIXyear) {
-			return false;
-		}
-		return gmmktime($UNIXhour, $UNIXminute, $UNIXsecond, $UNIXmonth, $UNIXday, $UNIXyear);
-	}
-
-	function ISOtime2UNIXtime($ISOtime) {
-		// Represented by seven bytes:
-		// 1: Number of years since 1900
-		// 2: Month of the year from 1 to 12
-		// 3: Day of the Month from 1 to 31
-		// 4: Hour of the day from 0 to 23
-		// 5: Minute of the hour from 0 to 59
-		// 6: second of the minute from 0 to 59
-		// 7: Offset from Greenwich Mean Time in number of 15 minute intervals from -48 (West) to +52 (East)
-
-		$UNIXyear   = ord($ISOtime{0}) + 1900;
-		$UNIXmonth  = ord($ISOtime{1});
-		$UNIXday    = ord($ISOtime{2});
-		$UNIXhour   = ord($ISOtime{3});
-		$UNIXminute = ord($ISOtime{4});
-		$UNIXsecond = ord($ISOtime{5});
-		$GMToffset  = $this->TwosCompliment2Decimal(ord($ISOtime{5}));
-
-		return gmmktime($UNIXhour, $UNIXminute, $UNIXsecond, $UNIXmonth, $UNIXday, $UNIXyear);
-	}
-
-	function TwosCompliment2Decimal($BinaryValue) {
-		// http://sandbox.mc.edu/~bennet/cs110/tc/tctod.html
-		// First check if the number is negative or positive by looking at the sign bit.
-		// If it is positive, simply convert it to decimal.
-		// If it is negative, make it positive by inverting the bits and adding one.
-		// Then, convert the result to decimal.
-		// The negative of this number is the value of the original binary.
-
-		if ($BinaryValue & 0x80) {
-
-			// negative number
-			return (0 - ((~$BinaryValue & 0xFF) + 1));
-		} else {
-			// positive number
-			return $BinaryValue;
-		}
-	}
-
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.misc.msoffice.php b/lib/getid3/getid3/module.misc.msoffice.php
deleted file mode 100644
index 8fea10853..000000000
--- a/lib/getid3/getid3/module.misc.msoffice.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.archive.doc.php                                      //
-// module for analyzing MS Office (.doc, .xls, etc) files      //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_msoffice extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$DOCFILEheader = fread($this->getid3->fp, 8);
-		$magic = "\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1";
-		if (substr($DOCFILEheader, 0, 8) != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at '.$info['avdataoffset'].', found '.getid3_lib::PrintHexBytes(substr($DOCFILEheader, 0, 8)).' instead.';
-			return false;
-		}
-		$info['fileformat'] = 'msoffice';
-
-$info['error'][] = 'MS Office (.doc, .xls, etc) parsing not enabled in this version of getID3() ['.$this->getid3->version().']';
-return false;
-
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.misc.par2.php b/lib/getid3/getid3/module.misc.par2.php
deleted file mode 100644
index d8b0a388b..000000000
--- a/lib/getid3/getid3/module.misc.par2.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.misc.par2.php                                        //
-// module for analyzing PAR2 files                             //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_par2 extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat'] = 'par2';
-
-		$info['error'][] = 'PAR2 parsing not enabled in this version of getID3()';
-		return false;
-
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.misc.pdf.php b/lib/getid3/getid3/module.misc.pdf.php
deleted file mode 100644
index 38ed646a9..000000000
--- a/lib/getid3/getid3/module.misc.pdf.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.misc.pdf.php                                         //
-// module for analyzing PDF files                              //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_pdf extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat'] = 'pdf';
-
-		$info['error'][] = 'PDF parsing not enabled in this version of getID3() ['.$this->getid3->version().']';
-		return false;
-
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.tag.apetag.php b/lib/getid3/getid3/module.tag.apetag.php
deleted file mode 100644
index 6522475f5..000000000
--- a/lib/getid3/getid3/module.tag.apetag.php
+++ /dev/null
@@ -1,372 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.tag.apetag.php                                       //
-// module for analyzing APE tags                               //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-class getid3_apetag extends getid3_handler
-{
-	var $inline_attachments = true; // true: return full data for all attachments; false: return no data for all attachments; integer: return data for attachments <= than this; string: save as file to this directory
-	var $overrideendoffset  = 0;
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		if (!getid3_lib::intValueSupported($info['filesize'])) {
-			$info['warning'][] = 'Unable to check for APEtags because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
-			return false;
-		}
-
-		$id3v1tagsize     = 128;
-		$apetagheadersize = 32;
-		$lyrics3tagsize   = 10;
-
-		if ($this->overrideendoffset == 0) {
-
-			fseek($this->getid3->fp, 0 - $id3v1tagsize - $apetagheadersize - $lyrics3tagsize, SEEK_END);
-			$APEfooterID3v1 = fread($this->getid3->fp, $id3v1tagsize + $apetagheadersize + $lyrics3tagsize);
-
-			//if (preg_match('/APETAGEX.{24}TAG.{125}$/i', $APEfooterID3v1)) {
-			if (substr($APEfooterID3v1, strlen($APEfooterID3v1) - $id3v1tagsize - $apetagheadersize, 8) == 'APETAGEX') {
-
-				// APE tag found before ID3v1
-				$info['ape']['tag_offset_end'] = $info['filesize'] - $id3v1tagsize;
-
-			//} elseif (preg_match('/APETAGEX.{24}$/i', $APEfooterID3v1)) {
-			} elseif (substr($APEfooterID3v1, strlen($APEfooterID3v1) - $apetagheadersize, 8) == 'APETAGEX') {
-
-				// APE tag found, no ID3v1
-				$info['ape']['tag_offset_end'] = $info['filesize'];
-
-			}
-
-		} else {
-
-			fseek($this->getid3->fp, $this->overrideendoffset - $apetagheadersize, SEEK_SET);
-			if (fread($this->getid3->fp, 8) == 'APETAGEX') {
-				$info['ape']['tag_offset_end'] = $this->overrideendoffset;
-			}
-
-		}
-		if (!isset($info['ape']['tag_offset_end'])) {
-
-			// APE tag not found
-			unset($info['ape']);
-			return false;
-
-		}
-
-		// shortcut
-		$thisfile_ape = &$info['ape'];
-
-		fseek($this->getid3->fp, $thisfile_ape['tag_offset_end'] - $apetagheadersize, SEEK_SET);
-		$APEfooterData = fread($this->getid3->fp, 32);
-		if (!($thisfile_ape['footer'] = $this->parseAPEheaderFooter($APEfooterData))) {
-			$info['error'][] = 'Error parsing APE footer at offset '.$thisfile_ape['tag_offset_end'];
-			return false;
-		}
-
-		if (isset($thisfile_ape['footer']['flags']['header']) && $thisfile_ape['footer']['flags']['header']) {
-			fseek($this->getid3->fp, $thisfile_ape['tag_offset_end'] - $thisfile_ape['footer']['raw']['tagsize'] - $apetagheadersize, SEEK_SET);
-			$thisfile_ape['tag_offset_start'] = ftell($this->getid3->fp);
-			$APEtagData = fread($this->getid3->fp, $thisfile_ape['footer']['raw']['tagsize'] + $apetagheadersize);
-		} else {
-			$thisfile_ape['tag_offset_start'] = $thisfile_ape['tag_offset_end'] - $thisfile_ape['footer']['raw']['tagsize'];
-			fseek($this->getid3->fp, $thisfile_ape['tag_offset_start'], SEEK_SET);
-			$APEtagData = fread($this->getid3->fp, $thisfile_ape['footer']['raw']['tagsize']);
-		}
-		$info['avdataend'] = $thisfile_ape['tag_offset_start'];
-
-		if (isset($info['id3v1']['tag_offset_start']) && ($info['id3v1']['tag_offset_start'] < $thisfile_ape['tag_offset_end'])) {
-			$info['warning'][] = 'ID3v1 tag information ignored since it appears to be a false synch in APEtag data';
-			unset($info['id3v1']);
-			foreach ($info['warning'] as $key => $value) {
-				if ($value == 'Some ID3v1 fields do not use NULL characters for padding') {
-					unset($info['warning'][$key]);
-					sort($info['warning']);
-					break;
-				}
-			}
-		}
-
-		$offset = 0;
-		if (isset($thisfile_ape['footer']['flags']['header']) && $thisfile_ape['footer']['flags']['header']) {
-			if ($thisfile_ape['header'] = $this->parseAPEheaderFooter(substr($APEtagData, 0, $apetagheadersize))) {
-				$offset += $apetagheadersize;
-			} else {
-				$info['error'][] = 'Error parsing APE header at offset '.$thisfile_ape['tag_offset_start'];
-				return false;
-			}
-		}
-
-		// shortcut
-		$info['replay_gain'] = array();
-		$thisfile_replaygain = &$info['replay_gain'];
-
-		for ($i = 0; $i < $thisfile_ape['footer']['raw']['tag_items']; $i++) {
-			$value_size = getid3_lib::LittleEndian2Int(substr($APEtagData, $offset, 4));
-			$offset += 4;
-			$item_flags = getid3_lib::LittleEndian2Int(substr($APEtagData, $offset, 4));
-			$offset += 4;
-			if (strstr(substr($APEtagData, $offset), "\x00") === false) {
-				$info['error'][] = 'Cannot find null-byte (0x00) seperator between ItemKey #'.$i.' and value. ItemKey starts '.$offset.' bytes into the APE tag, at file offset '.($thisfile_ape['tag_offset_start'] + $offset);
-				return false;
-			}
-			$ItemKeyLength = strpos($APEtagData, "\x00", $offset) - $offset;
-			$item_key      = strtolower(substr($APEtagData, $offset, $ItemKeyLength));
-
-			// shortcut
-			$thisfile_ape['items'][$item_key] = array();
-			$thisfile_ape_items_current = &$thisfile_ape['items'][$item_key];
-
-			$thisfile_ape_items_current['offset'] = $thisfile_ape['tag_offset_start'] + $offset;
-
-			$offset += ($ItemKeyLength + 1); // skip 0x00 terminator
-			$thisfile_ape_items_current['data'] = substr($APEtagData, $offset, $value_size);
-			$offset += $value_size;
-
-			$thisfile_ape_items_current['flags'] = $this->parseAPEtagFlags($item_flags);
-			switch ($thisfile_ape_items_current['flags']['item_contents_raw']) {
-				case 0: // UTF-8
-				case 3: // Locator (URL, filename, etc), UTF-8 encoded
-					$thisfile_ape_items_current['data'] = explode("\x00", trim($thisfile_ape_items_current['data']));
-					break;
-
-				default: // binary data
-					break;
-			}
-
-			switch (strtolower($item_key)) {
-				case 'replaygain_track_gain':
-					$thisfile_replaygain['track']['adjustment'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
-					$thisfile_replaygain['track']['originator'] = 'unspecified';
-					break;
-
-				case 'replaygain_track_peak':
-					$thisfile_replaygain['track']['peak']       = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
-					$thisfile_replaygain['track']['originator'] = 'unspecified';
-					if ($thisfile_replaygain['track']['peak'] <= 0) {
-						$info['warning'][] = 'ReplayGain Track peak from APEtag appears invalid: '.$thisfile_replaygain['track']['peak'].' (original value = "'.$thisfile_ape_items_current['data'][0].'")';
-					}
-					break;
-
-				case 'replaygain_album_gain':
-					$thisfile_replaygain['album']['adjustment'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
-					$thisfile_replaygain['album']['originator'] = 'unspecified';
-					break;
-
-				case 'replaygain_album_peak':
-					$thisfile_replaygain['album']['peak']       = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
-					$thisfile_replaygain['album']['originator'] = 'unspecified';
-					if ($thisfile_replaygain['album']['peak'] <= 0) {
-						$info['warning'][] = 'ReplayGain Album peak from APEtag appears invalid: '.$thisfile_replaygain['album']['peak'].' (original value = "'.$thisfile_ape_items_current['data'][0].'")';
-					}
-					break;
-
-				case 'mp3gain_undo':
-					list($mp3gain_undo_left, $mp3gain_undo_right, $mp3gain_undo_wrap) = explode(',', $thisfile_ape_items_current['data'][0]);
-					$thisfile_replaygain['mp3gain']['undo_left']  = intval($mp3gain_undo_left);
-					$thisfile_replaygain['mp3gain']['undo_right'] = intval($mp3gain_undo_right);
-					$thisfile_replaygain['mp3gain']['undo_wrap']  = (($mp3gain_undo_wrap == 'Y') ? true : false);
-					break;
-
-				case 'mp3gain_minmax':
-					list($mp3gain_globalgain_min, $mp3gain_globalgain_max) = explode(',', $thisfile_ape_items_current['data'][0]);
-					$thisfile_replaygain['mp3gain']['globalgain_track_min'] = intval($mp3gain_globalgain_min);
-					$thisfile_replaygain['mp3gain']['globalgain_track_max'] = intval($mp3gain_globalgain_max);
-					break;
-
-				case 'mp3gain_album_minmax':
-					list($mp3gain_globalgain_album_min, $mp3gain_globalgain_album_max) = explode(',', $thisfile_ape_items_current['data'][0]);
-					$thisfile_replaygain['mp3gain']['globalgain_album_min'] = intval($mp3gain_globalgain_album_min);
-					$thisfile_replaygain['mp3gain']['globalgain_album_max'] = intval($mp3gain_globalgain_album_max);
-					break;
-
-				case 'tracknumber':
-					if (is_array($thisfile_ape_items_current['data'])) {
-						foreach ($thisfile_ape_items_current['data'] as $comment) {
-							$thisfile_ape['comments']['track'][] = $comment;
-						}
-					}
-					break;
-
-				case 'cover art (artist)':
-				case 'cover art (back)':
-				case 'cover art (band logo)':
-				case 'cover art (band)':
-				case 'cover art (colored fish)':
-				case 'cover art (composer)':
-				case 'cover art (conductor)':
-				case 'cover art (front)':
-				case 'cover art (icon)':
-				case 'cover art (illustration)':
-				case 'cover art (lead)':
-				case 'cover art (leaflet)':
-				case 'cover art (lyricist)':
-				case 'cover art (media)':
-				case 'cover art (movie scene)':
-				case 'cover art (other icon)':
-				case 'cover art (other)':
-				case 'cover art (performance)':
-				case 'cover art (publisher logo)':
-				case 'cover art (recording)':
-				case 'cover art (studio)':
-					// list of possible cover arts from http://taglib-sharp.sourcearchive.com/documentation/2.0.3.0-2/Ape_2Tag_8cs-source.html
-					list($thisfile_ape_items_current['filename'], $thisfile_ape_items_current['data']) = explode("\x00", $thisfile_ape_items_current['data'], 2);
-					$thisfile_ape_items_current['data_offset'] = $thisfile_ape_items_current['offset'] + strlen($thisfile_ape_items_current['filename']."\x00");
-					$thisfile_ape_items_current['data_length'] = strlen($thisfile_ape_items_current['data']);
-
-					$thisfile_ape_items_current['image_mime'] = '';
-					$imageinfo = array();
-					$imagechunkcheck = getid3_lib::GetDataImageSize($thisfile_ape_items_current['data'], $imageinfo);
-					$thisfile_ape_items_current['image_mime'] = image_type_to_mime_type($imagechunkcheck[2]);
-
-					do {
-						if ($this->inline_attachments === false) {
-							// skip entirely
-							unset($thisfile_ape_items_current['data']);
-							break;
-						}
-						if ($this->inline_attachments === true) {
-							// great
-						} elseif (is_int($this->inline_attachments)) {
-							if ($this->inline_attachments < $thisfile_ape_items_current['data_length']) {
-								// too big, skip
-								$info['warning'][] = 'attachment at '.$thisfile_ape_items_current['offset'].' is too large to process inline ('.number_format($thisfile_ape_items_current['data_length']).' bytes)';
-								unset($thisfile_ape_items_current['data']);
-								break;
-							}
-						} elseif (is_string($this->inline_attachments)) {
-							$this->inline_attachments = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->inline_attachments), DIRECTORY_SEPARATOR);
-							if (!is_dir($this->inline_attachments) || !is_writable($this->inline_attachments)) {
-								// cannot write, skip
-								$info['warning'][] = 'attachment at '.$thisfile_ape_items_current['offset'].' cannot be saved to "'.$this->inline_attachments.'" (not writable)';
-								unset($thisfile_ape_items_current['data']);
-								break;
-							}
-						}
-						// if we get this far, must be OK
-						if (is_string($this->inline_attachments)) {
-							$destination_filename = $this->inline_attachments.DIRECTORY_SEPARATOR.md5($info['filenamepath']).'_'.$thisfile_ape_items_current['data_offset'];
-							if (!file_exists($destination_filename) || is_writable($destination_filename)) {
-								file_put_contents($destination_filename, $thisfile_ape_items_current['data']);
-							} else {
-								$info['warning'][] = 'attachment at '.$thisfile_ape_items_current['offset'].' cannot be saved to "'.$destination_filename.'" (not writable)';
-							}
-							$thisfile_ape_items_current['data_filename'] = $destination_filename;
-							unset($thisfile_ape_items_current['data']);
-						} else {
-							if (!isset($info['ape']['comments']['picture'])) {
-								$info['ape']['comments']['picture'] = array();
-							}
-							$info['ape']['comments']['picture'][] = array('data'=>$thisfile_ape_items_current['data'], 'image_mime'=>$thisfile_ape_items_current['image_mime']);
-						}
-					} while (false);
-					break;
-
-				default:
-					if (is_array($thisfile_ape_items_current['data'])) {
-						foreach ($thisfile_ape_items_current['data'] as $comment) {
-							$thisfile_ape['comments'][strtolower($item_key)][] = $comment;
-						}
-					}
-					break;
-			}
-
-		}
-		if (empty($thisfile_replaygain)) {
-			unset($info['replay_gain']);
-		}
-		return true;
-	}
-
-	function parseAPEheaderFooter($APEheaderFooterData) {
-		// http://www.uni-jena.de/~pfk/mpp/sv8/apeheader.html
-
-		// shortcut
-		$headerfooterinfo['raw'] = array();
-		$headerfooterinfo_raw = &$headerfooterinfo['raw'];
-
-		$headerfooterinfo_raw['footer_tag']   =                  substr($APEheaderFooterData,  0, 8);
-		if ($headerfooterinfo_raw['footer_tag'] != 'APETAGEX') {
-			return false;
-		}
-		$headerfooterinfo_raw['version']      = getid3_lib::LittleEndian2Int(substr($APEheaderFooterData,  8, 4));
-		$headerfooterinfo_raw['tagsize']      = getid3_lib::LittleEndian2Int(substr($APEheaderFooterData, 12, 4));
-		$headerfooterinfo_raw['tag_items']    = getid3_lib::LittleEndian2Int(substr($APEheaderFooterData, 16, 4));
-		$headerfooterinfo_raw['global_flags'] = getid3_lib::LittleEndian2Int(substr($APEheaderFooterData, 20, 4));
-		$headerfooterinfo_raw['reserved']     =                              substr($APEheaderFooterData, 24, 8);
-
-		$headerfooterinfo['tag_version']         = $headerfooterinfo_raw['version'] / 1000;
-		if ($headerfooterinfo['tag_version'] >= 2) {
-			$headerfooterinfo['flags'] = $this->parseAPEtagFlags($headerfooterinfo_raw['global_flags']);
-		}
-		return $headerfooterinfo;
-	}
-
-	function parseAPEtagFlags($rawflagint) {
-		// "Note: APE Tags 1.0 do not use any of the APE Tag flags.
-		// All are set to zero on creation and ignored on reading."
-		// http://www.uni-jena.de/~pfk/mpp/sv8/apetagflags.html
-		$flags['header']            = (bool) ($rawflagint & 0x80000000);
-		$flags['footer']            = (bool) ($rawflagint & 0x40000000);
-		$flags['this_is_header']    = (bool) ($rawflagint & 0x20000000);
-		$flags['item_contents_raw'] =        ($rawflagint & 0x00000006) >> 1;
-		$flags['read_only']         = (bool) ($rawflagint & 0x00000001);
-
-		$flags['item_contents']     = $this->APEcontentTypeFlagLookup($flags['item_contents_raw']);
-
-		return $flags;
-	}
-
-	function APEcontentTypeFlagLookup($contenttypeid) {
-		static $APEcontentTypeFlagLookup = array(
-			0 => 'utf-8',
-			1 => 'binary',
-			2 => 'external',
-			3 => 'reserved'
-		);
-		return (isset($APEcontentTypeFlagLookup[$contenttypeid]) ? $APEcontentTypeFlagLookup[$contenttypeid] : 'invalid');
-	}
-
-	function APEtagItemIsUTF8Lookup($itemkey) {
-		static $APEtagItemIsUTF8Lookup = array(
-			'title',
-			'subtitle',
-			'artist',
-			'album',
-			'debut album',
-			'publisher',
-			'conductor',
-			'track',
-			'composer',
-			'comment',
-			'copyright',
-			'publicationright',
-			'file',
-			'year',
-			'record date',
-			'record location',
-			'genre',
-			'media',
-			'related',
-			'isrc',
-			'abstract',
-			'language',
-			'bibliography'
-		);
-		return in_array(strtolower($itemkey), $APEtagItemIsUTF8Lookup);
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.tag.id3v1.php b/lib/getid3/getid3/module.tag.id3v1.php
deleted file mode 100644
index a9932d13f..000000000
--- a/lib/getid3/getid3/module.tag.id3v1.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.tag.id3v1.php                                        //
-// module for analyzing ID3v1 tags                             //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_id3v1 extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		if (!getid3_lib::intValueSupported($info['filesize'])) {
-			$info['warning'][] = 'Unable to check for ID3v1 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
-			return false;
-		}
-
-		fseek($this->getid3->fp, -256, SEEK_END);
-		$preid3v1 = fread($this->getid3->fp, 128);
-		$id3v1tag = fread($this->getid3->fp, 128);
-
-		if (substr($id3v1tag, 0, 3) == 'TAG') {
-
-			$info['avdataend'] = $info['filesize'] - 128;
-
-			$ParsedID3v1['title']   = $this->cutfield(substr($id3v1tag,   3, 30));
-			$ParsedID3v1['artist']  = $this->cutfield(substr($id3v1tag,  33, 30));
-			$ParsedID3v1['album']   = $this->cutfield(substr($id3v1tag,  63, 30));
-			$ParsedID3v1['year']    = $this->cutfield(substr($id3v1tag,  93,  4));
-			$ParsedID3v1['comment'] =                 substr($id3v1tag,  97, 30);  // can't remove nulls yet, track detection depends on them
-			$ParsedID3v1['genreid'] =             ord(substr($id3v1tag, 127,  1));
-
-			// If second-last byte of comment field is null and last byte of comment field is non-null
-			// then this is ID3v1.1 and the comment field is 28 bytes long and the 30th byte is the track number
-			if (($id3v1tag{125} === "\x00") && ($id3v1tag{126} !== "\x00")) {
-				$ParsedID3v1['track']   = ord(substr($ParsedID3v1['comment'], 29,  1));
-				$ParsedID3v1['comment'] =     substr($ParsedID3v1['comment'],  0, 28);
-			}
-			$ParsedID3v1['comment'] = $this->cutfield($ParsedID3v1['comment']);
-
-			$ParsedID3v1['genre'] = $this->LookupGenreName($ParsedID3v1['genreid']);
-			if (!empty($ParsedID3v1['genre'])) {
-				unset($ParsedID3v1['genreid']);
-			}
-			if (isset($ParsedID3v1['genre']) && (empty($ParsedID3v1['genre']) || ($ParsedID3v1['genre'] == 'Unknown'))) {
-				unset($ParsedID3v1['genre']);
-			}
-
-			foreach ($ParsedID3v1 as $key => $value) {
-				$ParsedID3v1['comments'][$key][0] = $value;
-			}
-
-			// ID3v1 data is supposed to be padded with NULL characters, but some taggers pad with spaces
-			$GoodFormatID3v1tag = $this->GenerateID3v1Tag(
-											$ParsedID3v1['title'],
-											$ParsedID3v1['artist'],
-											$ParsedID3v1['album'],
-											$ParsedID3v1['year'],
-											(isset($ParsedID3v1['genre']) ? $this->LookupGenreID($ParsedID3v1['genre']) : false),
-											$ParsedID3v1['comment'],
-											(!empty($ParsedID3v1['track']) ? $ParsedID3v1['track'] : ''));
-			$ParsedID3v1['padding_valid'] = true;
-			if ($id3v1tag !== $GoodFormatID3v1tag) {
-				$ParsedID3v1['padding_valid'] = false;
-				$info['warning'][] = 'Some ID3v1 fields do not use NULL characters for padding';
-			}
-
-			$ParsedID3v1['tag_offset_end']   = $info['filesize'];
-			$ParsedID3v1['tag_offset_start'] = $ParsedID3v1['tag_offset_end'] - 128;
-
-			$info['id3v1'] = $ParsedID3v1;
-		}
-
-		if (substr($preid3v1, 0, 3) == 'TAG') {
-			// The way iTunes handles tags is, well, brain-damaged.
-			// It completely ignores v1 if ID3v2 is present.
-			// This goes as far as adding a new v1 tag *even if there already is one*
-
-			// A suspected double-ID3v1 tag has been detected, but it could be that
-			// the "TAG" identifier is a legitimate part of an APE or Lyrics3 tag
-			if (substr($preid3v1, 96, 8) == 'APETAGEX') {
-				// an APE tag footer was found before the last ID3v1, assume false "TAG" synch
-			} elseif (substr($preid3v1, 119, 6) == 'LYRICS') {
-				// a Lyrics3 tag footer was found before the last ID3v1, assume false "TAG" synch
-			} else {
-				// APE and Lyrics3 footers not found - assume double ID3v1
-				$info['warning'][] = 'Duplicate ID3v1 tag detected - this has been known to happen with iTunes';
-				$info['avdataend'] -= 128;
-			}
-		}
-
-		return true;
-	}
-
-	static function cutfield($str) {
-		return trim(substr($str, 0, strcspn($str, "\x00")));
-	}
-
-	static function ArrayOfGenres($allowSCMPXextended=false) {
-		static $GenreLookup = array(
-			0    => 'Blues',
-			1    => 'Classic Rock',
-			2    => 'Country',
-			3    => 'Dance',
-			4    => 'Disco',
-			5    => 'Funk',
-			6    => 'Grunge',
-			7    => 'Hip-Hop',
-			8    => 'Jazz',
-			9    => 'Metal',
-			10   => 'New Age',
-			11   => 'Oldies',
-			12   => 'Other',
-			13   => 'Pop',
-			14   => 'R&B',
-			15   => 'Rap',
-			16   => 'Reggae',
-			17   => 'Rock',
-			18   => 'Techno',
-			19   => 'Industrial',
-			20   => 'Alternative',
-			21   => 'Ska',
-			22   => 'Death Metal',
-			23   => 'Pranks',
-			24   => 'Soundtrack',
-			25   => 'Euro-Techno',
-			26   => 'Ambient',
-			27   => 'Trip-Hop',
-			28   => 'Vocal',
-			29   => 'Jazz+Funk',
-			30   => 'Fusion',
-			31   => 'Trance',
-			32   => 'Classical',
-			33   => 'Instrumental',
-			34   => 'Acid',
-			35   => 'House',
-			36   => 'Game',
-			37   => 'Sound Clip',
-			38   => 'Gospel',
-			39   => 'Noise',
-			40   => 'Alt. Rock',
-			41   => 'Bass',
-			42   => 'Soul',
-			43   => 'Punk',
-			44   => 'Space',
-			45   => 'Meditative',
-			46   => 'Instrumental Pop',
-			47   => 'Instrumental Rock',
-			48   => 'Ethnic',
-			49   => 'Gothic',
-			50   => 'Darkwave',
-			51   => 'Techno-Industrial',
-			52   => 'Electronic',
-			53   => 'Pop-Folk',
-			54   => 'Eurodance',
-			55   => 'Dream',
-			56   => 'Southern Rock',
-			57   => 'Comedy',
-			58   => 'Cult',
-			59   => 'Gangsta Rap',
-			60   => 'Top 40',
-			61   => 'Christian Rap',
-			62   => 'Pop/Funk',
-			63   => 'Jungle',
-			64   => 'Native American',
-			65   => 'Cabaret',
-			66   => 'New Wave',
-			67   => 'Psychedelic',
-			68   => 'Rave',
-			69   => 'Showtunes',
-			70   => 'Trailer',
-			71   => 'Lo-Fi',
-			72   => 'Tribal',
-			73   => 'Acid Punk',
-			74   => 'Acid Jazz',
-			75   => 'Polka',
-			76   => 'Retro',
-			77   => 'Musical',
-			78   => 'Rock & Roll',
-			79   => 'Hard Rock',
-			80   => 'Folk',
-			81   => 'Folk/Rock',
-			82   => 'National Folk',
-			83   => 'Swing',
-			84   => 'Fast-Fusion',
-			85   => 'Bebob',
-			86   => 'Latin',
-			87   => 'Revival',
-			88   => 'Celtic',
-			89   => 'Bluegrass',
-			90   => 'Avantgarde',
-			91   => 'Gothic Rock',
-			92   => 'Progressive Rock',
-			93   => 'Psychedelic Rock',
-			94   => 'Symphonic Rock',
-			95   => 'Slow Rock',
-			96   => 'Big Band',
-			97   => 'Chorus',
-			98   => 'Easy Listening',
-			99   => 'Acoustic',
-			100  => 'Humour',
-			101  => 'Speech',
-			102  => 'Chanson',
-			103  => 'Opera',
-			104  => 'Chamber Music',
-			105  => 'Sonata',
-			106  => 'Symphony',
-			107  => 'Booty Bass',
-			108  => 'Primus',
-			109  => 'Porn Groove',
-			110  => 'Satire',
-			111  => 'Slow Jam',
-			112  => 'Club',
-			113  => 'Tango',
-			114  => 'Samba',
-			115  => 'Folklore',
-			116  => 'Ballad',
-			117  => 'Power Ballad',
-			118  => 'Rhythmic Soul',
-			119  => 'Freestyle',
-			120  => 'Duet',
-			121  => 'Punk Rock',
-			122  => 'Drum Solo',
-			123  => 'A Cappella',
-			124  => 'Euro-House',
-			125  => 'Dance Hall',
-			126  => 'Goa',
-			127  => 'Drum & Bass',
-			128  => 'Club-House',
-			129  => 'Hardcore',
-			130  => 'Terror',
-			131  => 'Indie',
-			132  => 'BritPop',
-			133  => 'Negerpunk',
-			134  => 'Polsk Punk',
-			135  => 'Beat',
-			136  => 'Christian Gangsta Rap',
-			137  => 'Heavy Metal',
-			138  => 'Black Metal',
-			139  => 'Crossover',
-			140  => 'Contemporary Christian',
-			141  => 'Christian Rock',
-			142  => 'Merengue',
-			143  => 'Salsa',
-			144  => 'Thrash Metal',
-			145  => 'Anime',
-			146  => 'JPop',
-			147  => 'Synthpop',
-
-			255  => 'Unknown',
-
-			'CR' => 'Cover',
-			'RX' => 'Remix'
-		);
-
-		static $GenreLookupSCMPX = array();
-		if ($allowSCMPXextended && empty($GenreLookupSCMPX)) {
-			$GenreLookupSCMPX = $GenreLookup;
-			// http://www.geocities.co.jp/SiliconValley-Oakland/3664/alittle.html#GenreExtended
-			// Extended ID3v1 genres invented by SCMPX
-			// Note that 255 "Japanese Anime" conflicts with standard "Unknown"
-			$GenreLookupSCMPX[240] = 'Sacred';
-			$GenreLookupSCMPX[241] = 'Northern Europe';
-			$GenreLookupSCMPX[242] = 'Irish & Scottish';
-			$GenreLookupSCMPX[243] = 'Scotland';
-			$GenreLookupSCMPX[244] = 'Ethnic Europe';
-			$GenreLookupSCMPX[245] = 'Enka';
-			$GenreLookupSCMPX[246] = 'Children\'s Song';
-			$GenreLookupSCMPX[247] = 'Japanese Sky';
-			$GenreLookupSCMPX[248] = 'Japanese Heavy Rock';
-			$GenreLookupSCMPX[249] = 'Japanese Doom Rock';
-			$GenreLookupSCMPX[250] = 'Japanese J-POP';
-			$GenreLookupSCMPX[251] = 'Japanese Seiyu';
-			$GenreLookupSCMPX[252] = 'Japanese Ambient Techno';
-			$GenreLookupSCMPX[253] = 'Japanese Moemoe';
-			$GenreLookupSCMPX[254] = 'Japanese Tokusatsu';
-			//$GenreLookupSCMPX[255] = 'Japanese Anime';
-		}
-
-		return ($allowSCMPXextended ? $GenreLookupSCMPX : $GenreLookup);
-	}
-
-	static function LookupGenreName($genreid, $allowSCMPXextended=true) {
-		switch ($genreid) {
-			case 'RX':
-			case 'CR':
-				break;
-			default:
-				if (!is_numeric($genreid)) {
-					return false;
-				}
-				$genreid = intval($genreid); // to handle 3 or '3' or '03'
-				break;
-		}
-		$GenreLookup = getid3_id3v1::ArrayOfGenres($allowSCMPXextended);
-		return (isset($GenreLookup[$genreid]) ? $GenreLookup[$genreid] : false);
-	}
-
-	static function LookupGenreID($genre, $allowSCMPXextended=false) {
-		$GenreLookup = getid3_id3v1::ArrayOfGenres($allowSCMPXextended);
-		$LowerCaseNoSpaceSearchTerm = strtolower(str_replace(' ', '', $genre));
-		foreach ($GenreLookup as $key => $value) {
-			if (strtolower(str_replace(' ', '', $value)) == $LowerCaseNoSpaceSearchTerm) {
-				return $key;
-			}
-		}
-		return false;
-	}
-
-	static function StandardiseID3v1GenreName($OriginalGenre) {
-		if (($GenreID = getid3_id3v1::LookupGenreID($OriginalGenre)) !== false) {
-			return getid3_id3v1::LookupGenreName($GenreID);
-		}
-		return $OriginalGenre;
-	}
-
-	static function GenerateID3v1Tag($title, $artist, $album, $year, $genreid, $comment, $track='') {
-		$ID3v1Tag  = 'TAG';
-		$ID3v1Tag .= str_pad(trim(substr($title,  0, 30)), 30, "\x00", STR_PAD_RIGHT);
-		$ID3v1Tag .= str_pad(trim(substr($artist, 0, 30)), 30, "\x00", STR_PAD_RIGHT);
-		$ID3v1Tag .= str_pad(trim(substr($album,  0, 30)), 30, "\x00", STR_PAD_RIGHT);
-		$ID3v1Tag .= str_pad(trim(substr($year,   0,  4)),  4, "\x00", STR_PAD_LEFT);
-		if (!empty($track) && ($track > 0) && ($track <= 255)) {
-			$ID3v1Tag .= str_pad(trim(substr($comment, 0, 28)), 28, "\x00", STR_PAD_RIGHT);
-			$ID3v1Tag .= "\x00";
-			if (gettype($track) == 'string') {
-				$track = (int) $track;
-			}
-			$ID3v1Tag .= chr($track);
-		} else {
-			$ID3v1Tag .= str_pad(trim(substr($comment, 0, 30)), 30, "\x00", STR_PAD_RIGHT);
-		}
-		if (($genreid < 0) || ($genreid > 147)) {
-			$genreid = 255; // 'unknown' genre
-		}
-		switch (gettype($genreid)) {
-			case 'string':
-			case 'integer':
-				$ID3v1Tag .= chr(intval($genreid));
-				break;
-			default:
-				$ID3v1Tag .= chr(255); // 'unknown' genre
-				break;
-		}
-
-		return $ID3v1Tag;
-	}
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.tag.id3v2.php b/lib/getid3/getid3/module.tag.id3v2.php
deleted file mode 100644
index 56adeb950..000000000
--- a/lib/getid3/getid3/module.tag.id3v2.php
+++ /dev/null
@@ -1,3327 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-///                                                            //
-// module.tag.id3v2.php                                        //
-// module for analyzing ID3v2 tags                             //
-// dependencies: module.tag.id3v1.php                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v1.php', __FILE__, true);
-
-class getid3_id3v2 extends getid3_handler
-{
-	var $inline_attachments = true; // true: return full data for all attachments; false: return no data for all attachments; integer: return data for attachments <= than this; string: save as file to this directory
-	var $StartingOffset = 0;
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		//    Overall tag structure:
-		//        +-----------------------------+
-		//        |      Header (10 bytes)      |
-		//        +-----------------------------+
-		//        |       Extended Header       |
-		//        | (variable length, OPTIONAL) |
-		//        +-----------------------------+
-		//        |   Frames (variable length)  |
-		//        +-----------------------------+
-		//        |           Padding           |
-		//        | (variable length, OPTIONAL) |
-		//        +-----------------------------+
-		//        | Footer (10 bytes, OPTIONAL) |
-		//        +-----------------------------+
-
-		//    Header
-		//        ID3v2/file identifier      "ID3"
-		//        ID3v2 version              $04 00
-		//        ID3v2 flags                (%ab000000 in v2.2, %abc00000 in v2.3, %abcd0000 in v2.4.x)
-		//        ID3v2 size             4 * %0xxxxxxx
-
-
-		// shortcuts
-		$info['id3v2']['header'] = true;
-		$thisfile_id3v2                  = &$info['id3v2'];
-		$thisfile_id3v2['flags']         =  array();
-		$thisfile_id3v2_flags            = &$thisfile_id3v2['flags'];
-
-
-		fseek($this->getid3->fp, $this->StartingOffset, SEEK_SET);
-		$header = fread($this->getid3->fp, 10);
-		if (substr($header, 0, 3) == 'ID3'  &&  strlen($header) == 10) {
-
-			$thisfile_id3v2['majorversion'] = ord($header{3});
-			$thisfile_id3v2['minorversion'] = ord($header{4});
-
-			// shortcut
-			$id3v2_majorversion = &$thisfile_id3v2['majorversion'];
-
-		} else {
-
-			unset($info['id3v2']);
-			return false;
-
-		}
-
-		if ($id3v2_majorversion > 4) { // this script probably won't correctly parse ID3v2.5.x and above (if it ever exists)
-
-			$info['error'][] = 'this script only parses up to ID3v2.4.x - this tag is ID3v2.'.$id3v2_majorversion.'.'.$thisfile_id3v2['minorversion'];
-			return false;
-
-		}
-
-		$id3_flags = ord($header{5});
-		switch ($id3v2_majorversion) {
-			case 2:
-				// %ab000000 in v2.2
-				$thisfile_id3v2_flags['unsynch']     = (bool) ($id3_flags & 0x80); // a - Unsynchronisation
-				$thisfile_id3v2_flags['compression'] = (bool) ($id3_flags & 0x40); // b - Compression
-				break;
-
-			case 3:
-				// %abc00000 in v2.3
-				$thisfile_id3v2_flags['unsynch']     = (bool) ($id3_flags & 0x80); // a - Unsynchronisation
-				$thisfile_id3v2_flags['exthead']     = (bool) ($id3_flags & 0x40); // b - Extended header
-				$thisfile_id3v2_flags['experim']     = (bool) ($id3_flags & 0x20); // c - Experimental indicator
-				break;
-
-			case 4:
-				// %abcd0000 in v2.4
-				$thisfile_id3v2_flags['unsynch']     = (bool) ($id3_flags & 0x80); // a - Unsynchronisation
-				$thisfile_id3v2_flags['exthead']     = (bool) ($id3_flags & 0x40); // b - Extended header
-				$thisfile_id3v2_flags['experim']     = (bool) ($id3_flags & 0x20); // c - Experimental indicator
-				$thisfile_id3v2_flags['isfooter']    = (bool) ($id3_flags & 0x10); // d - Footer present
-				break;
-		}
-
-		$thisfile_id3v2['headerlength'] = getid3_lib::BigEndian2Int(substr($header, 6, 4), 1) + 10; // length of ID3v2 tag in 10-byte header doesn't include 10-byte header length
-
-		$thisfile_id3v2['tag_offset_start'] = $this->StartingOffset;
-		$thisfile_id3v2['tag_offset_end']   = $thisfile_id3v2['tag_offset_start'] + $thisfile_id3v2['headerlength'];
-
-
-
-		// create 'encoding' key - used by getid3::HandleAllTags()
-		// in ID3v2 every field can have it's own encoding type
-		// so force everything to UTF-8 so it can be handled consistantly
-		$thisfile_id3v2['encoding'] = 'UTF-8';
-
-
-	//    Frames
-
-	//        All ID3v2 frames consists of one frame header followed by one or more
-	//        fields containing the actual information. The header is always 10
-	//        bytes and laid out as follows:
-	//
-	//        Frame ID      $xx xx xx xx  (four characters)
-	//        Size      4 * %0xxxxxxx
-	//        Flags         $xx xx
-
-		$sizeofframes = $thisfile_id3v2['headerlength'] - 10; // not including 10-byte initial header
-		if (!empty($thisfile_id3v2['exthead']['length'])) {
-			$sizeofframes -= ($thisfile_id3v2['exthead']['length'] + 4);
-		}
-		if (!empty($thisfile_id3v2_flags['isfooter'])) {
-			$sizeofframes -= 10; // footer takes last 10 bytes of ID3v2 header, after frame data, before audio
-		}
-		if ($sizeofframes > 0) {
-
-			$framedata = fread($this->getid3->fp, $sizeofframes); // read all frames from file into $framedata variable
-
-			//    if entire frame data is unsynched, de-unsynch it now (ID3v2.3.x)
-			if (!empty($thisfile_id3v2_flags['unsynch']) && ($id3v2_majorversion <= 3)) {
-				$framedata = $this->DeUnsynchronise($framedata);
-			}
-			//        [in ID3v2.4.0] Unsynchronisation [S:6.1] is done on frame level, instead
-			//        of on tag level, making it easier to skip frames, increasing the streamability
-			//        of the tag. The unsynchronisation flag in the header [S:3.1] indicates that
-			//        there exists an unsynchronised frame, while the new unsynchronisation flag in
-			//        the frame header [S:4.1.2] indicates unsynchronisation.
-
-
-			//$framedataoffset = 10 + ($thisfile_id3v2['exthead']['length'] ? $thisfile_id3v2['exthead']['length'] + 4 : 0); // how many bytes into the stream - start from after the 10-byte header (and extended header length+4, if present)
-			$framedataoffset = 10; // how many bytes into the stream - start from after the 10-byte header
-
-
-			//    Extended Header
-			if (!empty($thisfile_id3v2_flags['exthead'])) {
-				$extended_header_offset = 0;
-
-				if ($id3v2_majorversion == 3) {
-
-					// v2.3 definition:
-					//Extended header size  $xx xx xx xx   // 32-bit integer
-					//Extended Flags        $xx xx
-					//     %x0000000 %00000000 // v2.3
-					//     x - CRC data present
-					//Size of padding       $xx xx xx xx
-
-					$thisfile_id3v2['exthead']['length'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 4), 0);
-					$extended_header_offset += 4;
-
-					$thisfile_id3v2['exthead']['flag_bytes'] = 2;
-					$thisfile_id3v2['exthead']['flag_raw'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, $thisfile_id3v2['exthead']['flag_bytes']));
-					$extended_header_offset += $thisfile_id3v2['exthead']['flag_bytes'];
-
-					$thisfile_id3v2['exthead']['flags']['crc'] = (bool) ($thisfile_id3v2['exthead']['flag_raw'] & 0x8000);
-
-					$thisfile_id3v2['exthead']['padding_size'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 4));
-					$extended_header_offset += 4;
-
-					if ($thisfile_id3v2['exthead']['flags']['crc']) {
-						$thisfile_id3v2['exthead']['flag_data']['crc'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 4));
-						$extended_header_offset += 4;
-					}
-					$extended_header_offset += $thisfile_id3v2['exthead']['padding_size'];
-
-				} elseif ($id3v2_majorversion == 4) {
-
-					// v2.4 definition:
-					//Extended header size   4 * %0xxxxxxx // 28-bit synchsafe integer
-					//Number of flag bytes       $01
-					//Extended Flags             $xx
-					//     %0bcd0000 // v2.4
-					//     b - Tag is an update
-					//         Flag data length       $00
-					//     c - CRC data present
-					//         Flag data length       $05
-					//         Total frame CRC    5 * %0xxxxxxx
-					//     d - Tag restrictions
-					//         Flag data length       $01
-
-					$thisfile_id3v2['exthead']['length'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 4), true);
-					$extended_header_offset += 4;
-
-					$thisfile_id3v2['exthead']['flag_bytes'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 1)); // should always be 1
-					$extended_header_offset += 1;
-
-					$thisfile_id3v2['exthead']['flag_raw'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, $thisfile_id3v2['exthead']['flag_bytes']));
-					$extended_header_offset += $thisfile_id3v2['exthead']['flag_bytes'];
-
-					$thisfile_id3v2['exthead']['flags']['update']       = (bool) ($thisfile_id3v2['exthead']['flag_raw'] & 0x40);
-					$thisfile_id3v2['exthead']['flags']['crc']          = (bool) ($thisfile_id3v2['exthead']['flag_raw'] & 0x20);
-					$thisfile_id3v2['exthead']['flags']['restrictions'] = (bool) ($thisfile_id3v2['exthead']['flag_raw'] & 0x10);
-
-					if ($thisfile_id3v2['exthead']['flags']['update']) {
-						$ext_header_chunk_length = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 1)); // should be 0
-						$extended_header_offset += 1;
-					}
-
-					if ($thisfile_id3v2['exthead']['flags']['crc']) {
-						$ext_header_chunk_length = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 1)); // should be 5
-						$extended_header_offset += 1;
-						$thisfile_id3v2['exthead']['flag_data']['crc'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, $ext_header_chunk_length), true, false);
-						$extended_header_offset += $ext_header_chunk_length;
-					}
-
-					if ($thisfile_id3v2['exthead']['flags']['restrictions']) {
-						$ext_header_chunk_length = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 1)); // should be 1
-						$extended_header_offset += 1;
-
-						// %ppqrrstt
-						$restrictions_raw = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 1));
-						$extended_header_offset += 1;
-						$thisfile_id3v2['exthead']['flags']['restrictions']['tagsize']  = ($restrictions_raw & 0xC0) >> 6; // p - Tag size restrictions
-						$thisfile_id3v2['exthead']['flags']['restrictions']['textenc']  = ($restrictions_raw & 0x20) >> 5; // q - Text encoding restrictions
-						$thisfile_id3v2['exthead']['flags']['restrictions']['textsize'] = ($restrictions_raw & 0x18) >> 3; // r - Text fields size restrictions
-						$thisfile_id3v2['exthead']['flags']['restrictions']['imgenc']   = ($restrictions_raw & 0x04) >> 2; // s - Image encoding restrictions
-						$thisfile_id3v2['exthead']['flags']['restrictions']['imgsize']  = ($restrictions_raw & 0x03) >> 0; // t - Image size restrictions
-
-						$thisfile_id3v2['exthead']['flags']['restrictions_text']['tagsize']  = $this->LookupExtendedHeaderRestrictionsTagSizeLimits($thisfile_id3v2['exthead']['flags']['restrictions']['tagsize']);
-						$thisfile_id3v2['exthead']['flags']['restrictions_text']['textenc']  = $this->LookupExtendedHeaderRestrictionsTextEncodings($thisfile_id3v2['exthead']['flags']['restrictions']['textenc']);
-						$thisfile_id3v2['exthead']['flags']['restrictions_text']['textsize'] = $this->LookupExtendedHeaderRestrictionsTextFieldSize($thisfile_id3v2['exthead']['flags']['restrictions']['textsize']);
-						$thisfile_id3v2['exthead']['flags']['restrictions_text']['imgenc']   = $this->LookupExtendedHeaderRestrictionsImageEncoding($thisfile_id3v2['exthead']['flags']['restrictions']['imgenc']);
-						$thisfile_id3v2['exthead']['flags']['restrictions_text']['imgsize']  = $this->LookupExtendedHeaderRestrictionsImageSizeSize($thisfile_id3v2['exthead']['flags']['restrictions']['imgsize']);
-					}
-
-					if ($thisfile_id3v2['exthead']['length'] != $extended_header_offset) {
-						$info['warning'][] = 'ID3v2.4 extended header length mismatch (expecting '.intval($thisfile_id3v2['exthead']['length']).', found '.intval($extended_header_offset).')';
-					}
-				}
-
-				$framedataoffset += $extended_header_offset;
-				$framedata = substr($framedata, $extended_header_offset);
-			} // end extended header
-
-
-			while (isset($framedata) && (strlen($framedata) > 0)) { // cycle through until no more frame data is left to parse
-				if (strlen($framedata) <= $this->ID3v2HeaderLength($id3v2_majorversion)) {
-					// insufficient room left in ID3v2 header for actual data - must be padding
-					$thisfile_id3v2['padding']['start']  = $framedataoffset;
-					$thisfile_id3v2['padding']['length'] = strlen($framedata);
-					$thisfile_id3v2['padding']['valid']  = true;
-					for ($i = 0; $i < $thisfile_id3v2['padding']['length']; $i++) {
-						if ($framedata{$i} != "\x00") {
-							$thisfile_id3v2['padding']['valid'] = false;
-							$thisfile_id3v2['padding']['errorpos'] = $thisfile_id3v2['padding']['start'] + $i;
-							$info['warning'][] = 'Invalid ID3v2 padding found at offset '.$thisfile_id3v2['padding']['errorpos'].' (the remaining '.($thisfile_id3v2['padding']['length'] - $i).' bytes are considered invalid)';
-							break;
-						}
-					}
-					break; // skip rest of ID3v2 header
-				}
-				if ($id3v2_majorversion == 2) {
-					// Frame ID  $xx xx xx (three characters)
-					// Size      $xx xx xx (24-bit integer)
-					// Flags     $xx xx
-
-					$frame_header = substr($framedata, 0, 6); // take next 6 bytes for header
-					$framedata    = substr($framedata, 6);    // and leave the rest in $framedata
-					$frame_name   = substr($frame_header, 0, 3);
-					$frame_size   = getid3_lib::BigEndian2Int(substr($frame_header, 3, 3), 0);
-					$frame_flags  = 0; // not used for anything in ID3v2.2, just set to avoid E_NOTICEs
-
-				} elseif ($id3v2_majorversion > 2) {
-
-					// Frame ID  $xx xx xx xx (four characters)
-					// Size      $xx xx xx xx (32-bit integer in v2.3, 28-bit synchsafe in v2.4+)
-					// Flags     $xx xx
-
-					$frame_header = substr($framedata, 0, 10); // take next 10 bytes for header
-					$framedata    = substr($framedata, 10);    // and leave the rest in $framedata
-
-					$frame_name = substr($frame_header, 0, 4);
-					if ($id3v2_majorversion == 3) {
-						$frame_size = getid3_lib::BigEndian2Int(substr($frame_header, 4, 4), 0); // 32-bit integer
-					} else { // ID3v2.4+
-						$frame_size = getid3_lib::BigEndian2Int(substr($frame_header, 4, 4), 1); // 32-bit synchsafe integer (28-bit value)
-					}
-
-					if ($frame_size < (strlen($framedata) + 4)) {
-						$nextFrameID = substr($framedata, $frame_size, 4);
-						if ($this->IsValidID3v2FrameName($nextFrameID, $id3v2_majorversion)) {
-							// next frame is OK
-						} elseif (($frame_name == "\x00".'MP3') || ($frame_name == "\x00\x00".'MP') || ($frame_name == ' MP3') || ($frame_name == 'MP3e')) {
-							// MP3ext known broken frames - "ok" for the purposes of this test
-						} elseif (($id3v2_majorversion == 4) && ($this->IsValidID3v2FrameName(substr($framedata, getid3_lib::BigEndian2Int(substr($frame_header, 4, 4), 0), 4), 3))) {
-							$info['warning'][] = 'ID3v2 tag written as ID3v2.4, but with non-synchsafe integers (ID3v2.3 style). Older versions of (Helium2; iTunes) are known culprits of this. Tag has been parsed as ID3v2.3';
-							$id3v2_majorversion = 3;
-							$frame_size = getid3_lib::BigEndian2Int(substr($frame_header, 4, 4), 0); // 32-bit integer
-						}
-					}
-
-
-					$frame_flags = getid3_lib::BigEndian2Int(substr($frame_header, 8, 2));
-				}
-
-				if ((($id3v2_majorversion == 2) && ($frame_name == "\x00\x00\x00")) || ($frame_name == "\x00\x00\x00\x00")) {
-					// padding encountered
-
-					$thisfile_id3v2['padding']['start']  = $framedataoffset;
-					$thisfile_id3v2['padding']['length'] = strlen($frame_header) + strlen($framedata);
-					$thisfile_id3v2['padding']['valid']  = true;
-
-					$len = strlen($framedata);
-					for ($i = 0; $i < $len; $i++) {
-						if ($framedata{$i} != "\x00") {
-							$thisfile_id3v2['padding']['valid'] = false;
-							$thisfile_id3v2['padding']['errorpos'] = $thisfile_id3v2['padding']['start'] + $i;
-							$info['warning'][] = 'Invalid ID3v2 padding found at offset '.$thisfile_id3v2['padding']['errorpos'].' (the remaining '.($thisfile_id3v2['padding']['length'] - $i).' bytes are considered invalid)';
-							break;
-						}
-					}
-					break; // skip rest of ID3v2 header
-				}
-
-				if ($frame_name == 'COM ') {
-					$info['warning'][] = 'error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag). (ERROR: IsValidID3v2FrameName("'.str_replace("\x00", ' ', $frame_name).'", '.$id3v2_majorversion.'))). [Note: this particular error has been known to happen with tags edited by iTunes (versions "X v2.0.3", "v3.0.1" are known-guilty, probably others too)]';
-					$frame_name = 'COMM';
-				}
-				if (($frame_size <= strlen($framedata)) && ($this->IsValidID3v2FrameName($frame_name, $id3v2_majorversion))) {
-
-					unset($parsedFrame);
-					$parsedFrame['frame_name']      = $frame_name;
-					$parsedFrame['frame_flags_raw'] = $frame_flags;
-					$parsedFrame['data']            = substr($framedata, 0, $frame_size);
-					$parsedFrame['datalength']      = getid3_lib::CastAsInt($frame_size);
-					$parsedFrame['dataoffset']      = $framedataoffset;
-
-					$this->ParseID3v2Frame($parsedFrame);
-					$thisfile_id3v2[$frame_name][] = $parsedFrame;
-
-					$framedata = substr($framedata, $frame_size);
-
-				} else { // invalid frame length or FrameID
-
-					if ($frame_size <= strlen($framedata)) {
-
-						if ($this->IsValidID3v2FrameName(substr($framedata, $frame_size, 4), $id3v2_majorversion)) {
-
-							// next frame is valid, just skip the current frame
-							$framedata = substr($framedata, $frame_size);
-							$info['warning'][] = 'Next ID3v2 frame is valid, skipping current frame.';
-
-						} else {
-
-							// next frame is invalid too, abort processing
-							//unset($framedata);
-							$framedata = null;
-							$info['error'][] = 'Next ID3v2 frame is also invalid, aborting processing.';
-
-						}
-
-					} elseif ($frame_size == strlen($framedata)) {
-
-						// this is the last frame, just skip
-						$info['warning'][] = 'This was the last ID3v2 frame.';
-
-					} else {
-
-						// next frame is invalid too, abort processing
-						//unset($framedata);
-						$framedata = null;
-						$info['warning'][] = 'Invalid ID3v2 frame size, aborting.';
-
-					}
-					if (!$this->IsValidID3v2FrameName($frame_name, $id3v2_majorversion)) {
-
-						switch ($frame_name) {
-							case "\x00\x00".'MP':
-							case "\x00".'MP3':
-							case ' MP3':
-							case 'MP3e':
-							case "\x00".'MP':
-							case ' MP':
-							case 'MP3':
-								$info['warning'][] = 'error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag). (ERROR: !IsValidID3v2FrameName("'.str_replace("\x00", ' ', $frame_name).'", '.$id3v2_majorversion.'))). [Note: this particular error has been known to happen with tags edited by "MP3ext (www.mutschler.de/mp3ext/)"]';
-								break;
-
-							default:
-								$info['warning'][] = 'error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag). (ERROR: !IsValidID3v2FrameName("'.str_replace("\x00", ' ', $frame_name).'", '.$id3v2_majorversion.'))).';
-								break;
-						}
-
-					} elseif (!isset($framedata) || ($frame_size > strlen($framedata))) {
-
-						$info['error'][] = 'error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag). (ERROR: $frame_size ('.$frame_size.') > strlen($framedata) ('.(isset($framedata) ? strlen($framedata) : 'null').')).';
-
-					} else {
-
-						$info['error'][] = 'error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag).';
-
-					}
-
-				}
-				$framedataoffset += ($frame_size + $this->ID3v2HeaderLength($id3v2_majorversion));
-
-			}
-
-		}
-
-
-	//    Footer
-
-	//    The footer is a copy of the header, but with a different identifier.
-	//        ID3v2 identifier           "3DI"
-	//        ID3v2 version              $04 00
-	//        ID3v2 flags                %abcd0000
-	//        ID3v2 size             4 * %0xxxxxxx
-
-		if (isset($thisfile_id3v2_flags['isfooter']) && $thisfile_id3v2_flags['isfooter']) {
-			$footer = fread($this->getid3->fp, 10);
-			if (substr($footer, 0, 3) == '3DI') {
-				$thisfile_id3v2['footer'] = true;
-				$thisfile_id3v2['majorversion_footer'] = ord($footer{3});
-				$thisfile_id3v2['minorversion_footer'] = ord($footer{4});
-			}
-			if ($thisfile_id3v2['majorversion_footer'] <= 4) {
-				$id3_flags = ord(substr($footer{5}));
-				$thisfile_id3v2_flags['unsynch_footer']  = (bool) ($id3_flags & 0x80);
-				$thisfile_id3v2_flags['extfoot_footer']  = (bool) ($id3_flags & 0x40);
-				$thisfile_id3v2_flags['experim_footer']  = (bool) ($id3_flags & 0x20);
-				$thisfile_id3v2_flags['isfooter_footer'] = (bool) ($id3_flags & 0x10);
-
-				$thisfile_id3v2['footerlength'] = getid3_lib::BigEndian2Int(substr($footer, 6, 4), 1);
-			}
-		} // end footer
-
-		if (isset($thisfile_id3v2['comments']['genre'])) {
-			foreach ($thisfile_id3v2['comments']['genre'] as $key => $value) {
-				unset($thisfile_id3v2['comments']['genre'][$key]);
-				$thisfile_id3v2['comments'] = getid3_lib::array_merge_noclobber($thisfile_id3v2['comments'], array('genre'=>$this->ParseID3v2GenreString($value)));
-			}
-		}
-
-		if (isset($thisfile_id3v2['comments']['track'])) {
-			foreach ($thisfile_id3v2['comments']['track'] as $key => $value) {
-				if (strstr($value, '/')) {
-					list($thisfile_id3v2['comments']['tracknum'][$key], $thisfile_id3v2['comments']['totaltracks'][$key]) = explode('/', $thisfile_id3v2['comments']['track'][$key]);
-				}
-			}
-		}
-
-		if (!isset($thisfile_id3v2['comments']['year']) && !empty($thisfile_id3v2['comments']['recording_time'][0]) && preg_match('#^([0-9]{4})#', trim($thisfile_id3v2['comments']['recording_time'][0]), $matches)) {
-			$thisfile_id3v2['comments']['year'] = array($matches[1]);
-		}
-
-
-		if (!empty($thisfile_id3v2['TXXX'])) {
-			// MediaMonkey does this, maybe others: write a blank RGAD frame, but put replay-gain adjustment values in TXXX frames
-			foreach ($thisfile_id3v2['TXXX'] as $txxx_array) {
-				switch ($txxx_array['description']) {
-					case 'replaygain_track_gain':
-						if (empty($info['replay_gain']['track']['adjustment']) && !empty($txxx_array['data'])) {
-							$info['replay_gain']['track']['adjustment'] = floatval(trim(str_replace('dB', '', $txxx_array['data'])));
-						}
-						break;
-					case 'replaygain_track_peak':
-						if (empty($info['replay_gain']['track']['peak']) && !empty($txxx_array['data'])) {
-							$info['replay_gain']['track']['peak'] = floatval($txxx_array['data']);
-						}
-						break;
-					case 'replaygain_album_gain':
-						if (empty($info['replay_gain']['album']['adjustment']) && !empty($txxx_array['data'])) {
-							$info['replay_gain']['album']['adjustment'] = floatval(trim(str_replace('dB', '', $txxx_array['data'])));
-						}
-						break;
-				}
-			}
-		}
-
-
-		// Set avdataoffset
-		$info['avdataoffset'] = $thisfile_id3v2['headerlength'];
-		if (isset($thisfile_id3v2['footer'])) {
-			$info['avdataoffset'] += 10;
-		}
-
-		return true;
-	}
-
-
-	function ParseID3v2GenreString($genrestring) {
-		// Parse genres into arrays of genreName and genreID
-		// ID3v2.2.x, ID3v2.3.x: '(21)' or '(4)Eurodisco' or '(51)(39)' or '(55)((I think...)'
-		// ID3v2.4.x: '21' $00 'Eurodisco' $00
-		$clean_genres = array();
-		if (strpos($genrestring, "\x00") === false) {
-			$genrestring = preg_replace('#\(([0-9]{1,3})\)#', '$1'."\x00", $genrestring);
-		}
-		$genre_elements = explode("\x00", $genrestring);
-		foreach ($genre_elements as $element) {
-			$element = trim($element);
-			if ($element) {
-				if (preg_match('#^[0-9]{1,3}#', $element)) {
-					$clean_genres[] = getid3_id3v1::LookupGenreName($element);
-				} else {
-					$clean_genres[] = str_replace('((', '(', $element);
-				}
-			}
-		}
-		return $clean_genres;
-	}
-
-
-	function ParseID3v2Frame(&$parsedFrame) {
-
-		// shortcuts
-		$info = &$this->getid3->info;
-		$id3v2_majorversion = $info['id3v2']['majorversion'];
-
-		$parsedFrame['framenamelong']  = $this->FrameNameLongLookup($parsedFrame['frame_name']);
-		if (empty($parsedFrame['framenamelong'])) {
-			unset($parsedFrame['framenamelong']);
-		}
-		$parsedFrame['framenameshort'] = $this->FrameNameShortLookup($parsedFrame['frame_name']);
-		if (empty($parsedFrame['framenameshort'])) {
-			unset($parsedFrame['framenameshort']);
-		}
-
-		if ($id3v2_majorversion >= 3) { // frame flags are not part of the ID3v2.2 standard
-			if ($id3v2_majorversion == 3) {
-				//    Frame Header Flags
-				//    %abc00000 %ijk00000
-				$parsedFrame['flags']['TagAlterPreservation']  = (bool) ($parsedFrame['frame_flags_raw'] & 0x8000); // a - Tag alter preservation
-				$parsedFrame['flags']['FileAlterPreservation'] = (bool) ($parsedFrame['frame_flags_raw'] & 0x4000); // b - File alter preservation
-				$parsedFrame['flags']['ReadOnly']              = (bool) ($parsedFrame['frame_flags_raw'] & 0x2000); // c - Read only
-				$parsedFrame['flags']['compression']           = (bool) ($parsedFrame['frame_flags_raw'] & 0x0080); // i - Compression
-				$parsedFrame['flags']['Encryption']            = (bool) ($parsedFrame['frame_flags_raw'] & 0x0040); // j - Encryption
-				$parsedFrame['flags']['GroupingIdentity']      = (bool) ($parsedFrame['frame_flags_raw'] & 0x0020); // k - Grouping identity
-
-			} elseif ($id3v2_majorversion == 4) {
-				//    Frame Header Flags
-				//    %0abc0000 %0h00kmnp
-				$parsedFrame['flags']['TagAlterPreservation']  = (bool) ($parsedFrame['frame_flags_raw'] & 0x4000); // a - Tag alter preservation
-				$parsedFrame['flags']['FileAlterPreservation'] = (bool) ($parsedFrame['frame_flags_raw'] & 0x2000); // b - File alter preservation
-				$parsedFrame['flags']['ReadOnly']              = (bool) ($parsedFrame['frame_flags_raw'] & 0x1000); // c - Read only
-				$parsedFrame['flags']['GroupingIdentity']      = (bool) ($parsedFrame['frame_flags_raw'] & 0x0040); // h - Grouping identity
-				$parsedFrame['flags']['compression']           = (bool) ($parsedFrame['frame_flags_raw'] & 0x0008); // k - Compression
-				$parsedFrame['flags']['Encryption']            = (bool) ($parsedFrame['frame_flags_raw'] & 0x0004); // m - Encryption
-				$parsedFrame['flags']['Unsynchronisation']     = (bool) ($parsedFrame['frame_flags_raw'] & 0x0002); // n - Unsynchronisation
-				$parsedFrame['flags']['DataLengthIndicator']   = (bool) ($parsedFrame['frame_flags_raw'] & 0x0001); // p - Data length indicator
-
-				// Frame-level de-unsynchronisation - ID3v2.4
-				if ($parsedFrame['flags']['Unsynchronisation']) {
-					$parsedFrame['data'] = $this->DeUnsynchronise($parsedFrame['data']);
-				}
-
-				if ($parsedFrame['flags']['DataLengthIndicator']) {
-					$parsedFrame['data_length_indicator'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 0, 4), 1);
-					$parsedFrame['data']                  =                           substr($parsedFrame['data'], 4);
-				}
-			}
-
-			//    Frame-level de-compression
-			if ($parsedFrame['flags']['compression']) {
-				$parsedFrame['decompressed_size'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 0, 4));
-				if (!function_exists('gzuncompress')) {
-					$info['warning'][] = 'gzuncompress() support required to decompress ID3v2 frame "'.$parsedFrame['frame_name'].'"';
-				} else {
-					if ($decompresseddata = @gzuncompress(substr($parsedFrame['data'], 4))) {
-					//if ($decompresseddata = @gzuncompress($parsedFrame['data'])) {
-						$parsedFrame['data'] = $decompresseddata;
-						unset($decompresseddata);
-					} else {
-						$info['warning'][] = 'gzuncompress() failed on compressed contents of ID3v2 frame "'.$parsedFrame['frame_name'].'"';
-					}
-				}
-			}
-		}
-
-		if (!empty($parsedFrame['flags']['DataLengthIndicator'])) {
-			if ($parsedFrame['data_length_indicator'] != strlen($parsedFrame['data'])) {
-				$info['warning'][] = 'ID3v2 frame "'.$parsedFrame['frame_name'].'" should be '.$parsedFrame['data_length_indicator'].' bytes long according to DataLengthIndicator, but found '.strlen($parsedFrame['data']).' bytes of data';
-			}
-		}
-
-		if (isset($parsedFrame['datalength']) && ($parsedFrame['datalength'] == 0)) {
-
-			$warning = 'Frame "'.$parsedFrame['frame_name'].'" at offset '.$parsedFrame['dataoffset'].' has no data portion';
-			switch ($parsedFrame['frame_name']) {
-				case 'WCOM':
-					$warning .= ' (this is known to happen with files tagged by RioPort)';
-					break;
-
-				default:
-					break;
-			}
-			$info['warning'][] = $warning;
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'UFID')) || // 4.1   UFID Unique file identifier
-			(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'UFI'))) {  // 4.1   UFI  Unique file identifier
-			//   There may be more than one 'UFID' frame in a tag,
-			//   but only one with the same 'Owner identifier'.
-			// <Header for 'Unique file identifier', ID: 'UFID'>
-			// Owner identifier        <text string> $00
-			// Identifier              <up to 64 bytes binary data>
-			$exploded = explode("\x00", $parsedFrame['data'], 2);
-			$parsedFrame['ownerid'] = (isset($exploded[0]) ? $exploded[0] : '');
-			$parsedFrame['data']    = (isset($exploded[1]) ? $exploded[1] : '');
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'TXXX')) || // 4.2.2 TXXX User defined text information frame
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'TXX'))) {    // 4.2.2 TXX  User defined text information frame
-			//   There may be more than one 'TXXX' frame in each tag,
-			//   but only one with the same description.
-			// <Header for 'User defined text information frame', ID: 'TXXX'>
-			// Text encoding     $xx
-			// Description       <text string according to encoding> $00 (00)
-			// Value             <text string according to encoding>
-
-			$frame_offset = 0;
-			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-
-			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
-				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
-			}
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
-				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
-			}
-			$frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			if (ord($frame_description) === 0) {
-				$frame_description = '';
-			}
-			$parsedFrame['encodingid']  = $frame_textencoding;
-			$parsedFrame['encoding']    = $this->TextEncodingNameLookup($frame_textencoding);
-
-			$parsedFrame['description'] = $frame_description;
-			$parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']));
-			}
-			//unset($parsedFrame['data']); do not unset, may be needed elsewhere, e.g. for replaygain
-
-
-		} elseif ($parsedFrame['frame_name']{0} == 'T') { // 4.2. T??[?] Text information frame
-			//   There may only be one text information frame of its kind in an tag.
-			// <Header for 'Text information frame', ID: 'T000' - 'TZZZ',
-			// excluding 'TXXX' described in 4.2.6.>
-			// Text encoding                $xx
-			// Information                  <text string(s) according to encoding>
-
-			$frame_offset = 0;
-			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
-				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
-			}
-
-			$parsedFrame['data'] = (string) substr($parsedFrame['data'], $frame_offset);
-
-			$parsedFrame['encodingid'] = $frame_textencoding;
-			$parsedFrame['encoding']   = $this->TextEncodingNameLookup($frame_textencoding);
-
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-				$string = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
-				$string = rtrim($string, "\x00"); // remove possible terminating null (put by encoding id or software bug)
-				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $string;
-				unset($string);
-			}
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'WXXX')) || // 4.3.2 WXXX User defined URL link frame
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'WXX'))) {    // 4.3.2 WXX  User defined URL link frame
-			//   There may be more than one 'WXXX' frame in each tag,
-			//   but only one with the same description
-			// <Header for 'User defined URL link frame', ID: 'WXXX'>
-			// Text encoding     $xx
-			// Description       <text string according to encoding> $00 (00)
-			// URL               <text string>
-
-			$frame_offset = 0;
-			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
-				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
-			}
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
-				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
-			}
-			$frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-
-			if (ord($frame_description) === 0) {
-				$frame_description = '';
-			}
-			$parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
-
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding));
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
-				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
-			}
-			if ($frame_terminatorpos) {
-				// there are null bytes after the data - this is not according to spec
-				// only use data up to first null byte
-				$frame_urldata = (string) substr($parsedFrame['data'], 0, $frame_terminatorpos);
-			} else {
-				// no null bytes following data, just use all data
-				$frame_urldata = (string) $parsedFrame['data'];
-			}
-
-			$parsedFrame['encodingid']  = $frame_textencoding;
-			$parsedFrame['encoding']    = $this->TextEncodingNameLookup($frame_textencoding);
-
-			$parsedFrame['url']         = $frame_urldata;
-			$parsedFrame['description'] = $frame_description;
-			if (!empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
-				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['url']);
-			}
-			unset($parsedFrame['data']);
-
-
-		} elseif ($parsedFrame['frame_name']{0} == 'W') { // 4.3. W??? URL link frames
-			//   There may only be one URL link frame of its kind in a tag,
-			//   except when stated otherwise in the frame description
-			// <Header for 'URL link frame', ID: 'W000' - 'WZZZ', excluding 'WXXX'
-			// described in 4.3.2.>
-			// URL              <text string>
-
-			$parsedFrame['url'] = trim($parsedFrame['data']);
-			if (!empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
-				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $parsedFrame['url'];
-			}
-			unset($parsedFrame['data']);
-
-
-		} elseif ((($id3v2_majorversion == 3) && ($parsedFrame['frame_name'] == 'IPLS')) || // 4.4  IPLS Involved people list (ID3v2.3 only)
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'IPL'))) {     // 4.4  IPL  Involved people list (ID3v2.2 only)
-			//   There may only be one 'IPL' frame in each tag
-			// <Header for 'User defined URL link frame', ID: 'IPL'>
-			// Text encoding     $xx
-			// People list strings    <textstrings>
-
-			$frame_offset = 0;
-			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
-				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
-			}
-			$parsedFrame['encodingid'] = $frame_textencoding;
-			$parsedFrame['encoding']   = $this->TextEncodingNameLookup($parsedFrame['encodingid']);
-
-			$parsedFrame['data']       = (string) substr($parsedFrame['data'], $frame_offset);
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
-			}
-
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'MCDI')) || // 4.4   MCDI Music CD identifier
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'MCI'))) {     // 4.5   MCI  Music CD identifier
-			//   There may only be one 'MCDI' frame in each tag
-			// <Header for 'Music CD identifier', ID: 'MCDI'>
-			// CD TOC                <binary data>
-
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $parsedFrame['data'];
-			}
-
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'ETCO')) || // 4.5   ETCO Event timing codes
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'ETC'))) {     // 4.6   ETC  Event timing codes
-			//   There may only be one 'ETCO' frame in each tag
-			// <Header for 'Event timing codes', ID: 'ETCO'>
-			// Time stamp format    $xx
-			//   Where time stamp format is:
-			// $01  (32-bit value) MPEG frames from beginning of file
-			// $02  (32-bit value) milliseconds from beginning of file
-			//   Followed by a list of key events in the following format:
-			// Type of event   $xx
-			// Time stamp      $xx (xx ...)
-			//   The 'Time stamp' is set to zero if directly at the beginning of the sound
-			//   or after the previous event. All events MUST be sorted in chronological order.
-
-			$frame_offset = 0;
-			$parsedFrame['timestampformat'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-
-			while ($frame_offset < strlen($parsedFrame['data'])) {
-				$parsedFrame['typeid']    = substr($parsedFrame['data'], $frame_offset++, 1);
-				$parsedFrame['type']      = $this->ETCOEventLookup($parsedFrame['typeid']);
-				$parsedFrame['timestamp'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
-				$frame_offset += 4;
-			}
-			unset($parsedFrame['data']);
-
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'MLLT')) || // 4.6   MLLT MPEG location lookup table
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'MLL'))) {     // 4.7   MLL MPEG location lookup table
-			//   There may only be one 'MLLT' frame in each tag
-			// <Header for 'Location lookup table', ID: 'MLLT'>
-			// MPEG frames between reference  $xx xx
-			// Bytes between reference        $xx xx xx
-			// Milliseconds between reference $xx xx xx
-			// Bits for bytes deviation       $xx
-			// Bits for milliseconds dev.     $xx
-			//   Then for every reference the following data is included;
-			// Deviation in bytes         %xxx....
-			// Deviation in milliseconds  %xxx....
-
-			$frame_offset = 0;
-			$parsedFrame['framesbetweenreferences'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 0, 2));
-			$parsedFrame['bytesbetweenreferences']  = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 2, 3));
-			$parsedFrame['msbetweenreferences']     = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 5, 3));
-			$parsedFrame['bitsforbytesdeviation']   = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 8, 1));
-			$parsedFrame['bitsformsdeviation']      = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 9, 1));
-			$parsedFrame['data'] = substr($parsedFrame['data'], 10);
-			while ($frame_offset < strlen($parsedFrame['data'])) {
-				$deviationbitstream .= getid3_lib::BigEndian2Bin(substr($parsedFrame['data'], $frame_offset++, 1));
-			}
-			$reference_counter = 0;
-			while (strlen($deviationbitstream) > 0) {
-				$parsedFrame[$reference_counter]['bytedeviation'] = bindec(substr($deviationbitstream, 0, $parsedFrame['bitsforbytesdeviation']));
-				$parsedFrame[$reference_counter]['msdeviation']   = bindec(substr($deviationbitstream, $parsedFrame['bitsforbytesdeviation'], $parsedFrame['bitsformsdeviation']));
-				$deviationbitstream = substr($deviationbitstream, $parsedFrame['bitsforbytesdeviation'] + $parsedFrame['bitsformsdeviation']);
-				$reference_counter++;
-			}
-			unset($parsedFrame['data']);
-
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'SYTC')) || // 4.7   SYTC Synchronised tempo codes
-				  (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'STC'))) {  // 4.8   STC  Synchronised tempo codes
-			//   There may only be one 'SYTC' frame in each tag
-			// <Header for 'Synchronised tempo codes', ID: 'SYTC'>
-			// Time stamp format   $xx
-			// Tempo data          <binary data>
-			//   Where time stamp format is:
-			// $01  (32-bit value) MPEG frames from beginning of file
-			// $02  (32-bit value) milliseconds from beginning of file
-
-			$frame_offset = 0;
-			$parsedFrame['timestampformat'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$timestamp_counter = 0;
-			while ($frame_offset < strlen($parsedFrame['data'])) {
-				$parsedFrame[$timestamp_counter]['tempo'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-				if ($parsedFrame[$timestamp_counter]['tempo'] == 255) {
-					$parsedFrame[$timestamp_counter]['tempo'] += ord(substr($parsedFrame['data'], $frame_offset++, 1));
-				}
-				$parsedFrame[$timestamp_counter]['timestamp'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
-				$frame_offset += 4;
-				$timestamp_counter++;
-			}
-			unset($parsedFrame['data']);
-
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'USLT')) || // 4.8   USLT Unsynchronised lyric/text transcription
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'ULT'))) {     // 4.9   ULT  Unsynchronised lyric/text transcription
-			//   There may be more than one 'Unsynchronised lyrics/text transcription' frame
-			//   in each tag, but only one with the same language and content descriptor.
-			// <Header for 'Unsynchronised lyrics/text transcription', ID: 'USLT'>
-			// Text encoding        $xx
-			// Language             $xx xx xx
-			// Content descriptor   <text string according to encoding> $00 (00)
-			// Lyrics/text          <full text string according to encoding>
-
-			$frame_offset = 0;
-			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
-				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
-			}
-			$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
-			$frame_offset += 3;
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
-				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
-			}
-			$frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			if (ord($frame_description) === 0) {
-				$frame_description = '';
-			}
-			$parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
-
-			$parsedFrame['encodingid']   = $frame_textencoding;
-			$parsedFrame['encoding']     = $this->TextEncodingNameLookup($frame_textencoding);
-
-			$parsedFrame['data']         = $parsedFrame['data'];
-			$parsedFrame['language']     = $frame_language;
-			$parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
-			$parsedFrame['description']  = $frame_description;
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
-			}
-			unset($parsedFrame['data']);
-
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'SYLT')) || // 4.9   SYLT Synchronised lyric/text
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'SLT'))) {     // 4.10  SLT  Synchronised lyric/text
-			//   There may be more than one 'SYLT' frame in each tag,
-			//   but only one with the same language and content descriptor.
-			// <Header for 'Synchronised lyrics/text', ID: 'SYLT'>
-			// Text encoding        $xx
-			// Language             $xx xx xx
-			// Time stamp format    $xx
-			//   $01  (32-bit value) MPEG frames from beginning of file
-			//   $02  (32-bit value) milliseconds from beginning of file
-			// Content type         $xx
-			// Content descriptor   <text string according to encoding> $00 (00)
-			//   Terminated text to be synced (typically a syllable)
-			//   Sync identifier (terminator to above string)   $00 (00)
-			//   Time stamp                                     $xx (xx ...)
-
-			$frame_offset = 0;
-			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
-				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
-			}
-			$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
-			$frame_offset += 3;
-			$parsedFrame['timestampformat'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['contenttypeid']   = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['contenttype']     = $this->SYTLContentTypeLookup($parsedFrame['contenttypeid']);
-			$parsedFrame['encodingid']      = $frame_textencoding;
-			$parsedFrame['encoding']        = $this->TextEncodingNameLookup($frame_textencoding);
-
-			$parsedFrame['language']        = $frame_language;
-			$parsedFrame['languagename']    = $this->LanguageLookup($frame_language, false);
-
-			$timestampindex = 0;
-			$frame_remainingdata = substr($parsedFrame['data'], $frame_offset);
-			while (strlen($frame_remainingdata)) {
-				$frame_offset = 0;
-				$frame_terminatorpos = strpos($frame_remainingdata, $this->TextEncodingTerminatorLookup($frame_textencoding));
-				if ($frame_terminatorpos === false) {
-					$frame_remainingdata = '';
-				} else {
-					if (ord(substr($frame_remainingdata, $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
-						$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
-					}
-					$parsedFrame['lyrics'][$timestampindex]['data'] = substr($frame_remainingdata, $frame_offset, $frame_terminatorpos - $frame_offset);
-
-					$frame_remainingdata = substr($frame_remainingdata, $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
-					if (($timestampindex == 0) && (ord($frame_remainingdata{0}) != 0)) {
-						// timestamp probably omitted for first data item
-					} else {
-						$parsedFrame['lyrics'][$timestampindex]['timestamp'] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, 0, 4));
-						$frame_remainingdata = substr($frame_remainingdata, 4);
-					}
-					$timestampindex++;
-				}
-			}
-			unset($parsedFrame['data']);
-
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'COMM')) || // 4.10  COMM Comments
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'COM'))) {     // 4.11  COM  Comments
-			//   There may be more than one comment frame in each tag,
-			//   but only one with the same language and content descriptor.
-			// <Header for 'Comment', ID: 'COMM'>
-			// Text encoding          $xx
-			// Language               $xx xx xx
-			// Short content descrip. <text string according to encoding> $00 (00)
-			// The actual text        <full text string according to encoding>
-
-			if (strlen($parsedFrame['data']) < 5) {
-
-				$info['warning'][] = 'Invalid data (too short) for "'.$parsedFrame['frame_name'].'" frame at offset '.$parsedFrame['dataoffset'];
-
-			} else {
-
-				$frame_offset = 0;
-				$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-				if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
-					$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
-				}
-				$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
-				$frame_offset += 3;
-				$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-				if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
-					$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
-				}
-				$frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-				if (ord($frame_description) === 0) {
-					$frame_description = '';
-				}
-				$frame_text = (string) substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
-
-				$parsedFrame['encodingid']   = $frame_textencoding;
-				$parsedFrame['encoding']     = $this->TextEncodingNameLookup($frame_textencoding);
-
-				$parsedFrame['language']     = $frame_language;
-				$parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
-				$parsedFrame['description']  = $frame_description;
-				$parsedFrame['data']         = $frame_text;
-				if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-					$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
-				}
-
-			}
-
-		} elseif (($id3v2_majorversion >= 4) && ($parsedFrame['frame_name'] == 'RVA2')) { // 4.11  RVA2 Relative volume adjustment (2) (ID3v2.4+ only)
-			//   There may be more than one 'RVA2' frame in each tag,
-			//   but only one with the same identification string
-			// <Header for 'Relative volume adjustment (2)', ID: 'RVA2'>
-			// Identification          <text string> $00
-			//   The 'identification' string is used to identify the situation and/or
-			//   device where this adjustment should apply. The following is then
-			//   repeated for every channel:
-			// Type of channel         $xx
-			// Volume adjustment       $xx xx
-			// Bits representing peak  $xx
-			// Peak volume             $xx (xx ...)
-
-			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00");
-			$frame_idstring = substr($parsedFrame['data'], 0, $frame_terminatorpos);
-			if (ord($frame_idstring) === 0) {
-				$frame_idstring = '';
-			}
-			$frame_remainingdata = substr($parsedFrame['data'], $frame_terminatorpos + strlen("\x00"));
-			$parsedFrame['description'] = $frame_idstring;
-			$RVA2channelcounter = 0;
-			while (strlen($frame_remainingdata) >= 5) {
-				$frame_offset = 0;
-				$frame_channeltypeid = ord(substr($frame_remainingdata, $frame_offset++, 1));
-				$parsedFrame[$RVA2channelcounter]['channeltypeid']  = $frame_channeltypeid;
-				$parsedFrame[$RVA2channelcounter]['channeltype']    = $this->RVA2ChannelTypeLookup($frame_channeltypeid);
-				$parsedFrame[$RVA2channelcounter]['volumeadjust']   = getid3_lib::BigEndian2Int(substr($frame_remainingdata, $frame_offset, 2), false, true); // 16-bit signed
-				$frame_offset += 2;
-				$parsedFrame[$RVA2channelcounter]['bitspeakvolume'] = ord(substr($frame_remainingdata, $frame_offset++, 1));
-				if (($parsedFrame[$RVA2channelcounter]['bitspeakvolume'] < 1) || ($parsedFrame[$RVA2channelcounter]['bitspeakvolume'] > 4)) {
-					$info['warning'][] = 'ID3v2::RVA2 frame['.$RVA2channelcounter.'] contains invalid '.$parsedFrame[$RVA2channelcounter]['bitspeakvolume'].'-byte bits-representing-peak value';
-					break;
-				}
-				$frame_bytespeakvolume = ceil($parsedFrame[$RVA2channelcounter]['bitspeakvolume'] / 8);
-				$parsedFrame[$RVA2channelcounter]['peakvolume']     = getid3_lib::BigEndian2Int(substr($frame_remainingdata, $frame_offset, $frame_bytespeakvolume));
-				$frame_remainingdata = substr($frame_remainingdata, $frame_offset + $frame_bytespeakvolume);
-				$RVA2channelcounter++;
-			}
-			unset($parsedFrame['data']);
-
-
-		} elseif ((($id3v2_majorversion == 3) && ($parsedFrame['frame_name'] == 'RVAD')) || // 4.12  RVAD Relative volume adjustment (ID3v2.3 only)
-				  (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'RVA'))) {  // 4.12  RVA  Relative volume adjustment (ID3v2.2 only)
-			//   There may only be one 'RVA' frame in each tag
-			// <Header for 'Relative volume adjustment', ID: 'RVA'>
-			// ID3v2.2 => Increment/decrement     %000000ba
-			// ID3v2.3 => Increment/decrement     %00fedcba
-			// Bits used for volume descr.        $xx
-			// Relative volume change, right      $xx xx (xx ...) // a
-			// Relative volume change, left       $xx xx (xx ...) // b
-			// Peak volume right                  $xx xx (xx ...)
-			// Peak volume left                   $xx xx (xx ...)
-			//   ID3v2.3 only, optional (not present in ID3v2.2):
-			// Relative volume change, right back $xx xx (xx ...) // c
-			// Relative volume change, left back  $xx xx (xx ...) // d
-			// Peak volume right back             $xx xx (xx ...)
-			// Peak volume left back              $xx xx (xx ...)
-			//   ID3v2.3 only, optional (not present in ID3v2.2):
-			// Relative volume change, center     $xx xx (xx ...) // e
-			// Peak volume center                 $xx xx (xx ...)
-			//   ID3v2.3 only, optional (not present in ID3v2.2):
-			// Relative volume change, bass       $xx xx (xx ...) // f
-			// Peak volume bass                   $xx xx (xx ...)
-
-			$frame_offset = 0;
-			$frame_incrdecrflags = getid3_lib::BigEndian2Bin(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['incdec']['right'] = (bool) substr($frame_incrdecrflags, 6, 1);
-			$parsedFrame['incdec']['left']  = (bool) substr($frame_incrdecrflags, 7, 1);
-			$parsedFrame['bitsvolume'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$frame_bytesvolume = ceil($parsedFrame['bitsvolume'] / 8);
-			$parsedFrame['volumechange']['right'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesvolume));
-			if ($parsedFrame['incdec']['right'] === false) {
-				$parsedFrame['volumechange']['right'] *= -1;
-			}
-			$frame_offset += $frame_bytesvolume;
-			$parsedFrame['volumechange']['left'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesvolume));
-			if ($parsedFrame['incdec']['left'] === false) {
-				$parsedFrame['volumechange']['left'] *= -1;
-			}
-			$frame_offset += $frame_bytesvolume;
-			$parsedFrame['peakvolume']['right'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesvolume));
-			$frame_offset += $frame_bytesvolume;
-			$parsedFrame['peakvolume']['left']  = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesvolume));
-			$frame_offset += $frame_bytesvolume;
-			if ($id3v2_majorversion == 3) {
-				$parsedFrame['data'] = substr($parsedFrame['data'], $frame_offset);
-				if (strlen($parsedFrame['data']) > 0) {
-					$parsedFrame['incdec']['rightrear'] = (bool) substr($frame_incrdecrflags, 4, 1);
-					$parsedFrame['incdec']['leftrear']  = (bool) substr($frame_incrdecrflags, 5, 1);
-					$parsedFrame['volumechange']['rightrear'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesvolume));
-					if ($parsedFrame['incdec']['rightrear'] === false) {
-						$parsedFrame['volumechange']['rightrear'] *= -1;
-					}
-					$frame_offset += $frame_bytesvolume;
-					$parsedFrame['volumechange']['leftrear'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesvolume));
-					if ($parsedFrame['incdec']['leftrear'] === false) {
-						$parsedFrame['volumechange']['leftrear'] *= -1;
-					}
-					$frame_offset += $frame_bytesvolume;
-					$parsedFrame['peakvolume']['rightrear'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesvolume));
-					$frame_offset += $frame_bytesvolume;
-					$parsedFrame['peakvolume']['leftrear']  = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesvolume));
-					$frame_offset += $frame_bytesvolume;
-				}
-				$parsedFrame['data'] = substr($parsedFrame['data'], $frame_offset);
-				if (strlen($parsedFrame['data']) > 0) {
-					$parsedFrame['incdec']['center'] = (bool) substr($frame_incrdecrflags, 3, 1);
-					$parsedFrame['volumechange']['center'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesvolume));
-					if ($parsedFrame['incdec']['center'] === false) {
-						$parsedFrame['volumechange']['center'] *= -1;
-					}
-					$frame_offset += $frame_bytesvolume;
-					$parsedFrame['peakvolume']['center'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesvolume));
-					$frame_offset += $frame_bytesvolume;
-				}
-				$parsedFrame['data'] = substr($parsedFrame['data'], $frame_offset);
-				if (strlen($parsedFrame['data']) > 0) {
-					$parsedFrame['incdec']['bass'] = (bool) substr($frame_incrdecrflags, 2, 1);
-					$parsedFrame['volumechange']['bass'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesvolume));
-					if ($parsedFrame['incdec']['bass'] === false) {
-						$parsedFrame['volumechange']['bass'] *= -1;
-					}
-					$frame_offset += $frame_bytesvolume;
-					$parsedFrame['peakvolume']['bass'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesvolume));
-					$frame_offset += $frame_bytesvolume;
-				}
-			}
-			unset($parsedFrame['data']);
-
-
-		} elseif (($id3v2_majorversion >= 4) && ($parsedFrame['frame_name'] == 'EQU2')) { // 4.12  EQU2 Equalisation (2) (ID3v2.4+ only)
-			//   There may be more than one 'EQU2' frame in each tag,
-			//   but only one with the same identification string
-			// <Header of 'Equalisation (2)', ID: 'EQU2'>
-			// Interpolation method  $xx
-			//   $00  Band
-			//   $01  Linear
-			// Identification        <text string> $00
-			//   The following is then repeated for every adjustment point
-			// Frequency          $xx xx
-			// Volume adjustment  $xx xx
-
-			$frame_offset = 0;
-			$frame_interpolationmethod = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-			$frame_idstring = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			if (ord($frame_idstring) === 0) {
-				$frame_idstring = '';
-			}
-			$parsedFrame['description'] = $frame_idstring;
-			$frame_remainingdata = substr($parsedFrame['data'], $frame_terminatorpos + strlen("\x00"));
-			while (strlen($frame_remainingdata)) {
-				$frame_frequency = getid3_lib::BigEndian2Int(substr($frame_remainingdata, 0, 2)) / 2;
-				$parsedFrame['data'][$frame_frequency] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, 2, 2), false, true);
-				$frame_remainingdata = substr($frame_remainingdata, 4);
-			}
-			$parsedFrame['interpolationmethod'] = $frame_interpolationmethod;
-			unset($parsedFrame['data']);
-
-
-		} elseif ((($id3v2_majorversion == 3) && ($parsedFrame['frame_name'] == 'EQUA')) || // 4.12  EQUA Equalisation (ID3v2.3 only)
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'EQU'))) {     // 4.13  EQU  Equalisation (ID3v2.2 only)
-			//   There may only be one 'EQUA' frame in each tag
-			// <Header for 'Relative volume adjustment', ID: 'EQU'>
-			// Adjustment bits    $xx
-			//   This is followed by 2 bytes + ('adjustment bits' rounded up to the
-			//   nearest byte) for every equalisation band in the following format,
-			//   giving a frequency range of 0 - 32767Hz:
-			// Increment/decrement   %x (MSB of the Frequency)
-			// Frequency             (lower 15 bits)
-			// Adjustment            $xx (xx ...)
-
-			$frame_offset = 0;
-			$parsedFrame['adjustmentbits'] = substr($parsedFrame['data'], $frame_offset++, 1);
-			$frame_adjustmentbytes = ceil($parsedFrame['adjustmentbits'] / 8);
-
-			$frame_remainingdata = (string) substr($parsedFrame['data'], $frame_offset);
-			while (strlen($frame_remainingdata) > 0) {
-				$frame_frequencystr = getid3_lib::BigEndian2Bin(substr($frame_remainingdata, 0, 2));
-				$frame_incdec    = (bool) substr($frame_frequencystr, 0, 1);
-				$frame_frequency = bindec(substr($frame_frequencystr, 1, 15));
-				$parsedFrame[$frame_frequency]['incdec'] = $frame_incdec;
-				$parsedFrame[$frame_frequency]['adjustment'] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, 2, $frame_adjustmentbytes));
-				if ($parsedFrame[$frame_frequency]['incdec'] === false) {
-					$parsedFrame[$frame_frequency]['adjustment'] *= -1;
-				}
-				$frame_remainingdata = substr($frame_remainingdata, 2 + $frame_adjustmentbytes);
-			}
-			unset($parsedFrame['data']);
-
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'RVRB')) || // 4.13  RVRB Reverb
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'REV'))) {     // 4.14  REV  Reverb
-			//   There may only be one 'RVRB' frame in each tag.
-			// <Header for 'Reverb', ID: 'RVRB'>
-			// Reverb left (ms)                 $xx xx
-			// Reverb right (ms)                $xx xx
-			// Reverb bounces, left             $xx
-			// Reverb bounces, right            $xx
-			// Reverb feedback, left to left    $xx
-			// Reverb feedback, left to right   $xx
-			// Reverb feedback, right to right  $xx
-			// Reverb feedback, right to left   $xx
-			// Premix left to right             $xx
-			// Premix right to left             $xx
-
-			$frame_offset = 0;
-			$parsedFrame['left']  = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 2));
-			$frame_offset += 2;
-			$parsedFrame['right'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 2));
-			$frame_offset += 2;
-			$parsedFrame['bouncesL']      = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['bouncesR']      = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['feedbackLL']    = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['feedbackLR']    = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['feedbackRR']    = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['feedbackRL']    = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['premixLR']      = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['premixRL']      = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			unset($parsedFrame['data']);
-
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'APIC')) || // 4.14  APIC Attached picture
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'PIC'))) {     // 4.15  PIC  Attached picture
-			//   There may be several pictures attached to one file,
-			//   each in their individual 'APIC' frame, but only one
-			//   with the same content descriptor
-			// <Header for 'Attached picture', ID: 'APIC'>
-			// Text encoding      $xx
-			// ID3v2.3+ => MIME type          <text string> $00
-			// ID3v2.2  => Image format       $xx xx xx
-			// Picture type       $xx
-			// Description        <text string according to encoding> $00 (00)
-			// Picture data       <binary data>
-
-			$frame_offset = 0;
-			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
-				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
-			}
-
-			if ($id3v2_majorversion == 2 && strlen($parsedFrame['data']) > $frame_offset) {
-				$frame_imagetype = substr($parsedFrame['data'], $frame_offset, 3);
-				if (strtolower($frame_imagetype) == 'ima') {
-					// complete hack for mp3Rage (www.chaoticsoftware.com) that puts ID3v2.3-formatted
-					// MIME type instead of 3-char ID3v2.2-format image type  (thanks xbhoff�pacbell*net)
-					$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-					$frame_mimetype = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-					if (ord($frame_mimetype) === 0) {
-						$frame_mimetype = '';
-					}
-					$frame_imagetype = strtoupper(str_replace('image/', '', strtolower($frame_mimetype)));
-					if ($frame_imagetype == 'JPEG') {
-						$frame_imagetype = 'JPG';
-					}
-					$frame_offset = $frame_terminatorpos + strlen("\x00");
-				} else {
-					$frame_offset += 3;
-				}
-			}
-			if ($id3v2_majorversion > 2 && strlen($parsedFrame['data']) > $frame_offset) {
-				$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-				$frame_mimetype = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-				if (ord($frame_mimetype) === 0) {
-					$frame_mimetype = '';
-				}
-				$frame_offset = $frame_terminatorpos + strlen("\x00");
-			}
-
-			$frame_picturetype = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-
-			if ($frame_offset >= $parsedFrame['datalength']) {
-				$info['warning'][] = 'data portion of APIC frame is missing at offset '.($parsedFrame['dataoffset'] + 8 + $frame_offset);
-			} else {
-				$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-				if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
-					$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
-				}
-				$frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-				if (ord($frame_description) === 0) {
-					$frame_description = '';
-				}
-				$parsedFrame['encodingid']       = $frame_textencoding;
-				$parsedFrame['encoding']         = $this->TextEncodingNameLookup($frame_textencoding);
-
-				if ($id3v2_majorversion == 2) {
-					$parsedFrame['imagetype']    = $frame_imagetype;
-				} else {
-					$parsedFrame['mime']         = $frame_mimetype;
-				}
-				$parsedFrame['picturetypeid']    = $frame_picturetype;
-				$parsedFrame['picturetype']      = $this->APICPictureTypeLookup($frame_picturetype);
-				$parsedFrame['description']      = $frame_description;
-				$parsedFrame['data']             = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
-				$parsedFrame['datalength']       = strlen($parsedFrame['data']);
-
-				$parsedFrame['image_mime'] = '';
-				$imageinfo = array();
-				$imagechunkcheck = getid3_lib::GetDataImageSize($parsedFrame['data'], $imageinfo);
-				if (($imagechunkcheck[2] >= 1) && ($imagechunkcheck[2] <= 3)) {
-					$parsedFrame['image_mime']       = 'image/'.getid3_lib::ImageTypesLookup($imagechunkcheck[2]);
-					if ($imagechunkcheck[0]) {
-						$parsedFrame['image_width']  = $imagechunkcheck[0];
-					}
-					if ($imagechunkcheck[1]) {
-						$parsedFrame['image_height'] = $imagechunkcheck[1];
-					}
-				}
-
-				do {
-					if ($this->inline_attachments === false) {
-						// skip entirely
-						unset($parsedFrame['data']);
-						break;
-					}
-					if ($this->inline_attachments === true) {
-						// great
-					} elseif (is_int($this->inline_attachments)) {
-						if ($this->inline_attachments < $parsedFrame['data_length']) {
-							// too big, skip
-							$info['warning'][] = 'attachment at '.$frame_offset.' is too large to process inline ('.number_format($parsedFrame['data_length']).' bytes)';
-							unset($parsedFrame['data']);
-							break;
-						}
-					} elseif (is_string($this->inline_attachments)) {
-						$this->inline_attachments = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->inline_attachments), DIRECTORY_SEPARATOR);
-						if (!is_dir($this->inline_attachments) || !is_writable($this->inline_attachments)) {
-							// cannot write, skip
-							$info['warning'][] = 'attachment at '.$frame_offset.' cannot be saved to "'.$this->inline_attachments.'" (not writable)';
-							unset($parsedFrame['data']);
-							break;
-						}
-					}
-					// if we get this far, must be OK
-					if (is_string($this->inline_attachments)) {
-						$destination_filename = $this->inline_attachments.DIRECTORY_SEPARATOR.md5($info['filenamepath']).'_'.$frame_offset;
-						if (!file_exists($destination_filename) || is_writable($destination_filename)) {
-							file_put_contents($destination_filename, $parsedFrame['data']);
-						} else {
-							$info['warning'][] = 'attachment at '.$frame_offset.' cannot be saved to "'.$destination_filename.'" (not writable)';
-						}
-						$parsedFrame['data_filename'] = $destination_filename;
-						unset($parsedFrame['data']);
-					} else {
-						if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-							if (!isset($info['id3v2']['comments']['picture'])) {
-								$info['id3v2']['comments']['picture'] = array();
-							}
-							$info['id3v2']['comments']['picture'][] = array('data'=>$parsedFrame['data'], 'image_mime'=>$parsedFrame['image_mime']);
-						}
-					}
-				} while (false);
-			}
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'GEOB')) || // 4.15  GEOB General encapsulated object
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'GEO'))) {     // 4.16  GEO  General encapsulated object
-			//   There may be more than one 'GEOB' frame in each tag,
-			//   but only one with the same content descriptor
-			// <Header for 'General encapsulated object', ID: 'GEOB'>
-			// Text encoding          $xx
-			// MIME type              <text string> $00
-			// Filename               <text string according to encoding> $00 (00)
-			// Content description    <text string according to encoding> $00 (00)
-			// Encapsulated object    <binary data>
-
-			$frame_offset = 0;
-			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
-				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
-			}
-			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-			$frame_mimetype = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			if (ord($frame_mimetype) === 0) {
-				$frame_mimetype = '';
-			}
-			$frame_offset = $frame_terminatorpos + strlen("\x00");
-
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
-				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
-			}
-			$frame_filename = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			if (ord($frame_filename) === 0) {
-				$frame_filename = '';
-			}
-			$frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding));
-
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
-				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
-			}
-			$frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			if (ord($frame_description) === 0) {
-				$frame_description = '';
-			}
-			$frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding));
-
-			$parsedFrame['objectdata']  = (string) substr($parsedFrame['data'], $frame_offset);
-			$parsedFrame['encodingid']  = $frame_textencoding;
-			$parsedFrame['encoding']    = $this->TextEncodingNameLookup($frame_textencoding);
-
-			$parsedFrame['mime']        = $frame_mimetype;
-			$parsedFrame['filename']    = $frame_filename;
-			$parsedFrame['description'] = $frame_description;
-			unset($parsedFrame['data']);
-
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'PCNT')) || // 4.16  PCNT Play counter
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'CNT'))) {     // 4.17  CNT  Play counter
-			//   There may only be one 'PCNT' frame in each tag.
-			//   When the counter reaches all one's, one byte is inserted in
-			//   front of the counter thus making the counter eight bits bigger
-			// <Header for 'Play counter', ID: 'PCNT'>
-			// Counter        $xx xx xx xx (xx ...)
-
-			$parsedFrame['data']          = getid3_lib::BigEndian2Int($parsedFrame['data']);
-
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'POPM')) || // 4.17  POPM Popularimeter
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'POP'))) {    // 4.18  POP  Popularimeter
-			//   There may be more than one 'POPM' frame in each tag,
-			//   but only one with the same email address
-			// <Header for 'Popularimeter', ID: 'POPM'>
-			// Email to user   <text string> $00
-			// Rating          $xx
-			// Counter         $xx xx xx xx (xx ...)
-
-			$frame_offset = 0;
-			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-			$frame_emailaddress = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			if (ord($frame_emailaddress) === 0) {
-				$frame_emailaddress = '';
-			}
-			$frame_offset = $frame_terminatorpos + strlen("\x00");
-			$frame_rating = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['counter'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset));
-			$parsedFrame['email']   = $frame_emailaddress;
-			$parsedFrame['rating']  = $frame_rating;
-			unset($parsedFrame['data']);
-
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'RBUF')) || // 4.18  RBUF Recommended buffer size
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'BUF'))) {     // 4.19  BUF  Recommended buffer size
-			//   There may only be one 'RBUF' frame in each tag
-			// <Header for 'Recommended buffer size', ID: 'RBUF'>
-			// Buffer size               $xx xx xx
-			// Embedded info flag        %0000000x
-			// Offset to next tag        $xx xx xx xx
-
-			$frame_offset = 0;
-			$parsedFrame['buffersize'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 3));
-			$frame_offset += 3;
-
-			$frame_embeddedinfoflags = getid3_lib::BigEndian2Bin(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['flags']['embededinfo'] = (bool) substr($frame_embeddedinfoflags, 7, 1);
-			$parsedFrame['nexttagoffset'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
-			unset($parsedFrame['data']);
-
-
-		} elseif (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'CRM')) { // 4.20  Encrypted meta frame (ID3v2.2 only)
-			//   There may be more than one 'CRM' frame in a tag,
-			//   but only one with the same 'owner identifier'
-			// <Header for 'Encrypted meta frame', ID: 'CRM'>
-			// Owner identifier      <textstring> $00 (00)
-			// Content/explanation   <textstring> $00 (00)
-			// Encrypted datablock   <binary data>
-
-			$frame_offset = 0;
-			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-			$frame_ownerid = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			$frame_offset = $frame_terminatorpos + strlen("\x00");
-
-			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-			$frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			if (ord($frame_description) === 0) {
-				$frame_description = '';
-			}
-			$frame_offset = $frame_terminatorpos + strlen("\x00");
-
-			$parsedFrame['ownerid']     = $frame_ownerid;
-			$parsedFrame['data']        = (string) substr($parsedFrame['data'], $frame_offset);
-			$parsedFrame['description'] = $frame_description;
-			unset($parsedFrame['data']);
-
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'AENC')) || // 4.19  AENC Audio encryption
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'CRA'))) {     // 4.21  CRA  Audio encryption
-			//   There may be more than one 'AENC' frames in a tag,
-			//   but only one with the same 'Owner identifier'
-			// <Header for 'Audio encryption', ID: 'AENC'>
-			// Owner identifier   <text string> $00
-			// Preview start      $xx xx
-			// Preview length     $xx xx
-			// Encryption info    <binary data>
-
-			$frame_offset = 0;
-			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-			$frame_ownerid = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			if (ord($frame_ownerid) === 0) {
-				$frame_ownerid == '';
-			}
-			$frame_offset = $frame_terminatorpos + strlen("\x00");
-			$parsedFrame['ownerid'] = $frame_ownerid;
-			$parsedFrame['previewstart'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 2));
-			$frame_offset += 2;
-			$parsedFrame['previewlength'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 2));
-			$frame_offset += 2;
-			$parsedFrame['encryptioninfo'] = (string) substr($parsedFrame['data'], $frame_offset);
-			unset($parsedFrame['data']);
-
-
-		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'LINK')) || // 4.20  LINK Linked information
-				(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'LNK'))) {     // 4.22  LNK  Linked information
-			//   There may be more than one 'LINK' frame in a tag,
-			//   but only one with the same contents
-			// <Header for 'Linked information', ID: 'LINK'>
-			// ID3v2.3+ => Frame identifier   $xx xx xx xx
-			// ID3v2.2  => Frame identifier   $xx xx xx
-			// URL                            <text string> $00
-			// ID and additional data         <text string(s)>
-
-			$frame_offset = 0;
-			if ($id3v2_majorversion == 2) {
-				$parsedFrame['frameid'] = substr($parsedFrame['data'], $frame_offset, 3);
-				$frame_offset += 3;
-			} else {
-				$parsedFrame['frameid'] = substr($parsedFrame['data'], $frame_offset, 4);
-				$frame_offset += 4;
-			}
-
-			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-			$frame_url = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			if (ord($frame_url) === 0) {
-				$frame_url = '';
-			}
-			$frame_offset = $frame_terminatorpos + strlen("\x00");
-			$parsedFrame['url'] = $frame_url;
-
-			$parsedFrame['additionaldata'] = (string) substr($parsedFrame['data'], $frame_offset);
-			if (!empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
-				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = utf8_encode($parsedFrame['url']);
-			}
-			unset($parsedFrame['data']);
-
-
-		} elseif (($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'POSS')) { // 4.21  POSS Position synchronisation frame (ID3v2.3+ only)
-			//   There may only be one 'POSS' frame in each tag
-			// <Head for 'Position synchronisation', ID: 'POSS'>
-			// Time stamp format         $xx
-			// Position                  $xx (xx ...)
-
-			$frame_offset = 0;
-			$parsedFrame['timestampformat'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['position']        = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset));
-			unset($parsedFrame['data']);
-
-
-		} elseif (($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'USER')) { // 4.22  USER Terms of use (ID3v2.3+ only)
-			//   There may be more than one 'Terms of use' frame in a tag,
-			//   but only one with the same 'Language'
-			// <Header for 'Terms of use frame', ID: 'USER'>
-			// Text encoding        $xx
-			// Language             $xx xx xx
-			// The actual text      <text string according to encoding>
-
-			$frame_offset = 0;
-			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
-				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
-			}
-			$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
-			$frame_offset += 3;
-			$parsedFrame['language']     = $frame_language;
-			$parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
-			$parsedFrame['encodingid']   = $frame_textencoding;
-			$parsedFrame['encoding']     = $this->TextEncodingNameLookup($frame_textencoding);
-
-			$parsedFrame['data']         = (string) substr($parsedFrame['data'], $frame_offset);
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
-			}
-			unset($parsedFrame['data']);
-
-
-		} elseif (($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'OWNE')) { // 4.23  OWNE Ownership frame (ID3v2.3+ only)
-			//   There may only be one 'OWNE' frame in a tag
-			// <Header for 'Ownership frame', ID: 'OWNE'>
-			// Text encoding     $xx
-			// Price paid        <text string> $00
-			// Date of purch.    <text string>
-			// Seller            <text string according to encoding>
-
-			$frame_offset = 0;
-			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
-				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
-			}
-			$parsedFrame['encodingid'] = $frame_textencoding;
-			$parsedFrame['encoding']   = $this->TextEncodingNameLookup($frame_textencoding);
-
-			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-			$frame_pricepaid = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			$frame_offset = $frame_terminatorpos + strlen("\x00");
-
-			$parsedFrame['pricepaid']['currencyid'] = substr($frame_pricepaid, 0, 3);
-			$parsedFrame['pricepaid']['currency']   = $this->LookupCurrencyUnits($parsedFrame['pricepaid']['currencyid']);
-			$parsedFrame['pricepaid']['value']      = substr($frame_pricepaid, 3);
-
-			$parsedFrame['purchasedate'] = substr($parsedFrame['data'], $frame_offset, 8);
-			if (!$this->IsValidDateStampString($parsedFrame['purchasedate'])) {
-				$parsedFrame['purchasedateunix'] = mktime (0, 0, 0, substr($parsedFrame['purchasedate'], 4, 2), substr($parsedFrame['purchasedate'], 6, 2), substr($parsedFrame['purchasedate'], 0, 4));
-			}
-			$frame_offset += 8;
-
-			$parsedFrame['seller'] = (string) substr($parsedFrame['data'], $frame_offset);
-			unset($parsedFrame['data']);
-
-
-		} elseif (($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'COMR')) { // 4.24  COMR Commercial frame (ID3v2.3+ only)
-			//   There may be more than one 'commercial frame' in a tag,
-			//   but no two may be identical
-			// <Header for 'Commercial frame', ID: 'COMR'>
-			// Text encoding      $xx
-			// Price string       <text string> $00
-			// Valid until        <text string>
-			// Contact URL        <text string> $00
-			// Received as        $xx
-			// Name of seller     <text string according to encoding> $00 (00)
-			// Description        <text string according to encoding> $00 (00)
-			// Picture MIME type  <string> $00
-			// Seller logo        <binary data>
-
-			$frame_offset = 0;
-			$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
-				$info['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
-			}
-
-			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-			$frame_pricestring = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			$frame_offset = $frame_terminatorpos + strlen("\x00");
-			$frame_rawpricearray = explode('/', $frame_pricestring);
-			foreach ($frame_rawpricearray as $key => $val) {
-				$frame_currencyid = substr($val, 0, 3);
-				$parsedFrame['price'][$frame_currencyid]['currency'] = $this->LookupCurrencyUnits($frame_currencyid);
-				$parsedFrame['price'][$frame_currencyid]['value']    = substr($val, 3);
-			}
-
-			$frame_datestring = substr($parsedFrame['data'], $frame_offset, 8);
-			$frame_offset += 8;
-
-			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-			$frame_contacturl = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			$frame_offset = $frame_terminatorpos + strlen("\x00");
-
-			$frame_receivedasid = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
-				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
-			}
-			$frame_sellername = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			if (ord($frame_sellername) === 0) {
-				$frame_sellername = '';
-			}
-			$frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding));
-
-			$frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
-			if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
-				$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
-			}
-			$frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			if (ord($frame_description) === 0) {
-				$frame_description = '';
-			}
-			$frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding));
-
-			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-			$frame_mimetype = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			$frame_offset = $frame_terminatorpos + strlen("\x00");
-
-			$frame_sellerlogo = substr($parsedFrame['data'], $frame_offset);
-
-			$parsedFrame['encodingid']        = $frame_textencoding;
-			$parsedFrame['encoding']          = $this->TextEncodingNameLookup($frame_textencoding);
-
-			$parsedFrame['pricevaliduntil']   = $frame_datestring;
-			$parsedFrame['contacturl']        = $frame_contacturl;
-			$parsedFrame['receivedasid']      = $frame_receivedasid;
-			$parsedFrame['receivedas']        = $this->COMRReceivedAsLookup($frame_receivedasid);
-			$parsedFrame['sellername']        = $frame_sellername;
-			$parsedFrame['description']       = $frame_description;
-			$parsedFrame['mime']              = $frame_mimetype;
-			$parsedFrame['logo']              = $frame_sellerlogo;
-			unset($parsedFrame['data']);
-
-
-		} elseif (($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'ENCR')) { // 4.25  ENCR Encryption method registration (ID3v2.3+ only)
-			//   There may be several 'ENCR' frames in a tag,
-			//   but only one containing the same symbol
-			//   and only one containing the same owner identifier
-			// <Header for 'Encryption method registration', ID: 'ENCR'>
-			// Owner identifier    <text string> $00
-			// Method symbol       $xx
-			// Encryption data     <binary data>
-
-			$frame_offset = 0;
-			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-			$frame_ownerid = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			if (ord($frame_ownerid) === 0) {
-				$frame_ownerid = '';
-			}
-			$frame_offset = $frame_terminatorpos + strlen("\x00");
-
-			$parsedFrame['ownerid']      = $frame_ownerid;
-			$parsedFrame['methodsymbol'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['data']         = (string) substr($parsedFrame['data'], $frame_offset);
-
-
-		} elseif (($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'GRID')) { // 4.26  GRID Group identification registration (ID3v2.3+ only)
-
-			//   There may be several 'GRID' frames in a tag,
-			//   but only one containing the same symbol
-			//   and only one containing the same owner identifier
-			// <Header for 'Group ID registration', ID: 'GRID'>
-			// Owner identifier      <text string> $00
-			// Group symbol          $xx
-			// Group dependent data  <binary data>
-
-			$frame_offset = 0;
-			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-			$frame_ownerid = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			if (ord($frame_ownerid) === 0) {
-				$frame_ownerid = '';
-			}
-			$frame_offset = $frame_terminatorpos + strlen("\x00");
-
-			$parsedFrame['ownerid']       = $frame_ownerid;
-			$parsedFrame['groupsymbol']   = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['data']          = (string) substr($parsedFrame['data'], $frame_offset);
-
-
-		} elseif (($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'PRIV')) { // 4.27  PRIV Private frame (ID3v2.3+ only)
-			//   The tag may contain more than one 'PRIV' frame
-			//   but only with different contents
-			// <Header for 'Private frame', ID: 'PRIV'>
-			// Owner identifier      <text string> $00
-			// The private data      <binary data>
-
-			$frame_offset = 0;
-			$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
-			$frame_ownerid = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-			if (ord($frame_ownerid) === 0) {
-				$frame_ownerid = '';
-			}
-			$frame_offset = $frame_terminatorpos + strlen("\x00");
-
-			$parsedFrame['ownerid'] = $frame_ownerid;
-			$parsedFrame['data']    = (string) substr($parsedFrame['data'], $frame_offset);
-
-
-		} elseif (($id3v2_majorversion >= 4) && ($parsedFrame['frame_name'] == 'SIGN')) { // 4.28  SIGN Signature frame (ID3v2.4+ only)
-			//   There may be more than one 'signature frame' in a tag,
-			//   but no two may be identical
-			// <Header for 'Signature frame', ID: 'SIGN'>
-			// Group symbol      $xx
-			// Signature         <binary data>
-
-			$frame_offset = 0;
-			$parsedFrame['groupsymbol'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$parsedFrame['data']        = (string) substr($parsedFrame['data'], $frame_offset);
-
-
-		} elseif (($id3v2_majorversion >= 4) && ($parsedFrame['frame_name'] == 'SEEK')) { // 4.29  SEEK Seek frame (ID3v2.4+ only)
-			//   There may only be one 'seek frame' in a tag
-			// <Header for 'Seek frame', ID: 'SEEK'>
-			// Minimum offset to next tag       $xx xx xx xx
-
-			$frame_offset = 0;
-			$parsedFrame['data']          = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
-
-
-		} elseif (($id3v2_majorversion >= 4) && ($parsedFrame['frame_name'] == 'ASPI')) { // 4.30  ASPI Audio seek point index (ID3v2.4+ only)
-			//   There may only be one 'audio seek point index' frame in a tag
-			// <Header for 'Seek Point Index', ID: 'ASPI'>
-			// Indexed data start (S)         $xx xx xx xx
-			// Indexed data length (L)        $xx xx xx xx
-			// Number of index points (N)     $xx xx
-			// Bits per index point (b)       $xx
-			//   Then for every index point the following data is included:
-			// Fraction at index (Fi)          $xx (xx)
-
-			$frame_offset = 0;
-			$parsedFrame['datastart'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
-			$frame_offset += 4;
-			$parsedFrame['indexeddatalength'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
-			$frame_offset += 4;
-			$parsedFrame['indexpoints'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 2));
-			$frame_offset += 2;
-			$parsedFrame['bitsperpoint'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-			$frame_bytesperpoint = ceil($parsedFrame['bitsperpoint'] / 8);
-			for ($i = 0; $i < $frame_indexpoints; $i++) {
-				$parsedFrame['indexes'][$i] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesperpoint));
-				$frame_offset += $frame_bytesperpoint;
-			}
-			unset($parsedFrame['data']);
-
-		} elseif (($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'RGAD')) { // Replay Gain Adjustment
-			// http://privatewww.essex.ac.uk/~djmrob/replaygain/file_format_id3v2.html
-			//   There may only be one 'RGAD' frame in a tag
-			// <Header for 'Replay Gain Adjustment', ID: 'RGAD'>
-			// Peak Amplitude                      $xx $xx $xx $xx
-			// Radio Replay Gain Adjustment        %aaabbbcd %dddddddd
-			// Audiophile Replay Gain Adjustment   %aaabbbcd %dddddddd
-			//   a - name code
-			//   b - originator code
-			//   c - sign bit
-			//   d - replay gain adjustment
-
-			$frame_offset = 0;
-			$parsedFrame['peakamplitude'] = getid3_lib::BigEndian2Float(substr($parsedFrame['data'], $frame_offset, 4));
-			$frame_offset += 4;
-			$rg_track_adjustment = getid3_lib::Dec2Bin(substr($parsedFrame['data'], $frame_offset, 2));
-			$frame_offset += 2;
-			$rg_album_adjustment = getid3_lib::Dec2Bin(substr($parsedFrame['data'], $frame_offset, 2));
-			$frame_offset += 2;
-			$parsedFrame['raw']['track']['name']       = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 0, 3));
-			$parsedFrame['raw']['track']['originator'] = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 3, 3));
-			$parsedFrame['raw']['track']['signbit']    = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 6, 1));
-			$parsedFrame['raw']['track']['adjustment'] = getid3_lib::Bin2Dec(substr($rg_track_adjustment, 7, 9));
-			$parsedFrame['raw']['album']['name']       = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 0, 3));
-			$parsedFrame['raw']['album']['originator'] = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 3, 3));
-			$parsedFrame['raw']['album']['signbit']    = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 6, 1));
-			$parsedFrame['raw']['album']['adjustment'] = getid3_lib::Bin2Dec(substr($rg_album_adjustment, 7, 9));
-			$parsedFrame['track']['name']       = getid3_lib::RGADnameLookup($parsedFrame['raw']['track']['name']);
-			$parsedFrame['track']['originator'] = getid3_lib::RGADoriginatorLookup($parsedFrame['raw']['track']['originator']);
-			$parsedFrame['track']['adjustment'] = getid3_lib::RGADadjustmentLookup($parsedFrame['raw']['track']['adjustment'], $parsedFrame['raw']['track']['signbit']);
-			$parsedFrame['album']['name']       = getid3_lib::RGADnameLookup($parsedFrame['raw']['album']['name']);
-			$parsedFrame['album']['originator'] = getid3_lib::RGADoriginatorLookup($parsedFrame['raw']['album']['originator']);
-			$parsedFrame['album']['adjustment'] = getid3_lib::RGADadjustmentLookup($parsedFrame['raw']['album']['adjustment'], $parsedFrame['raw']['album']['signbit']);
-
-			$info['replay_gain']['track']['peak']       = $parsedFrame['peakamplitude'];
-			$info['replay_gain']['track']['originator'] = $parsedFrame['track']['originator'];
-			$info['replay_gain']['track']['adjustment'] = $parsedFrame['track']['adjustment'];
-			$info['replay_gain']['album']['originator'] = $parsedFrame['album']['originator'];
-			$info['replay_gain']['album']['adjustment'] = $parsedFrame['album']['adjustment'];
-
-			unset($parsedFrame['data']);
-
-		}
-
-		return true;
-	}
-
-
-	function DeUnsynchronise($data) {
-		return str_replace("\xFF\x00", "\xFF", $data);
-	}
-
-	function LookupExtendedHeaderRestrictionsTagSizeLimits($index) {
-		static $LookupExtendedHeaderRestrictionsTagSizeLimits = array(
-			0x00 => 'No more than 128 frames and 1 MB total tag size',
-			0x01 => 'No more than 64 frames and 128 KB total tag size',
-			0x02 => 'No more than 32 frames and 40 KB total tag size',
-			0x03 => 'No more than 32 frames and 4 KB total tag size',
-		);
-		return (isset($LookupExtendedHeaderRestrictionsTagSizeLimits[$index]) ? $LookupExtendedHeaderRestrictionsTagSizeLimits[$index] : '');
-	}
-
-	function LookupExtendedHeaderRestrictionsTextEncodings($index) {
-		static $LookupExtendedHeaderRestrictionsTextEncodings = array(
-			0x00 => 'No restrictions',
-			0x01 => 'Strings are only encoded with ISO-8859-1 or UTF-8',
-		);
-		return (isset($LookupExtendedHeaderRestrictionsTextEncodings[$index]) ? $LookupExtendedHeaderRestrictionsTextEncodings[$index] : '');
-	}
-
-	function LookupExtendedHeaderRestrictionsTextFieldSize($index) {
-		static $LookupExtendedHeaderRestrictionsTextFieldSize = array(
-			0x00 => 'No restrictions',
-			0x01 => 'No string is longer than 1024 characters',
-			0x02 => 'No string is longer than 128 characters',
-			0x03 => 'No string is longer than 30 characters',
-		);
-		return (isset($LookupExtendedHeaderRestrictionsTextFieldSize[$index]) ? $LookupExtendedHeaderRestrictionsTextFieldSize[$index] : '');
-	}
-
-	function LookupExtendedHeaderRestrictionsImageEncoding($index) {
-		static $LookupExtendedHeaderRestrictionsImageEncoding = array(
-			0x00 => 'No restrictions',
-			0x01 => 'Images are encoded only with PNG or JPEG',
-		);
-		return (isset($LookupExtendedHeaderRestrictionsImageEncoding[$index]) ? $LookupExtendedHeaderRestrictionsImageEncoding[$index] : '');
-	}
-
-	function LookupExtendedHeaderRestrictionsImageSizeSize($index) {
-		static $LookupExtendedHeaderRestrictionsImageSizeSize = array(
-			0x00 => 'No restrictions',
-			0x01 => 'All images are 256x256 pixels or smaller',
-			0x02 => 'All images are 64x64 pixels or smaller',
-			0x03 => 'All images are exactly 64x64 pixels, unless required otherwise',
-		);
-		return (isset($LookupExtendedHeaderRestrictionsImageSizeSize[$index]) ? $LookupExtendedHeaderRestrictionsImageSizeSize[$index] : '');
-	}
-
-	function LookupCurrencyUnits($currencyid) {
-
-		$begin = __LINE__;
-
-		/** This is not a comment!
-
-
-			AED	Dirhams
-			AFA	Afghanis
-			ALL	Leke
-			AMD	Drams
-			ANG	Guilders
-			AOA	Kwanza
-			ARS	Pesos
-			ATS	Schillings
-			AUD	Dollars
-			AWG	Guilders
-			AZM	Manats
-			BAM	Convertible Marka
-			BBD	Dollars
-			BDT	Taka
-			BEF	Francs
-			BGL	Leva
-			BHD	Dinars
-			BIF	Francs
-			BMD	Dollars
-			BND	Dollars
-			BOB	Bolivianos
-			BRL	Brazil Real
-			BSD	Dollars
-			BTN	Ngultrum
-			BWP	Pulas
-			BYR	Rubles
-			BZD	Dollars
-			CAD	Dollars
-			CDF	Congolese Francs
-			CHF	Francs
-			CLP	Pesos
-			CNY	Yuan Renminbi
-			COP	Pesos
-			CRC	Colones
-			CUP	Pesos
-			CVE	Escudos
-			CYP	Pounds
-			CZK	Koruny
-			DEM	Deutsche Marks
-			DJF	Francs
-			DKK	Kroner
-			DOP	Pesos
-			DZD	Algeria Dinars
-			EEK	Krooni
-			EGP	Pounds
-			ERN	Nakfa
-			ESP	Pesetas
-			ETB	Birr
-			EUR	Euro
-			FIM	Markkaa
-			FJD	Dollars
-			FKP	Pounds
-			FRF	Francs
-			GBP	Pounds
-			GEL	Lari
-			GGP	Pounds
-			GHC	Cedis
-			GIP	Pounds
-			GMD	Dalasi
-			GNF	Francs
-			GRD	Drachmae
-			GTQ	Quetzales
-			GYD	Dollars
-			HKD	Dollars
-			HNL	Lempiras
-			HRK	Kuna
-			HTG	Gourdes
-			HUF	Forints
-			IDR	Rupiahs
-			IEP	Pounds
-			ILS	New Shekels
-			IMP	Pounds
-			INR	Rupees
-			IQD	Dinars
-			IRR	Rials
-			ISK	Kronur
-			ITL	Lire
-			JEP	Pounds
-			JMD	Dollars
-			JOD	Dinars
-			JPY	Yen
-			KES	Shillings
-			KGS	Soms
-			KHR	Riels
-			KMF	Francs
-			KPW	Won
-			KWD	Dinars
-			KYD	Dollars
-			KZT	Tenge
-			LAK	Kips
-			LBP	Pounds
-			LKR	Rupees
-			LRD	Dollars
-			LSL	Maloti
-			LTL	Litai
-			LUF	Francs
-			LVL	Lati
-			LYD	Dinars
-			MAD	Dirhams
-			MDL	Lei
-			MGF	Malagasy Francs
-			MKD	Denars
-			MMK	Kyats
-			MNT	Tugriks
-			MOP	Patacas
-			MRO	Ouguiyas
-			MTL	Liri
-			MUR	Rupees
-			MVR	Rufiyaa
-			MWK	Kwachas
-			MXN	Pesos
-			MYR	Ringgits
-			MZM	Meticais
-			NAD	Dollars
-			NGN	Nairas
-			NIO	Gold Cordobas
-			NLG	Guilders
-			NOK	Krone
-			NPR	Nepal Rupees
-			NZD	Dollars
-			OMR	Rials
-			PAB	Balboa
-			PEN	Nuevos Soles
-			PGK	Kina
-			PHP	Pesos
-			PKR	Rupees
-			PLN	Zlotych
-			PTE	Escudos
-			PYG	Guarani
-			QAR	Rials
-			ROL	Lei
-			RUR	Rubles
-			RWF	Rwanda Francs
-			SAR	Riyals
-			SBD	Dollars
-			SCR	Rupees
-			SDD	Dinars
-			SEK	Kronor
-			SGD	Dollars
-			SHP	Pounds
-			SIT	Tolars
-			SKK	Koruny
-			SLL	Leones
-			SOS	Shillings
-			SPL	Luigini
-			SRG	Guilders
-			STD	Dobras
-			SVC	Colones
-			SYP	Pounds
-			SZL	Emalangeni
-			THB	Baht
-			TJR	Rubles
-			TMM	Manats
-			TND	Dinars
-			TOP	Pa'anga
-			TRL	Liras
-			TTD	Dollars
-			TVD	Tuvalu Dollars
-			TWD	New Dollars
-			TZS	Shillings
-			UAH	Hryvnia
-			UGX	Shillings
-			USD	Dollars
-			UYU	Pesos
-			UZS	Sums
-			VAL	Lire
-			VEB	Bolivares
-			VND	Dong
-			VUV	Vatu
-			WST	Tala
-			XAF	Francs
-			XAG	Ounces
-			XAU	Ounces
-			XCD	Dollars
-			XDR	Special Drawing Rights
-			XPD	Ounces
-			XPF	Francs
-			XPT	Ounces
-			YER	Rials
-			YUM	New Dinars
-			ZAR	Rand
-			ZMK	Kwacha
-			ZWD	Zimbabwe Dollars
-
-		*/
-
-		return getid3_lib::EmbeddedLookup($currencyid, $begin, __LINE__, __FILE__, 'id3v2-currency-units');
-	}
-
-
-	function LookupCurrencyCountry($currencyid) {
-
-		$begin = __LINE__;
-
-		/** This is not a comment!
-
-			AED	United Arab Emirates
-			AFA	Afghanistan
-			ALL	Albania
-			AMD	Armenia
-			ANG	Netherlands Antilles
-			AOA	Angola
-			ARS	Argentina
-			ATS	Austria
-			AUD	Australia
-			AWG	Aruba
-			AZM	Azerbaijan
-			BAM	Bosnia and Herzegovina
-			BBD	Barbados
-			BDT	Bangladesh
-			BEF	Belgium
-			BGL	Bulgaria
-			BHD	Bahrain
-			BIF	Burundi
-			BMD	Bermuda
-			BND	Brunei Darussalam
-			BOB	Bolivia
-			BRL	Brazil
-			BSD	Bahamas
-			BTN	Bhutan
-			BWP	Botswana
-			BYR	Belarus
-			BZD	Belize
-			CAD	Canada
-			CDF	Congo/Kinshasa
-			CHF	Switzerland
-			CLP	Chile
-			CNY	China
-			COP	Colombia
-			CRC	Costa Rica
-			CUP	Cuba
-			CVE	Cape Verde
-			CYP	Cyprus
-			CZK	Czech Republic
-			DEM	Germany
-			DJF	Djibouti
-			DKK	Denmark
-			DOP	Dominican Republic
-			DZD	Algeria
-			EEK	Estonia
-			EGP	Egypt
-			ERN	Eritrea
-			ESP	Spain
-			ETB	Ethiopia
-			EUR	Euro Member Countries
-			FIM	Finland
-			FJD	Fiji
-			FKP	Falkland Islands (Malvinas)
-			FRF	France
-			GBP	United Kingdom
-			GEL	Georgia
-			GGP	Guernsey
-			GHC	Ghana
-			GIP	Gibraltar
-			GMD	Gambia
-			GNF	Guinea
-			GRD	Greece
-			GTQ	Guatemala
-			GYD	Guyana
-			HKD	Hong Kong
-			HNL	Honduras
-			HRK	Croatia
-			HTG	Haiti
-			HUF	Hungary
-			IDR	Indonesia
-			IEP	Ireland (Eire)
-			ILS	Israel
-			IMP	Isle of Man
-			INR	India
-			IQD	Iraq
-			IRR	Iran
-			ISK	Iceland
-			ITL	Italy
-			JEP	Jersey
-			JMD	Jamaica
-			JOD	Jordan
-			JPY	Japan
-			KES	Kenya
-			KGS	Kyrgyzstan
-			KHR	Cambodia
-			KMF	Comoros
-			KPW	Korea
-			KWD	Kuwait
-			KYD	Cayman Islands
-			KZT	Kazakstan
-			LAK	Laos
-			LBP	Lebanon
-			LKR	Sri Lanka
-			LRD	Liberia
-			LSL	Lesotho
-			LTL	Lithuania
-			LUF	Luxembourg
-			LVL	Latvia
-			LYD	Libya
-			MAD	Morocco
-			MDL	Moldova
-			MGF	Madagascar
-			MKD	Macedonia
-			MMK	Myanmar (Burma)
-			MNT	Mongolia
-			MOP	Macau
-			MRO	Mauritania
-			MTL	Malta
-			MUR	Mauritius
-			MVR	Maldives (Maldive Islands)
-			MWK	Malawi
-			MXN	Mexico
-			MYR	Malaysia
-			MZM	Mozambique
-			NAD	Namibia
-			NGN	Nigeria
-			NIO	Nicaragua
-			NLG	Netherlands (Holland)
-			NOK	Norway
-			NPR	Nepal
-			NZD	New Zealand
-			OMR	Oman
-			PAB	Panama
-			PEN	Peru
-			PGK	Papua New Guinea
-			PHP	Philippines
-			PKR	Pakistan
-			PLN	Poland
-			PTE	Portugal
-			PYG	Paraguay
-			QAR	Qatar
-			ROL	Romania
-			RUR	Russia
-			RWF	Rwanda
-			SAR	Saudi Arabia
-			SBD	Solomon Islands
-			SCR	Seychelles
-			SDD	Sudan
-			SEK	Sweden
-			SGD	Singapore
-			SHP	Saint Helena
-			SIT	Slovenia
-			SKK	Slovakia
-			SLL	Sierra Leone
-			SOS	Somalia
-			SPL	Seborga
-			SRG	Suriname
-			STD	S�o Tome and Principe
-			SVC	El Salvador
-			SYP	Syria
-			SZL	Swaziland
-			THB	Thailand
-			TJR	Tajikistan
-			TMM	Turkmenistan
-			TND	Tunisia
-			TOP	Tonga
-			TRL	Turkey
-			TTD	Trinidad and Tobago
-			TVD	Tuvalu
-			TWD	Taiwan
-			TZS	Tanzania
-			UAH	Ukraine
-			UGX	Uganda
-			USD	United States of America
-			UYU	Uruguay
-			UZS	Uzbekistan
-			VAL	Vatican City
-			VEB	Venezuela
-			VND	Viet Nam
-			VUV	Vanuatu
-			WST	Samoa
-			XAF	Communaut� Financi�re Africaine
-			XAG	Silver
-			XAU	Gold
-			XCD	East Caribbean
-			XDR	International Monetary Fund
-			XPD	Palladium
-			XPF	Comptoirs Fran�ais du Pacifique
-			XPT	Platinum
-			YER	Yemen
-			YUM	Yugoslavia
-			ZAR	South Africa
-			ZMK	Zambia
-			ZWD	Zimbabwe
-
-		*/
-
-		return getid3_lib::EmbeddedLookup($currencyid, $begin, __LINE__, __FILE__, 'id3v2-currency-country');
-	}
-
-
-
-	static function LanguageLookup($languagecode, $casesensitive=false) {
-
-		if (!$casesensitive) {
-			$languagecode = strtolower($languagecode);
-		}
-
-		// http://www.id3.org/id3v2.4.0-structure.txt
-		// [4.   ID3v2 frame overview]
-		// The three byte language field, present in several frames, is used to
-		// describe the language of the frame's content, according to ISO-639-2
-		// [ISO-639-2]. The language should be represented in lower case. If the
-		// language is not known the string "XXX" should be used.
-
-
-		// ISO 639-2 - http://www.id3.org/iso639-2.html
-
-		$begin = __LINE__;
-
-		/** This is not a comment!
-
-			XXX	unknown
-			xxx	unknown
-			aar	Afar
-			abk	Abkhazian
-			ace	Achinese
-			ach	Acoli
-			ada	Adangme
-			afa	Afro-Asiatic (Other)
-			afh	Afrihili
-			afr	Afrikaans
-			aka	Akan
-			akk	Akkadian
-			alb	Albanian
-			ale	Aleut
-			alg	Algonquian Languages
-			amh	Amharic
-			ang	English, Old (ca. 450-1100)
-			apa	Apache Languages
-			ara	Arabic
-			arc	Aramaic
-			arm	Armenian
-			arn	Araucanian
-			arp	Arapaho
-			art	Artificial (Other)
-			arw	Arawak
-			asm	Assamese
-			ath	Athapascan Languages
-			ava	Avaric
-			ave	Avestan
-			awa	Awadhi
-			aym	Aymara
-			aze	Azerbaijani
-			bad	Banda
-			bai	Bamileke Languages
-			bak	Bashkir
-			bal	Baluchi
-			bam	Bambara
-			ban	Balinese
-			baq	Basque
-			bas	Basa
-			bat	Baltic (Other)
-			bej	Beja
-			bel	Byelorussian
-			bem	Bemba
-			ben	Bengali
-			ber	Berber (Other)
-			bho	Bhojpuri
-			bih	Bihari
-			bik	Bikol
-			bin	Bini
-			bis	Bislama
-			bla	Siksika
-			bnt	Bantu (Other)
-			bod	Tibetan
-			bra	Braj
-			bre	Breton
-			bua	Buriat
-			bug	Buginese
-			bul	Bulgarian
-			bur	Burmese
-			cad	Caddo
-			cai	Central American Indian (Other)
-			car	Carib
-			cat	Catalan
-			cau	Caucasian (Other)
-			ceb	Cebuano
-			cel	Celtic (Other)
-			ces	Czech
-			cha	Chamorro
-			chb	Chibcha
-			che	Chechen
-			chg	Chagatai
-			chi	Chinese
-			chm	Mari
-			chn	Chinook jargon
-			cho	Choctaw
-			chr	Cherokee
-			chu	Church Slavic
-			chv	Chuvash
-			chy	Cheyenne
-			cop	Coptic
-			cor	Cornish
-			cos	Corsican
-			cpe	Creoles and Pidgins, English-based (Other)
-			cpf	Creoles and Pidgins, French-based (Other)
-			cpp	Creoles and Pidgins, Portuguese-based (Other)
-			cre	Cree
-			crp	Creoles and Pidgins (Other)
-			cus	Cushitic (Other)
-			cym	Welsh
-			cze	Czech
-			dak	Dakota
-			dan	Danish
-			del	Delaware
-			deu	German
-			din	Dinka
-			div	Divehi
-			doi	Dogri
-			dra	Dravidian (Other)
-			dua	Duala
-			dum	Dutch, Middle (ca. 1050-1350)
-			dut	Dutch
-			dyu	Dyula
-			dzo	Dzongkha
-			efi	Efik
-			egy	Egyptian (Ancient)
-			eka	Ekajuk
-			ell	Greek, Modern (1453-)
-			elx	Elamite
-			eng	English
-			enm	English, Middle (ca. 1100-1500)
-			epo	Esperanto
-			esk	Eskimo (Other)
-			esl	Spanish
-			est	Estonian
-			eus	Basque
-			ewe	Ewe
-			ewo	Ewondo
-			fan	Fang
-			fao	Faroese
-			fas	Persian
-			fat	Fanti
-			fij	Fijian
-			fin	Finnish
-			fiu	Finno-Ugrian (Other)
-			fon	Fon
-			fra	French
-			fre	French
-			frm	French, Middle (ca. 1400-1600)
-			fro	French, Old (842- ca. 1400)
-			fry	Frisian
-			ful	Fulah
-			gaa	Ga
-			gae	Gaelic (Scots)
-			gai	Irish
-			gay	Gayo
-			gdh	Gaelic (Scots)
-			gem	Germanic (Other)
-			geo	Georgian
-			ger	German
-			gez	Geez
-			gil	Gilbertese
-			glg	Gallegan
-			gmh	German, Middle High (ca. 1050-1500)
-			goh	German, Old High (ca. 750-1050)
-			gon	Gondi
-			got	Gothic
-			grb	Grebo
-			grc	Greek, Ancient (to 1453)
-			gre	Greek, Modern (1453-)
-			grn	Guarani
-			guj	Gujarati
-			hai	Haida
-			hau	Hausa
-			haw	Hawaiian
-			heb	Hebrew
-			her	Herero
-			hil	Hiligaynon
-			him	Himachali
-			hin	Hindi
-			hmo	Hiri Motu
-			hun	Hungarian
-			hup	Hupa
-			hye	Armenian
-			iba	Iban
-			ibo	Igbo
-			ice	Icelandic
-			ijo	Ijo
-			iku	Inuktitut
-			ilo	Iloko
-			ina	Interlingua (International Auxiliary language Association)
-			inc	Indic (Other)
-			ind	Indonesian
-			ine	Indo-European (Other)
-			ine	Interlingue
-			ipk	Inupiak
-			ira	Iranian (Other)
-			iri	Irish
-			iro	Iroquoian uages
-			isl	Icelandic
-			ita	Italian
-			jav	Javanese
-			jaw	Javanese
-			jpn	Japanese
-			jpr	Judeo-Persian
-			jrb	Judeo-Arabic
-			kaa	Kara-Kalpak
-			kab	Kabyle
-			kac	Kachin
-			kal	Greenlandic
-			kam	Kamba
-			kan	Kannada
-			kar	Karen
-			kas	Kashmiri
-			kat	Georgian
-			kau	Kanuri
-			kaw	Kawi
-			kaz	Kazakh
-			kha	Khasi
-			khi	Khoisan (Other)
-			khm	Khmer
-			kho	Khotanese
-			kik	Kikuyu
-			kin	Kinyarwanda
-			kir	Kirghiz
-			kok	Konkani
-			kom	Komi
-			kon	Kongo
-			kor	Korean
-			kpe	Kpelle
-			kro	Kru
-			kru	Kurukh
-			kua	Kuanyama
-			kum	Kumyk
-			kur	Kurdish
-			kus	Kusaie
-			kut	Kutenai
-			lad	Ladino
-			lah	Lahnda
-			lam	Lamba
-			lao	Lao
-			lat	Latin
-			lav	Latvian
-			lez	Lezghian
-			lin	Lingala
-			lit	Lithuanian
-			lol	Mongo
-			loz	Lozi
-			ltz	Letzeburgesch
-			lub	Luba-Katanga
-			lug	Ganda
-			lui	Luiseno
-			lun	Lunda
-			luo	Luo (Kenya and Tanzania)
-			mac	Macedonian
-			mad	Madurese
-			mag	Magahi
-			mah	Marshall
-			mai	Maithili
-			mak	Macedonian
-			mak	Makasar
-			mal	Malayalam
-			man	Mandingo
-			mao	Maori
-			map	Austronesian (Other)
-			mar	Marathi
-			mas	Masai
-			max	Manx
-			may	Malay
-			men	Mende
-			mga	Irish, Middle (900 - 1200)
-			mic	Micmac
-			min	Minangkabau
-			mis	Miscellaneous (Other)
-			mkh	Mon-Kmer (Other)
-			mlg	Malagasy
-			mlt	Maltese
-			mni	Manipuri
-			mno	Manobo Languages
-			moh	Mohawk
-			mol	Moldavian
-			mon	Mongolian
-			mos	Mossi
-			mri	Maori
-			msa	Malay
-			mul	Multiple Languages
-			mun	Munda Languages
-			mus	Creek
-			mwr	Marwari
-			mya	Burmese
-			myn	Mayan Languages
-			nah	Aztec
-			nai	North American Indian (Other)
-			nau	Nauru
-			nav	Navajo
-			nbl	Ndebele, South
-			nde	Ndebele, North
-			ndo	Ndongo
-			nep	Nepali
-			new	Newari
-			nic	Niger-Kordofanian (Other)
-			niu	Niuean
-			nla	Dutch
-			nno	Norwegian (Nynorsk)
-			non	Norse, Old
-			nor	Norwegian
-			nso	Sotho, Northern
-			nub	Nubian Languages
-			nya	Nyanja
-			nym	Nyamwezi
-			nyn	Nyankole
-			nyo	Nyoro
-			nzi	Nzima
-			oci	Langue d'Oc (post 1500)
-			oji	Ojibwa
-			ori	Oriya
-			orm	Oromo
-			osa	Osage
-			oss	Ossetic
-			ota	Turkish, Ottoman (1500 - 1928)
-			oto	Otomian Languages
-			paa	Papuan-Australian (Other)
-			pag	Pangasinan
-			pal	Pahlavi
-			pam	Pampanga
-			pan	Panjabi
-			pap	Papiamento
-			pau	Palauan
-			peo	Persian, Old (ca 600 - 400 B.C.)
-			per	Persian
-			phn	Phoenician
-			pli	Pali
-			pol	Polish
-			pon	Ponape
-			por	Portuguese
-			pra	Prakrit uages
-			pro	Provencal, Old (to 1500)
-			pus	Pushto
-			que	Quechua
-			raj	Rajasthani
-			rar	Rarotongan
-			roa	Romance (Other)
-			roh	Rhaeto-Romance
-			rom	Romany
-			ron	Romanian
-			rum	Romanian
-			run	Rundi
-			rus	Russian
-			sad	Sandawe
-			sag	Sango
-			sah	Yakut
-			sai	South American Indian (Other)
-			sal	Salishan Languages
-			sam	Samaritan Aramaic
-			san	Sanskrit
-			sco	Scots
-			scr	Serbo-Croatian
-			sel	Selkup
-			sem	Semitic (Other)
-			sga	Irish, Old (to 900)
-			shn	Shan
-			sid	Sidamo
-			sin	Singhalese
-			sio	Siouan Languages
-			sit	Sino-Tibetan (Other)
-			sla	Slavic (Other)
-			slk	Slovak
-			slo	Slovak
-			slv	Slovenian
-			smi	Sami Languages
-			smo	Samoan
-			sna	Shona
-			snd	Sindhi
-			sog	Sogdian
-			som	Somali
-			son	Songhai
-			sot	Sotho, Southern
-			spa	Spanish
-			sqi	Albanian
-			srd	Sardinian
-			srr	Serer
-			ssa	Nilo-Saharan (Other)
-			ssw	Siswant
-			ssw	Swazi
-			suk	Sukuma
-			sun	Sudanese
-			sus	Susu
-			sux	Sumerian
-			sve	Swedish
-			swa	Swahili
-			swe	Swedish
-			syr	Syriac
-			tah	Tahitian
-			tam	Tamil
-			tat	Tatar
-			tel	Telugu
-			tem	Timne
-			ter	Tereno
-			tgk	Tajik
-			tgl	Tagalog
-			tha	Thai
-			tib	Tibetan
-			tig	Tigre
-			tir	Tigrinya
-			tiv	Tivi
-			tli	Tlingit
-			tmh	Tamashek
-			tog	Tonga (Nyasa)
-			ton	Tonga (Tonga Islands)
-			tru	Truk
-			tsi	Tsimshian
-			tsn	Tswana
-			tso	Tsonga
-			tuk	Turkmen
-			tum	Tumbuka
-			tur	Turkish
-			tut	Altaic (Other)
-			twi	Twi
-			tyv	Tuvinian
-			uga	Ugaritic
-			uig	Uighur
-			ukr	Ukrainian
-			umb	Umbundu
-			und	Undetermined
-			urd	Urdu
-			uzb	Uzbek
-			vai	Vai
-			ven	Venda
-			vie	Vietnamese
-			vol	Volap�k
-			vot	Votic
-			wak	Wakashan Languages
-			wal	Walamo
-			war	Waray
-			was	Washo
-			wel	Welsh
-			wen	Sorbian Languages
-			wol	Wolof
-			xho	Xhosa
-			yao	Yao
-			yap	Yap
-			yid	Yiddish
-			yor	Yoruba
-			zap	Zapotec
-			zen	Zenaga
-			zha	Zhuang
-			zho	Chinese
-			zul	Zulu
-			zun	Zuni
-
-		*/
-
-		return getid3_lib::EmbeddedLookup($languagecode, $begin, __LINE__, __FILE__, 'id3v2-languagecode');
-	}
-
-
-	static function ETCOEventLookup($index) {
-		if (($index >= 0x17) && ($index <= 0xDF)) {
-			return 'reserved for future use';
-		}
-		if (($index >= 0xE0) && ($index <= 0xEF)) {
-			return 'not predefined synch 0-F';
-		}
-		if (($index >= 0xF0) && ($index <= 0xFC)) {
-			return 'reserved for future use';
-		}
-
-		static $EventLookup = array(
-			0x00 => 'padding (has no meaning)',
-			0x01 => 'end of initial silence',
-			0x02 => 'intro start',
-			0x03 => 'main part start',
-			0x04 => 'outro start',
-			0x05 => 'outro end',
-			0x06 => 'verse start',
-			0x07 => 'refrain start',
-			0x08 => 'interlude start',
-			0x09 => 'theme start',
-			0x0A => 'variation start',
-			0x0B => 'key change',
-			0x0C => 'time change',
-			0x0D => 'momentary unwanted noise (Snap, Crackle & Pop)',
-			0x0E => 'sustained noise',
-			0x0F => 'sustained noise end',
-			0x10 => 'intro end',
-			0x11 => 'main part end',
-			0x12 => 'verse end',
-			0x13 => 'refrain end',
-			0x14 => 'theme end',
-			0x15 => 'profanity',
-			0x16 => 'profanity end',
-			0xFD => 'audio end (start of silence)',
-			0xFE => 'audio file ends',
-			0xFF => 'one more byte of events follows'
-		);
-
-		return (isset($EventLookup[$index]) ? $EventLookup[$index] : '');
-	}
-
-	static function SYTLContentTypeLookup($index) {
-		static $SYTLContentTypeLookup = array(
-			0x00 => 'other',
-			0x01 => 'lyrics',
-			0x02 => 'text transcription',
-			0x03 => 'movement/part name', // (e.g. 'Adagio')
-			0x04 => 'events',             // (e.g. 'Don Quijote enters the stage')
-			0x05 => 'chord',              // (e.g. 'Bb F Fsus')
-			0x06 => 'trivia/\'pop up\' information',
-			0x07 => 'URLs to webpages',
-			0x08 => 'URLs to images'
-		);
-
-		return (isset($SYTLContentTypeLookup[$index]) ? $SYTLContentTypeLookup[$index] : '');
-	}
-
-	static function APICPictureTypeLookup($index, $returnarray=false) {
-		static $APICPictureTypeLookup = array(
-			0x00 => 'Other',
-			0x01 => '32x32 pixels \'file icon\' (PNG only)',
-			0x02 => 'Other file icon',
-			0x03 => 'Cover (front)',
-			0x04 => 'Cover (back)',
-			0x05 => 'Leaflet page',
-			0x06 => 'Media (e.g. label side of CD)',
-			0x07 => 'Lead artist/lead performer/soloist',
-			0x08 => 'Artist/performer',
-			0x09 => 'Conductor',
-			0x0A => 'Band/Orchestra',
-			0x0B => 'Composer',
-			0x0C => 'Lyricist/text writer',
-			0x0D => 'Recording Location',
-			0x0E => 'During recording',
-			0x0F => 'During performance',
-			0x10 => 'Movie/video screen capture',
-			0x11 => 'A bright coloured fish',
-			0x12 => 'Illustration',
-			0x13 => 'Band/artist logotype',
-			0x14 => 'Publisher/Studio logotype'
-		);
-		if ($returnarray) {
-			return $APICPictureTypeLookup;
-		}
-		return (isset($APICPictureTypeLookup[$index]) ? $APICPictureTypeLookup[$index] : '');
-	}
-
-	static function COMRReceivedAsLookup($index) {
-		static $COMRReceivedAsLookup = array(
-			0x00 => 'Other',
-			0x01 => 'Standard CD album with other songs',
-			0x02 => 'Compressed audio on CD',
-			0x03 => 'File over the Internet',
-			0x04 => 'Stream over the Internet',
-			0x05 => 'As note sheets',
-			0x06 => 'As note sheets in a book with other sheets',
-			0x07 => 'Music on other media',
-			0x08 => 'Non-musical merchandise'
-		);
-
-		return (isset($COMRReceivedAsLookup[$index]) ? $COMRReceivedAsLookup[$index] : '');
-	}
-
-	static function RVA2ChannelTypeLookup($index) {
-		static $RVA2ChannelTypeLookup = array(
-			0x00 => 'Other',
-			0x01 => 'Master volume',
-			0x02 => 'Front right',
-			0x03 => 'Front left',
-			0x04 => 'Back right',
-			0x05 => 'Back left',
-			0x06 => 'Front centre',
-			0x07 => 'Back centre',
-			0x08 => 'Subwoofer'
-		);
-
-		return (isset($RVA2ChannelTypeLookup[$index]) ? $RVA2ChannelTypeLookup[$index] : '');
-	}
-
-	static function FrameNameLongLookup($framename) {
-
-		$begin = __LINE__;
-
-		/** This is not a comment!
-
-			AENC	Audio encryption
-			APIC	Attached picture
-			ASPI	Audio seek point index
-			BUF	Recommended buffer size
-			CNT	Play counter
-			COM	Comments
-			COMM	Comments
-			COMR	Commercial frame
-			CRA	Audio encryption
-			CRM	Encrypted meta frame
-			ENCR	Encryption method registration
-			EQU	Equalisation
-			EQU2	Equalisation (2)
-			EQUA	Equalisation
-			ETC	Event timing codes
-			ETCO	Event timing codes
-			GEO	General encapsulated object
-			GEOB	General encapsulated object
-			GRID	Group identification registration
-			IPL	Involved people list
-			IPLS	Involved people list
-			LINK	Linked information
-			LNK	Linked information
-			MCDI	Music CD identifier
-			MCI	Music CD Identifier
-			MLL	MPEG location lookup table
-			MLLT	MPEG location lookup table
-			OWNE	Ownership frame
-			PCNT	Play counter
-			PIC	Attached picture
-			POP	Popularimeter
-			POPM	Popularimeter
-			POSS	Position synchronisation frame
-			PRIV	Private frame
-			RBUF	Recommended buffer size
-			REV	Reverb
-			RVA	Relative volume adjustment
-			RVA2	Relative volume adjustment (2)
-			RVAD	Relative volume adjustment
-			RVRB	Reverb
-			SEEK	Seek frame
-			SIGN	Signature frame
-			SLT	Synchronised lyric/text
-			STC	Synced tempo codes
-			SYLT	Synchronised lyric/text
-			SYTC	Synchronised tempo codes
-			TAL	Album/Movie/Show title
-			TALB	Album/Movie/Show title
-			TBP	BPM (Beats Per Minute)
-			TBPM	BPM (beats per minute)
-			TCM	Composer
-			TCMP	Part of a compilation
-			TCO	Content type
-			TCOM	Composer
-			TCON	Content type
-			TCOP	Copyright message
-			TCP	Part of a compilation
-			TCR	Copyright message
-			TDA	Date
-			TDAT	Date
-			TDEN	Encoding time
-			TDLY	Playlist delay
-			TDOR	Original release time
-			TDRC	Recording time
-			TDRL	Release time
-			TDTG	Tagging time
-			TDY	Playlist delay
-			TEN	Encoded by
-			TENC	Encoded by
-			TEXT	Lyricist/Text writer
-			TFLT	File type
-			TFT	File type
-			TIM	Time
-			TIME	Time
-			TIPL	Involved people list
-			TIT1	Content group description
-			TIT2	Title/songname/content description
-			TIT3	Subtitle/Description refinement
-			TKE	Initial key
-			TKEY	Initial key
-			TLA	Language(s)
-			TLAN	Language(s)
-			TLE	Length
-			TLEN	Length
-			TMCL	Musician credits list
-			TMED	Media type
-			TMOO	Mood
-			TMT	Media type
-			TOA	Original artist(s)/performer(s)
-			TOAL	Original album/movie/show title
-			TOF	Original filename
-			TOFN	Original filename
-			TOL	Original Lyricist(s)/text writer(s)
-			TOLY	Original lyricist(s)/text writer(s)
-			TOPE	Original artist(s)/performer(s)
-			TOR	Original release year
-			TORY	Original release year
-			TOT	Original album/Movie/Show title
-			TOWN	File owner/licensee
-			TP1	Lead artist(s)/Lead performer(s)/Soloist(s)/Performing group
-			TP2	Band/Orchestra/Accompaniment
-			TP3	Conductor/Performer refinement
-			TP4	Interpreted, remixed, or otherwise modified by
-			TPA	Part of a set
-			TPB	Publisher
-			TPE1	Lead performer(s)/Soloist(s)
-			TPE2	Band/orchestra/accompaniment
-			TPE3	Conductor/performer refinement
-			TPE4	Interpreted, remixed, or otherwise modified by
-			TPOS	Part of a set
-			TPRO	Produced notice
-			TPUB	Publisher
-			TRC	ISRC (International Standard Recording Code)
-			TRCK	Track number/Position in set
-			TRD	Recording dates
-			TRDA	Recording dates
-			TRK	Track number/Position in set
-			TRSN	Internet radio station name
-			TRSO	Internet radio station owner
-			TS2	Album-Artist sort order
-			TSA	Album sort order
-			TSC	Composer sort order
-			TSI	Size
-			TSIZ	Size
-			TSO2	Album-Artist sort order
-			TSOA	Album sort order
-			TSOC	Composer sort order
-			TSOP	Performer sort order
-			TSOT	Title sort order
-			TSP	Performer sort order
-			TSRC	ISRC (international standard recording code)
-			TSS	Software/hardware and settings used for encoding
-			TSSE	Software/Hardware and settings used for encoding
-			TSST	Set subtitle
-			TST	Title sort order
-			TT1	Content group description
-			TT2	Title/Songname/Content description
-			TT3	Subtitle/Description refinement
-			TXT	Lyricist/text writer
-			TXX	User defined text information frame
-			TXXX	User defined text information frame
-			TYE	Year
-			TYER	Year
-			UFI	Unique file identifier
-			UFID	Unique file identifier
-			ULT	Unsychronised lyric/text transcription
-			USER	Terms of use
-			USLT	Unsynchronised lyric/text transcription
-			WAF	Official audio file webpage
-			WAR	Official artist/performer webpage
-			WAS	Official audio source webpage
-			WCM	Commercial information
-			WCOM	Commercial information
-			WCOP	Copyright/Legal information
-			WCP	Copyright/Legal information
-			WOAF	Official audio file webpage
-			WOAR	Official artist/performer webpage
-			WOAS	Official audio source webpage
-			WORS	Official Internet radio station homepage
-			WPAY	Payment
-			WPB	Publishers official webpage
-			WPUB	Publishers official webpage
-			WXX	User defined URL link frame
-			WXXX	User defined URL link frame
-			TFEA	Featured Artist
-			TSTU	Recording Studio
-			rgad	Replay Gain Adjustment
-
-		*/
-
-		return getid3_lib::EmbeddedLookup($framename, $begin, __LINE__, __FILE__, 'id3v2-framename_long');
-
-		// Last three:
-		// from Helium2 [www.helium2.com]
-		// from http://privatewww.essex.ac.uk/~djmrob/replaygain/file_format_id3v2.html
-	}
-
-
-	static function FrameNameShortLookup($framename) {
-
-		$begin = __LINE__;
-
-		/** This is not a comment!
-
-			AENC	audio_encryption
-			APIC	attached_picture
-			ASPI	audio_seek_point_index
-			BUF	recommended_buffer_size
-			CNT	play_counter
-			COM	comment
-			COMM	comment
-			COMR	commercial_frame
-			CRA	audio_encryption
-			CRM	encrypted_meta_frame
-			ENCR	encryption_method_registration
-			EQU	equalisation
-			EQU2	equalisation
-			EQUA	equalisation
-			ETC	event_timing_codes
-			ETCO	event_timing_codes
-			GEO	general_encapsulated_object
-			GEOB	general_encapsulated_object
-			GRID	group_identification_registration
-			IPL	involved_people_list
-			IPLS	involved_people_list
-			LINK	linked_information
-			LNK	linked_information
-			MCDI	music_cd_identifier
-			MCI	music_cd_identifier
-			MLL	mpeg_location_lookup_table
-			MLLT	mpeg_location_lookup_table
-			OWNE	ownership_frame
-			PCNT	play_counter
-			PIC	attached_picture
-			POP	popularimeter
-			POPM	popularimeter
-			POSS	position_synchronisation_frame
-			PRIV	private_frame
-			RBUF	recommended_buffer_size
-			REV	reverb
-			RVA	relative_volume_adjustment
-			RVA2	relative_volume_adjustment
-			RVAD	relative_volume_adjustment
-			RVRB	reverb
-			SEEK	seek_frame
-			SIGN	signature_frame
-			SLT	synchronised_lyric
-			STC	synced_tempo_codes
-			SYLT	synchronised_lyric
-			SYTC	synchronised_tempo_codes
-			TAL	album
-			TALB	album
-			TBP	bpm
-			TBPM	bpm
-			TCM	composer
-			TCMP	part_of_a_compilation
-			TCO	genre
-			TCOM	composer
-			TCON	genre
-			TCOP	copyright_message
-			TCP	part_of_a_compilation
-			TCR	copyright_message
-			TDA	date
-			TDAT	date
-			TDEN	encoding_time
-			TDLY	playlist_delay
-			TDOR	original_release_time
-			TDRC	recording_time
-			TDRL	release_time
-			TDTG	tagging_time
-			TDY	playlist_delay
-			TEN	encoded_by
-			TENC	encoded_by
-			TEXT	lyricist
-			TFLT	file_type
-			TFT	file_type
-			TIM	time
-			TIME	time
-			TIPL	involved_people_list
-			TIT1	content_group_description
-			TIT2	title
-			TIT3	subtitle
-			TKE	initial_key
-			TKEY	initial_key
-			TLA	language
-			TLAN	language
-			TLE	length
-			TLEN	length
-			TMCL	musician_credits_list
-			TMED	media_type
-			TMOO	mood
-			TMT	media_type
-			TOA	original_artist
-			TOAL	original_album
-			TOF	original_filename
-			TOFN	original_filename
-			TOL	original_lyricist
-			TOLY	original_lyricist
-			TOPE	original_artist
-			TOR	original_year
-			TORY	original_year
-			TOT	original_album
-			TOWN	file_owner
-			TP1	artist
-			TP2	band
-			TP3	conductor
-			TP4	remixer
-			TPA	part_of_a_set
-			TPB	publisher
-			TPE1	artist
-			TPE2	band
-			TPE3	conductor
-			TPE4	remixer
-			TPOS	part_of_a_set
-			TPRO	produced_notice
-			TPUB	publisher
-			TRC	isrc
-			TRCK	track_number
-			TRD	recording_dates
-			TRDA	recording_dates
-			TRK	track_number
-			TRSN	internet_radio_station_name
-			TRSO	internet_radio_station_owner
-			TS2	album_artist_sort_order
-			TSA	album_sort_order
-			TSC	composer_sort_order
-			TSI	size
-			TSIZ	size
-			TSO2	album_artist_sort_order
-			TSOA	album_sort_order
-			TSOC	composer_sort_order
-			TSOP	performer_sort_order
-			TSOT	title_sort_order
-			TSP	performer_sort_order
-			TSRC	isrc
-			TSS	encoder_settings
-			TSSE	encoder_settings
-			TSST	set_subtitle
-			TST	title_sort_order
-			TT1	description
-			TT2	title
-			TT3	subtitle
-			TXT	lyricist
-			TXX	text
-			TXXX	text
-			TYE	year
-			TYER	year
-			UFI	unique_file_identifier
-			UFID	unique_file_identifier
-			ULT	unsychronised_lyric
-			USER	terms_of_use
-			USLT	unsynchronised_lyric
-			WAF	url_file
-			WAR	url_artist
-			WAS	url_source
-			WCM	commercial_information
-			WCOM	commercial_information
-			WCOP	copyright
-			WCP	copyright
-			WOAF	url_file
-			WOAR	url_artist
-			WOAS	url_source
-			WORS	url_station
-			WPAY	url_payment
-			WPB	url_publisher
-			WPUB	url_publisher
-			WXX	url_user
-			WXXX	url_user
-			TFEA	featured_artist
-			TSTU	recording_studio
-			rgad	replay_gain_adjustment
-
-		*/
-
-		return getid3_lib::EmbeddedLookup($framename, $begin, __LINE__, __FILE__, 'id3v2-framename_short');
-	}
-
-	static function TextEncodingTerminatorLookup($encoding) {
-		// http://www.id3.org/id3v2.4.0-structure.txt
-		// Frames that allow different types of text encoding contains a text encoding description byte. Possible encodings:
-		static $TextEncodingTerminatorLookup = array(
-			0   => "\x00",     // $00  ISO-8859-1. Terminated with $00.
-			1   => "\x00\x00", // $01  UTF-16 encoded Unicode with BOM. All strings in the same frame SHALL have the same byteorder. Terminated with $00 00.
-			2   => "\x00\x00", // $02  UTF-16BE encoded Unicode without BOM. Terminated with $00 00.
-			3   => "\x00",     // $03  UTF-8 encoded Unicode. Terminated with $00.
-			255 => "\x00\x00"
-		);
-		return (isset($TextEncodingTerminatorLookup[$encoding]) ? $TextEncodingTerminatorLookup[$encoding] : '');
-	}
-
-	static function TextEncodingNameLookup($encoding) {
-		// http://www.id3.org/id3v2.4.0-structure.txt
-		// Frames that allow different types of text encoding contains a text encoding description byte. Possible encodings:
-		static $TextEncodingNameLookup = array(
-			0   => 'ISO-8859-1', // $00  ISO-8859-1. Terminated with $00.
-			1   => 'UTF-16',     // $01  UTF-16 encoded Unicode with BOM. All strings in the same frame SHALL have the same byteorder. Terminated with $00 00.
-			2   => 'UTF-16BE',   // $02  UTF-16BE encoded Unicode without BOM. Terminated with $00 00.
-			3   => 'UTF-8',      // $03  UTF-8 encoded Unicode. Terminated with $00.
-			255 => 'UTF-16BE'
-		);
-		return (isset($TextEncodingNameLookup[$encoding]) ? $TextEncodingNameLookup[$encoding] : 'ISO-8859-1');
-	}
-
-	static function IsValidID3v2FrameName($framename, $id3v2majorversion) {
-		switch ($id3v2majorversion) {
-			case 2:
-				return preg_match('#[A-Z][A-Z0-9]{2}#', $framename);
-				break;
-
-			case 3:
-			case 4:
-				return preg_match('#[A-Z][A-Z0-9]{3}#', $framename);
-				break;
-		}
-		return false;
-	}
-
-	static function IsANumber($numberstring, $allowdecimal=false, $allownegative=false) {
-		for ($i = 0; $i < strlen($numberstring); $i++) {
-			if ((chr($numberstring{$i}) < chr('0')) || (chr($numberstring{$i}) > chr('9'))) {
-				if (($numberstring{$i} == '.') && $allowdecimal) {
-					// allowed
-				} elseif (($numberstring{$i} == '-') && $allownegative && ($i == 0)) {
-					// allowed
-				} else {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	static function IsValidDateStampString($datestamp) {
-		if (strlen($datestamp) != 8) {
-			return false;
-		}
-		if (!self::IsANumber($datestamp, false)) {
-			return false;
-		}
-		$year  = substr($datestamp, 0, 4);
-		$month = substr($datestamp, 4, 2);
-		$day   = substr($datestamp, 6, 2);
-		if (($year == 0) || ($month == 0) || ($day == 0)) {
-			return false;
-		}
-		if ($month > 12) {
-			return false;
-		}
-		if ($day > 31) {
-			return false;
-		}
-		if (($day > 30) && (($month == 4) || ($month == 6) || ($month == 9) || ($month == 11))) {
-			return false;
-		}
-		if (($day > 29) && ($month == 2)) {
-			return false;
-		}
-		return true;
-	}
-
-	static function ID3v2HeaderLength($majorversion) {
-		return (($majorversion == 2) ? 6 : 10);
-	}
-
-}
-
-?>
diff --git a/lib/getid3/getid3/module.tag.lyrics3.php b/lib/getid3/getid3/module.tag.lyrics3.php
deleted file mode 100644
index aaff71789..000000000
--- a/lib/getid3/getid3/module.tag.lyrics3.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-///                                                            //
-// module.tag.lyrics3.php                                      //
-// module for analyzing Lyrics3 tags                           //
-// dependencies: module.tag.apetag.php (optional)              //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_lyrics3 extends getid3_handler
-{
-
-	function Analyze() {
-		$info = &$this->getid3->info;
-
-		// http://www.volweb.cz/str/tags.htm
-
-		if (!getid3_lib::intValueSupported($info['filesize'])) {
-			$info['warning'][] = 'Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
-			return false;
-		}
-
-		fseek($this->getid3->fp, (0 - 128 - 9 - 6), SEEK_END);          // end - ID3v1 - "LYRICSEND" - [Lyrics3size]
-		$lyrics3_id3v1 = fread($this->getid3->fp, 128 + 9 + 6);
-		$lyrics3lsz    = substr($lyrics3_id3v1,  0,   6); // Lyrics3size
-		$lyrics3end    = substr($lyrics3_id3v1,  6,   9); // LYRICSEND or LYRICS200
-		$id3v1tag      = substr($lyrics3_id3v1, 15, 128); // ID3v1
-
-		if ($lyrics3end == 'LYRICSEND') {
-			// Lyrics3v1, ID3v1, no APE
-
-			$lyrics3size    = 5100;
-			$lyrics3offset  = $info['filesize'] - 128 - $lyrics3size;
-			$lyrics3version = 1;
-
-		} elseif ($lyrics3end == 'LYRICS200') {
-			// Lyrics3v2, ID3v1, no APE
-
-			// LSZ = lyrics + 'LYRICSBEGIN'; add 6-byte size field; add 'LYRICS200'
-			$lyrics3size    = $lyrics3lsz + 6 + strlen('LYRICS200');
-			$lyrics3offset  = $info['filesize'] - 128 - $lyrics3size;
-			$lyrics3version = 2;
-
-		} elseif (substr(strrev($lyrics3_id3v1), 0, 9) == strrev('LYRICSEND')) {
-			// Lyrics3v1, no ID3v1, no APE
-
-			$lyrics3size    = 5100;
-			$lyrics3offset  = $info['filesize'] - $lyrics3size;
-			$lyrics3version = 1;
-			$lyrics3offset  = $info['filesize'] - $lyrics3size;
-
-		} elseif (substr(strrev($lyrics3_id3v1), 0, 9) == strrev('LYRICS200')) {
-
-			// Lyrics3v2, no ID3v1, no APE
-
-			$lyrics3size    = strrev(substr(strrev($lyrics3_id3v1), 9, 6)) + 6 + strlen('LYRICS200'); // LSZ = lyrics + 'LYRICSBEGIN'; add 6-byte size field; add 'LYRICS200'
-			$lyrics3offset  = $info['filesize'] - $lyrics3size;
-			$lyrics3version = 2;
-
-		} else {
-
-			if (isset($info['ape']['tag_offset_start']) && ($info['ape']['tag_offset_start'] > 15)) {
-
-				fseek($this->getid3->fp, $info['ape']['tag_offset_start'] - 15, SEEK_SET);
-				$lyrics3lsz = fread($this->getid3->fp, 6);
-				$lyrics3end = fread($this->getid3->fp, 9);
-
-				if ($lyrics3end == 'LYRICSEND') {
-					// Lyrics3v1, APE, maybe ID3v1
-
-					$lyrics3size    = 5100;
-					$lyrics3offset  = $info['ape']['tag_offset_start'] - $lyrics3size;
-					$info['avdataend'] = $lyrics3offset;
-					$lyrics3version = 1;
-					$info['warning'][] = 'APE tag located after Lyrics3, will probably break Lyrics3 compatability';
-
-				} elseif ($lyrics3end == 'LYRICS200') {
-					// Lyrics3v2, APE, maybe ID3v1
-
-					$lyrics3size    = $lyrics3lsz + 6 + strlen('LYRICS200'); // LSZ = lyrics + 'LYRICSBEGIN'; add 6-byte size field; add 'LYRICS200'
-					$lyrics3offset  = $info['ape']['tag_offset_start'] - $lyrics3size;
-					$lyrics3version = 2;
-					$info['warning'][] = 'APE tag located after Lyrics3, will probably break Lyrics3 compatability';
-
-				}
-
-			}
-
-		}
-
-		if (isset($lyrics3offset)) {
-			$info['avdataend'] = $lyrics3offset;
-			$this->getLyrics3Data($lyrics3offset, $lyrics3version, $lyrics3size);
-
-			if (!isset($info['ape'])) {
-				$GETID3_ERRORARRAY = &$info['warning'];
-				if (getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, false)) {
-					$getid3_temp = new getID3();
-					$getid3_temp->openfile($this->getid3->filename);
-					$getid3_apetag = new getid3_apetag($getid3_temp);
-					$getid3_apetag->overrideendoffset = $info['lyrics3']['tag_offset_start'];
-					$getid3_apetag->Analyze();
-					if (!empty($getid3_temp->info['ape'])) {
-						$info['ape'] = $getid3_temp->info['ape'];
-					}
-					if (!empty($getid3_temp->info['replay_gain'])) {
-						$info['replay_gain'] = $getid3_temp->info['replay_gain'];
-					}
-					unset($getid3_temp, $getid3_apetag);
-				}
-			}
-
-		}
-
-		return true;
-	}
-
-	function getLyrics3Data($endoffset, $version, $length) {
-		// http://www.volweb.cz/str/tags.htm
-
-		$info = &$this->getid3->info;
-
-		if (!getid3_lib::intValueSupported($endoffset)) {
-			$info['warning'][] = 'Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
-			return false;
-		}
-
-		fseek($this->getid3->fp, $endoffset, SEEK_SET);
-		if ($length <= 0) {
-			return false;
-		}
-		$rawdata = fread($this->getid3->fp, $length);
-
-		$ParsedLyrics3['raw']['lyrics3version'] = $version;
-		$ParsedLyrics3['raw']['lyrics3tagsize'] = $length;
-		$ParsedLyrics3['tag_offset_start']      = $endoffset;
-		$ParsedLyrics3['tag_offset_end']        = $endoffset + $length - 1;
-
-		if (substr($rawdata, 0, 11) != 'LYRICSBEGIN') {
-			if (strpos($rawdata, 'LYRICSBEGIN') !== false) {
-
-				$info['warning'][] = '"LYRICSBEGIN" expected at '.$endoffset.' but actually found at '.($endoffset + strpos($rawdata, 'LYRICSBEGIN')).' - this is invalid for Lyrics3 v'.$version;
-				$info['avdataend'] = $endoffset + strpos($rawdata, 'LYRICSBEGIN');
-				$rawdata = substr($rawdata, strpos($rawdata, 'LYRICSBEGIN'));
-				$length = strlen($rawdata);
-				$ParsedLyrics3['tag_offset_start'] = $info['avdataend'];
-				$ParsedLyrics3['raw']['lyrics3tagsize'] = $length;
-
-			} else {
-
-				$info['error'][] = '"LYRICSBEGIN" expected at '.$endoffset.' but found "'.substr($rawdata, 0, 11).'" instead';
-				return false;
-
-			}
-
-		}
-
-		switch ($version) {
-
-			case 1:
-				if (substr($rawdata, strlen($rawdata) - 9, 9) == 'LYRICSEND') {
-					$ParsedLyrics3['raw']['LYR'] = trim(substr($rawdata, 11, strlen($rawdata) - 11 - 9));
-					$this->Lyrics3LyricsTimestampParse($ParsedLyrics3);
-				} else {
-					$info['error'][] = '"LYRICSEND" expected at '.(ftell($this->getid3->fp) - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead';
-					return false;
-				}
-				break;
-
-			case 2:
-				if (substr($rawdata, strlen($rawdata) - 9, 9) == 'LYRICS200') {
-					$ParsedLyrics3['raw']['unparsed'] = substr($rawdata, 11, strlen($rawdata) - 11 - 9 - 6); // LYRICSBEGIN + LYRICS200 + LSZ
-					$rawdata = $ParsedLyrics3['raw']['unparsed'];
-					while (strlen($rawdata) > 0) {
-						$fieldname = substr($rawdata, 0, 3);
-						$fieldsize = (int) substr($rawdata, 3, 5);
-						$ParsedLyrics3['raw'][$fieldname] = substr($rawdata, 8, $fieldsize);
-						$rawdata = substr($rawdata, 3 + 5 + $fieldsize);
-					}
-
-					if (isset($ParsedLyrics3['raw']['IND'])) {
-						$i = 0;
-						$flagnames = array('lyrics', 'timestamps', 'inhibitrandom');
-						foreach ($flagnames as $flagname) {
-							if (strlen($ParsedLyrics3['raw']['IND']) > $i++) {
-								$ParsedLyrics3['flags'][$flagname] = $this->IntString2Bool(substr($ParsedLyrics3['raw']['IND'], $i, 1 - 1));
-							}
-						}
-					}
-
-					$fieldnametranslation = array('ETT'=>'title', 'EAR'=>'artist', 'EAL'=>'album', 'INF'=>'comment', 'AUT'=>'author');
-					foreach ($fieldnametranslation as $key => $value) {
-						if (isset($ParsedLyrics3['raw'][$key])) {
-							$ParsedLyrics3['comments'][$value][] = trim($ParsedLyrics3['raw'][$key]);
-						}
-					}
-
-					if (isset($ParsedLyrics3['raw']['IMG'])) {
-						$imagestrings = explode("\r\n", $ParsedLyrics3['raw']['IMG']);
-						foreach ($imagestrings as $key => $imagestring) {
-							if (strpos($imagestring, '||') !== false) {
-								$imagearray = explode('||', $imagestring);
-								$ParsedLyrics3['images'][$key]['filename']     =                                (isset($imagearray[0]) ? $imagearray[0] : '');
-								$ParsedLyrics3['images'][$key]['description']  =                                (isset($imagearray[1]) ? $imagearray[1] : '');
-								$ParsedLyrics3['images'][$key]['timestamp']    = $this->Lyrics3Timestamp2Seconds(isset($imagearray[2]) ? $imagearray[2] : '');
-							}
-						}
-					}
-					if (isset($ParsedLyrics3['raw']['LYR'])) {
-						$this->Lyrics3LyricsTimestampParse($ParsedLyrics3);
-					}
-				} else {
-					$info['error'][] = '"LYRICS200" expected at '.(ftell($this->getid3->fp) - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead';
-					return false;
-				}
-				break;
-
-			default:
-				$info['error'][] = 'Cannot process Lyrics3 version '.$version.' (only v1 and v2)';
-				return false;
-				break;
-		}
-
-
-		if (isset($info['id3v1']['tag_offset_start']) && ($info['id3v1']['tag_offset_start'] <= $ParsedLyrics3['tag_offset_end'])) {
-			$info['warning'][] = 'ID3v1 tag information ignored since it appears to be a false synch in Lyrics3 tag data';
-			unset($info['id3v1']);
-			foreach ($info['warning'] as $key => $value) {
-				if ($value == 'Some ID3v1 fields do not use NULL characters for padding') {
-					unset($info['warning'][$key]);
-					sort($info['warning']);
-					break;
-				}
-			}
-		}
-
-		$info['lyrics3'] = $ParsedLyrics3;
-
-		return true;
-	}
-
-	function Lyrics3Timestamp2Seconds($rawtimestamp) {
-		if (preg_match('#^\\[([0-9]{2}):([0-9]{2})\\]$#', $rawtimestamp, $regs)) {
-			return (int) (($regs[1] * 60) + $regs[2]);
-		}
-		return false;
-	}
-
-	function Lyrics3LyricsTimestampParse(&$Lyrics3data) {
-		$lyricsarray = explode("\r\n", $Lyrics3data['raw']['LYR']);
-		foreach ($lyricsarray as $key => $lyricline) {
-			$regs = array();
-			unset($thislinetimestamps);
-			while (preg_match('#^(\\[[0-9]{2}:[0-9]{2}\\])#', $lyricline, $regs)) {
-				$thislinetimestamps[] = $this->Lyrics3Timestamp2Seconds($regs[0]);
-				$lyricline = str_replace($regs[0], '', $lyricline);
-			}
-			$notimestamplyricsarray[$key] = $lyricline;
-			if (isset($thislinetimestamps) && is_array($thislinetimestamps)) {
-				sort($thislinetimestamps);
-				foreach ($thislinetimestamps as $timestampkey => $timestamp) {
-					if (isset($Lyrics3data['synchedlyrics'][$timestamp])) {
-						// timestamps only have a 1-second resolution, it's possible that multiple lines
-						// could have the same timestamp, if so, append
-						$Lyrics3data['synchedlyrics'][$timestamp] .= "\r\n".$lyricline;
-					} else {
-						$Lyrics3data['synchedlyrics'][$timestamp] = $lyricline;
-					}
-				}
-			}
-		}
-		$Lyrics3data['unsynchedlyrics'] = implode("\r\n", $notimestamplyricsarray);
-		if (isset($Lyrics3data['synchedlyrics']) && is_array($Lyrics3data['synchedlyrics'])) {
-			ksort($Lyrics3data['synchedlyrics']);
-		}
-		return true;
-	}
-
-	function IntString2Bool($char) {
-		if ($char == '1') {
-			return true;
-		} elseif ($char == '0') {
-			return false;
-		}
-		return null;
-	}
-}
-
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/module.tag.xmp.php b/lib/getid3/getid3/module.tag.xmp.php
deleted file mode 100644
index 141fd09d1..000000000
--- a/lib/getid3/getid3/module.tag.xmp.php
+++ /dev/null
@@ -1,766 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// module.tag.xmp.php                                          //
-// module for analyzing XMP metadata (e.g. in JPEG files)      //
-// dependencies: NONE                                          //
-//                                                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// Module originally written [2009-Mar-26] by                  //
-//      Nigel Barnes <ngbarnes�hotmail*com>                    //
-// Bundled into getID3 with permission                         //
-//   called by getID3 in module.graphic.jpg.php                //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-/**************************************************************************************************
- * SWISScenter Source                                                              Nigel Barnes
- *
- * 	Provides functions for reading information from the 'APP1' Extensible Metadata
- *	Platform (XMP) segment of JPEG format files.
- *	This XMP segment is XML based and contains the Resource Description Framework (RDF)
- *	data, which itself can contain the Dublin Core Metadata Initiative (DCMI) information.
- *
- * 	This code uses segments from the JPEG Metadata Toolkit project by Evan Hunter.
- *************************************************************************************************/
-class Image_XMP
-{
-	/**
-	* @var string
-	* The name of the image file that contains the XMP fields to extract and modify.
-	* @see Image_XMP()
-	*/
-	var $_sFilename = null;
-
-	/**
-	* @var array
-	* The XMP fields that were extracted from the image or updated by this class.
-	* @see getAllTags()
-	*/
-	var $_aXMP = array();
-
-	/**
-	* @var boolean
-	* True if an APP1 segment was found to contain XMP metadata.
-	* @see isValid()
-	*/
-	var $_bXMPParse = false;
-
-	/**
-	* Returns the status of XMP parsing during instantiation
-	*
-	* You'll normally want to call this method before trying to get XMP fields.
-	*
-	* @return boolean
-	* Returns true if an APP1 segment was found to contain XMP metadata.
-	*/
-	function isValid()
-	{
-		return $this->_bXMPParse;
-	}
-
-	/**
-	* Get a copy of all XMP tags extracted from the image
-	*
-	* @return array - An array of XMP fields as it extracted by the XMPparse() function
-	*/
-	function getAllTags()
-	{
-		return $this->_aXMP;
-	}
-
-	/**
-	* Reads all the JPEG header segments from an JPEG image file into an array
-	*
-	* @param string $filename - the filename of the JPEG file to read
-	* @return array $headerdata - Array of JPEG header segments
-	* @return boolean FALSE - if headers could not be read
-	*/
-	function _get_jpeg_header_data($filename)
-	{
-		// prevent refresh from aborting file operations and hosing file
-		ignore_user_abort(true);
-
-		// Attempt to open the jpeg file - the at symbol supresses the error message about
-		// not being able to open files. The file_exists would have been used, but it
-		// does not work with files fetched over http or ftp.
-		if (is_readable($filename) && is_file($filename) && ($filehnd = fopen($filename, 'rb'))) {
-			// great
-		} else {
-			return false;
-		}
-
-		// Read the first two characters
-		$data = fread($filehnd, 2);
-
-		// Check that the first two characters are 0xFF 0xD8  (SOI - Start of image)
-		if ($data != "\xFF\xD8")
-		{
-			// No SOI (FF D8) at start of file - This probably isn't a JPEG file - close file and return;
-			echo '<p>This probably is not a JPEG file</p>'."\n";
-			fclose($filehnd);
-			return false;
-		}
-
-		// Read the third character
-		$data = fread($filehnd, 2);
-
-		// Check that the third character is 0xFF (Start of first segment header)
-		if ($data{0} != "\xFF")
-		{
-			// NO FF found - close file and return - JPEG is probably corrupted
-			fclose($filehnd);
-			return false;
-		}
-
-		// Flag that we havent yet hit the compressed image data
-		$hit_compressed_image_data = false;
-
-		// Cycle through the file until, one of: 1) an EOI (End of image) marker is hit,
-		//                                       2) we have hit the compressed image data (no more headers are allowed after data)
-		//                                       3) or end of file is hit
-
-		while (($data{1} != "\xD9") && (!$hit_compressed_image_data) && (!feof($filehnd)))
-		{
-			// Found a segment to look at.
-			// Check that the segment marker is not a Restart marker - restart markers don't have size or data after them
-			if ((ord($data{1}) < 0xD0) || (ord($data{1}) > 0xD7))
-			{
-				// Segment isn't a Restart marker
-				// Read the next two bytes (size)
-				$sizestr = fread($filehnd, 2);
-
-				// convert the size bytes to an integer
-				$decodedsize = unpack('nsize', $sizestr);
-
-				// Save the start position of the data
-				$segdatastart = ftell($filehnd);
-
-				// Read the segment data with length indicated by the previously read size
-				$segdata = fread($filehnd, $decodedsize['size'] - 2);
-
-				// Store the segment information in the output array
-				$headerdata[] = array(
-					'SegType'      => ord($data{1}),
-					'SegName'      => $GLOBALS['JPEG_Segment_Names'][ord($data{1})],
-					'SegDataStart' => $segdatastart,
-					'SegData'      => $segdata,
-				);
-			}
-
-			// If this is a SOS (Start Of Scan) segment, then there is no more header data - the compressed image data follows
-			if ($data{1} == "\xDA")
-			{
-				// Flag that we have hit the compressed image data - exit loop as no more headers available.
-				$hit_compressed_image_data = true;
-			}
-			else
-			{
-				// Not an SOS - Read the next two bytes - should be the segment marker for the next segment
-				$data = fread($filehnd, 2);
-
-				// Check that the first byte of the two is 0xFF as it should be for a marker
-				if ($data{0} != "\xFF")
-				{
-					// NO FF found - close file and return - JPEG is probably corrupted
-					fclose($filehnd);
-					return false;
-				}
-			}
-		}
-
-		// Close File
-		fclose($filehnd);
-		// Alow the user to abort from now on
-		ignore_user_abort(false);
-
-		// Return the header data retrieved
-		return $headerdata;
-	}
-
-
-	/**
-	* Retrieves XMP information from an APP1 JPEG segment and returns the raw XML text as a string.
-	*
-	* @param string $filename - the filename of the JPEG file to read
-	* @return string $xmp_data - the string of raw XML text
-	* @return boolean FALSE - if an APP 1 XMP segment could not be found, or if an error occured
-	*/
-	function _get_XMP_text($filename)
-	{
-		//Get JPEG header data
-		$jpeg_header_data = $this->_get_jpeg_header_data($filename);
-
-		//Cycle through the header segments
-		for ($i = 0; $i < count($jpeg_header_data); $i++)
-		{
-			// If we find an APP1 header,
-			if (strcmp($jpeg_header_data[$i]['SegName'], 'APP1') == 0)
-			{
-				// And if it has the Adobe XMP/RDF label (http://ns.adobe.com/xap/1.0/\x00) ,
-				if (strncmp($jpeg_header_data[$i]['SegData'], 'http://ns.adobe.com/xap/1.0/'."\x00", 29) == 0)
-				{
-					// Found a XMP/RDF block
-					// Return the XMP text
-					$xmp_data = substr($jpeg_header_data[$i]['SegData'], 29);
-
-					return trim($xmp_data); // trim() should not be neccesary, but some files found in the wild with null-terminated block (known samples from Apple Aperture) causes problems elsewhere (see http://www.getid3.org/phpBB3/viewtopic.php?f=4&t=1153)
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Parses a string containing XMP data (XML), and returns an array
-	* which contains all the XMP (XML) information.
-	*
-	* @param string $xml_text - a string containing the XMP data (XML) to be parsed
-	* @return array $xmp_array - an array containing all xmp details retrieved.
-	* @return boolean FALSE - couldn't parse the XMP data
-	*/
-	function read_XMP_array_from_text($xmltext)
-	{
-		// Check if there actually is any text to parse
-		if (trim($xmltext) == '')
-		{
-			return false;
-		}
-
-		// Create an instance of a xml parser to parse the XML text
-		$xml_parser = xml_parser_create('UTF-8');
-
-		// Change: Fixed problem that caused the whitespace (especially newlines) to be destroyed when converting xml text to an xml array, as of revision 1.10
-
-		// We would like to remove unneccessary white space, but this will also
-		// remove things like newlines (&#xA;) in the XML values, so white space
-		// will have to be removed later
-		if (xml_parser_set_option($xml_parser, XML_OPTION_SKIP_WHITE, 0) == false)
-		{
-			// Error setting case folding - destroy the parser and return
-			xml_parser_free($xml_parser);
-			return false;
-		}
-
-		// to use XML code correctly we have to turn case folding
-		// (uppercasing) off. XML is case sensitive and upper
-		// casing is in reality XML standards violation
-		if (xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 0) == false)
-		{
-			// Error setting case folding - destroy the parser and return
-			xml_parser_free($xml_parser);
-			return false;
-		}
-
-		// Parse the XML text into a array structure
-		if (xml_parse_into_struct($xml_parser, $xmltext, $values, $tags) == 0)
-		{
-			// Error Parsing XML - destroy the parser and return
-			xml_parser_free($xml_parser);
-			return false;
-		}
-
-		// Destroy the xml parser
-		xml_parser_free($xml_parser);
-
-		// Clear the output array
-		$xmp_array = array();
-
-		// The XMP data has now been parsed into an array ...
-
-		// Cycle through each of the array elements
-		$current_property = ''; // current property being processed
-		$container_index = -1; // -1 = no container open, otherwise index of container content
-		foreach ($values as $xml_elem)
-		{
-			// Syntax and Class names
-			switch ($xml_elem['tag'])
-			{
-				case 'x:xmpmeta':
-					// only defined attribute is x:xmptk written by Adobe XMP Toolkit; value is the version of the toolkit
-					break;
-
-				case 'rdf:RDF':
-					// required element immediately within x:xmpmeta; no data here
-					break;
-
-				case 'rdf:Description':
-					switch ($xml_elem['type'])
-					{
-						case 'open':
-						case 'complete':
-							if (array_key_exists('attributes', $xml_elem))
-							{
-								// rdf:Description may contain wanted attributes
-								foreach (array_keys($xml_elem['attributes']) as $key)
-								{
-									// Check whether we want this details from this attribute
-									if (in_array($key, $GLOBALS['XMP_tag_captions']))
-									{
-										// Attribute wanted
-										$xmp_array[$key] = $xml_elem['attributes'][$key];
-									}
-								}
-							}
-						case 'cdata':
-						case 'close':
-							break;
-					}
-
-				case 'rdf:ID':
-				case 'rdf:nodeID':
-					// Attributes are ignored
-					break;
-
-				case 'rdf:li':
-					// Property member
-					if ($xml_elem['type'] == 'complete')
-					{
-						if (array_key_exists('attributes', $xml_elem))
-						{
-							// If Lang Alt (language alternatives) then ensure we take the default language
-							if (isset($xml_elem['attributes']['xml:lang']) && ($xml_elem['attributes']['xml:lang'] != 'x-default'))
-							{
-								break;
-							}
-						}
-						if ($current_property != '')
-						{
-							$xmp_array[$current_property][$container_index] = (isset($xml_elem['value']) ? $xml_elem['value'] : '');
-							$container_index += 1;
-						}
-					//else unidentified attribute!!
-					}
-					break;
-
-				case 'rdf:Seq':
-				case 'rdf:Bag':
-				case 'rdf:Alt':
-					// Container found
-					switch ($xml_elem['type'])
-					{
-						case 'open':
- 							$container_index = 0;
- 							break;
-						case 'close':
-							$container_index = -1;
-							break;
-						case 'cdata':
-							break;
-					}
-					break;
-
-				default:
-					// Check whether we want the details from this attribute
-					if (in_array($xml_elem['tag'], $GLOBALS['XMP_tag_captions']))
-					{
-						switch ($xml_elem['type'])
-						{
-							case 'open':
-								// open current element
-								$current_property = $xml_elem['tag'];
-								break;
-
-							case 'close':
-								// close current element
-								$current_property = '';
-								break;
-
-							case 'complete':
-								// store attribute value
-								$xmp_array[$xml_elem['tag']] = (isset($xml_elem['value']) ? $xml_elem['value'] : '');
-								break;
-
-							case 'cdata':
-								// ignore
-								break;
-						}
-					}
-					break;
-			}
-
-		}
-		return $xmp_array;
-	}
-
-
-	/**
-	* Constructor
-	*
-	* @param string - Name of the image file to access and extract XMP information from.
-	*/
-	function Image_XMP($sFilename)
-	{
-		$this->_sFilename = $sFilename;
-
-		if (is_file($this->_sFilename))
-		{
-			// Get XMP data
-			$xmp_data = $this->_get_XMP_text($sFilename);
-			if ($xmp_data)
-			{
-				$this->_aXMP = $this->read_XMP_array_from_text($xmp_data);
-				$this->_bXMPParse = true;
-			}
-		}
-	}
-
-}
-
-/**
-* Global Variable: XMP_tag_captions
-*
-* The Property names of all known XMP fields.
-* Note: this is a full list with unrequired properties commented out.
-*/
-$GLOBALS['XMP_tag_captions'] = array(
-// IPTC Core
-	'Iptc4xmpCore:CiAdrCity',
-	'Iptc4xmpCore:CiAdrCtry',
-	'Iptc4xmpCore:CiAdrExtadr',
-	'Iptc4xmpCore:CiAdrPcode',
-	'Iptc4xmpCore:CiAdrRegion',
-	'Iptc4xmpCore:CiEmailWork',
-	'Iptc4xmpCore:CiTelWork',
-	'Iptc4xmpCore:CiUrlWork',
-	'Iptc4xmpCore:CountryCode',
-	'Iptc4xmpCore:CreatorContactInfo',
-	'Iptc4xmpCore:IntellectualGenre',
-	'Iptc4xmpCore:Location',
-	'Iptc4xmpCore:Scene',
-	'Iptc4xmpCore:SubjectCode',
-// Dublin Core Schema
-	'dc:contributor',
-	'dc:coverage',
-	'dc:creator',
-	'dc:date',
-	'dc:description',
-	'dc:format',
-	'dc:identifier',
-	'dc:language',
-	'dc:publisher',
-	'dc:relation',
-	'dc:rights',
-	'dc:source',
-	'dc:subject',
-	'dc:title',
-	'dc:type',
-// XMP Basic Schema
-	'xmp:Advisory',
-	'xmp:BaseURL',
-	'xmp:CreateDate',
-	'xmp:CreatorTool',
-	'xmp:Identifier',
-	'xmp:Label',
-	'xmp:MetadataDate',
-	'xmp:ModifyDate',
-	'xmp:Nickname',
-	'xmp:Rating',
-	'xmp:Thumbnails',
-	'xmpidq:Scheme',
-// XMP Rights Management Schema
-	'xmpRights:Certificate',
-	'xmpRights:Marked',
-	'xmpRights:Owner',
-	'xmpRights:UsageTerms',
-	'xmpRights:WebStatement',
-// These are not in spec but Photoshop CS seems to use them
-	'xap:Advisory',
-	'xap:BaseURL',
-	'xap:CreateDate',
-	'xap:CreatorTool',
-	'xap:Identifier',
-	'xap:MetadataDate',
-	'xap:ModifyDate',
-	'xap:Nickname',
-	'xap:Rating',
-	'xap:Thumbnails',
-	'xapidq:Scheme',
-	'xapRights:Certificate',
-	'xapRights:Copyright',
-	'xapRights:Marked',
-	'xapRights:Owner',
-	'xapRights:UsageTerms',
-	'xapRights:WebStatement',
-// XMP Media Management Schema
-	'xapMM:DerivedFrom',
-	'xapMM:DocumentID',
-	'xapMM:History',
-	'xapMM:InstanceID',
-	'xapMM:ManagedFrom',
-	'xapMM:Manager',
-	'xapMM:ManageTo',
-	'xapMM:ManageUI',
-	'xapMM:ManagerVariant',
-	'xapMM:RenditionClass',
-	'xapMM:RenditionParams',
-	'xapMM:VersionID',
-	'xapMM:Versions',
-	'xapMM:LastURL',
-	'xapMM:RenditionOf',
-	'xapMM:SaveID',
-// XMP Basic Job Ticket Schema
-	'xapBJ:JobRef',
-// XMP Paged-Text Schema
-	'xmpTPg:MaxPageSize',
-	'xmpTPg:NPages',
-	'xmpTPg:Fonts',
-	'xmpTPg:Colorants',
-	'xmpTPg:PlateNames',
-// Adobe PDF Schema
-	'pdf:Keywords',
-	'pdf:PDFVersion',
-	'pdf:Producer',
-// Photoshop Schema
-	'photoshop:AuthorsPosition',
-	'photoshop:CaptionWriter',
-	'photoshop:Category',
-	'photoshop:City',
-	'photoshop:Country',
-	'photoshop:Credit',
-	'photoshop:DateCreated',
-	'photoshop:Headline',
-	'photoshop:History',
-// Not in XMP spec
-	'photoshop:Instructions',
-	'photoshop:Source',
-	'photoshop:State',
-	'photoshop:SupplementalCategories',
-	'photoshop:TransmissionReference',
-	'photoshop:Urgency',
-// EXIF Schemas
-	'tiff:ImageWidth',
-	'tiff:ImageLength',
-	'tiff:BitsPerSample',
-	'tiff:Compression',
-	'tiff:PhotometricInterpretation',
-	'tiff:Orientation',
-	'tiff:SamplesPerPixel',
-	'tiff:PlanarConfiguration',
-	'tiff:YCbCrSubSampling',
-	'tiff:YCbCrPositioning',
-	'tiff:XResolution',
-	'tiff:YResolution',
-	'tiff:ResolutionUnit',
-	'tiff:TransferFunction',
-	'tiff:WhitePoint',
-	'tiff:PrimaryChromaticities',
-	'tiff:YCbCrCoefficients',
-	'tiff:ReferenceBlackWhite',
-	'tiff:DateTime',
-	'tiff:ImageDescription',
-	'tiff:Make',
-	'tiff:Model',
-	'tiff:Software',
-	'tiff:Artist',
-	'tiff:Copyright',
-	'exif:ExifVersion',
-	'exif:FlashpixVersion',
-	'exif:ColorSpace',
-	'exif:ComponentsConfiguration',
-	'exif:CompressedBitsPerPixel',
-	'exif:PixelXDimension',
-	'exif:PixelYDimension',
-	'exif:MakerNote',
-	'exif:UserComment',
-	'exif:RelatedSoundFile',
-	'exif:DateTimeOriginal',
-	'exif:DateTimeDigitized',
-	'exif:ExposureTime',
-	'exif:FNumber',
-	'exif:ExposureProgram',
-	'exif:SpectralSensitivity',
-	'exif:ISOSpeedRatings',
-	'exif:OECF',
-	'exif:ShutterSpeedValue',
-	'exif:ApertureValue',
-	'exif:BrightnessValue',
-	'exif:ExposureBiasValue',
-	'exif:MaxApertureValue',
-	'exif:SubjectDistance',
-	'exif:MeteringMode',
-	'exif:LightSource',
-	'exif:Flash',
-	'exif:FocalLength',
-	'exif:SubjectArea',
-	'exif:FlashEnergy',
-	'exif:SpatialFrequencyResponse',
-	'exif:FocalPlaneXResolution',
-	'exif:FocalPlaneYResolution',
-	'exif:FocalPlaneResolutionUnit',
-	'exif:SubjectLocation',
-	'exif:SensingMethod',
-	'exif:FileSource',
-	'exif:SceneType',
-	'exif:CFAPattern',
-	'exif:CustomRendered',
-	'exif:ExposureMode',
-	'exif:WhiteBalance',
-	'exif:DigitalZoomRatio',
-	'exif:FocalLengthIn35mmFilm',
-	'exif:SceneCaptureType',
-	'exif:GainControl',
-	'exif:Contrast',
-	'exif:Saturation',
-	'exif:Sharpness',
-	'exif:DeviceSettingDescription',
-	'exif:SubjectDistanceRange',
-	'exif:ImageUniqueID',
-	'exif:GPSVersionID',
-	'exif:GPSLatitude',
-	'exif:GPSLongitude',
-	'exif:GPSAltitudeRef',
-	'exif:GPSAltitude',
-	'exif:GPSTimeStamp',
-	'exif:GPSSatellites',
-	'exif:GPSStatus',
-	'exif:GPSMeasureMode',
-	'exif:GPSDOP',
-	'exif:GPSSpeedRef',
-	'exif:GPSSpeed',
-	'exif:GPSTrackRef',
-	'exif:GPSTrack',
-	'exif:GPSImgDirectionRef',
-	'exif:GPSImgDirection',
-	'exif:GPSMapDatum',
-	'exif:GPSDestLatitude',
-	'exif:GPSDestLongitude',
-	'exif:GPSDestBearingRef',
-	'exif:GPSDestBearing',
-	'exif:GPSDestDistanceRef',
-	'exif:GPSDestDistance',
-	'exif:GPSProcessingMethod',
-	'exif:GPSAreaInformation',
-	'exif:GPSDifferential',
-	'stDim:w',
-	'stDim:h',
-	'stDim:unit',
-	'xapGImg:height',
-	'xapGImg:width',
-	'xapGImg:format',
-	'xapGImg:image',
-	'stEvt:action',
-	'stEvt:instanceID',
-	'stEvt:parameters',
-	'stEvt:softwareAgent',
-	'stEvt:when',
-	'stRef:instanceID',
-	'stRef:documentID',
-	'stRef:versionID',
-	'stRef:renditionClass',
-	'stRef:renditionParams',
-	'stRef:manager',
-	'stRef:managerVariant',
-	'stRef:manageTo',
-	'stRef:manageUI',
-	'stVer:comments',
-	'stVer:event',
-	'stVer:modifyDate',
-	'stVer:modifier',
-	'stVer:version',
-	'stJob:name',
-	'stJob:id',
-	'stJob:url',
-// Exif Flash
-	'exif:Fired',
-	'exif:Return',
-	'exif:Mode',
-	'exif:Function',
-	'exif:RedEyeMode',
-// Exif OECF/SFR
-	'exif:Columns',
-	'exif:Rows',
-	'exif:Names',
-	'exif:Values',
-// Exif CFAPattern
-	'exif:Columns',
-	'exif:Rows',
-	'exif:Values',
-// Exif DeviceSettings
-	'exif:Columns',
-	'exif:Rows',
-	'exif:Settings',
-);
-
-
-/**
-* Global Variable: JPEG_Segment_Names
-*
-* The names of the JPEG segment markers, indexed by their marker number
-*/
-$GLOBALS['JPEG_Segment_Names'] = array(
-	0x01 => 'TEM',
-	0x02 => 'RES',
-	0xC0 => 'SOF0',
-	0xC1 => 'SOF1',
-	0xC2 => 'SOF2',
-	0xC3 => 'SOF4',
-	0xC4 => 'DHT',
-	0xC5 => 'SOF5',
-	0xC6 => 'SOF6',
-	0xC7 => 'SOF7',
-	0xC8 => 'JPG',
-	0xC9 => 'SOF9',
-	0xCA => 'SOF10',
-	0xCB => 'SOF11',
-	0xCC => 'DAC',
-	0xCD => 'SOF13',
-	0xCE => 'SOF14',
-	0xCF => 'SOF15',
-	0xD0 => 'RST0',
-	0xD1 => 'RST1',
-	0xD2 => 'RST2',
-	0xD3 => 'RST3',
-	0xD4 => 'RST4',
-	0xD5 => 'RST5',
-	0xD6 => 'RST6',
-	0xD7 => 'RST7',
-	0xD8 => 'SOI',
-	0xD9 => 'EOI',
-	0xDA => 'SOS',
-	0xDB => 'DQT',
-	0xDC => 'DNL',
-	0xDD => 'DRI',
-	0xDE => 'DHP',
-	0xDF => 'EXP',
-	0xE0 => 'APP0',
-	0xE1 => 'APP1',
-	0xE2 => 'APP2',
-	0xE3 => 'APP3',
-	0xE4 => 'APP4',
-	0xE5 => 'APP5',
-	0xE6 => 'APP6',
-	0xE7 => 'APP7',
-	0xE8 => 'APP8',
-	0xE9 => 'APP9',
-	0xEA => 'APP10',
-	0xEB => 'APP11',
-	0xEC => 'APP12',
-	0xED => 'APP13',
-	0xEE => 'APP14',
-	0xEF => 'APP15',
-	0xF0 => 'JPG0',
-	0xF1 => 'JPG1',
-	0xF2 => 'JPG2',
-	0xF3 => 'JPG3',
-	0xF4 => 'JPG4',
-	0xF5 => 'JPG5',
-	0xF6 => 'JPG6',
-	0xF7 => 'JPG7',
-	0xF8 => 'JPG8',
-	0xF9 => 'JPG9',
-	0xFA => 'JPG10',
-	0xFB => 'JPG11',
-	0xFC => 'JPG12',
-	0xFD => 'JPG13',
-	0xFE => 'COM',
-);
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/write.apetag.php b/lib/getid3/getid3/write.apetag.php
deleted file mode 100644
index 2b553699f..000000000
--- a/lib/getid3/getid3/write.apetag.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// write.apetag.php                                            //
-// module for writing APE tags                                 //
-// dependencies: module.tag.apetag.php                         //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, true);
-
-class getid3_write_apetag
-{
-
-	var $filename;
-	var $tag_data;
-	var $always_preserve_replaygain = true;    // ReplayGain / MP3gain tags will be copied from old tag even if not passed in data
-	var $warnings                   = array(); // any non-critical errors will be stored here
-	var $errors                     = array(); // any critical errors will be stored here
-
-	function getid3_write_apetag() {
-		return true;
-	}
-
-	function WriteAPEtag() {
-		// NOTE: All data passed to this function must be UTF-8 format
-
-		$getID3 = new getID3;
-		$ThisFileInfo = $getID3->analyze($this->filename);
-
-		if (isset($ThisFileInfo['ape']['tag_offset_start']) && isset($ThisFileInfo['lyrics3']['tag_offset_end'])) {
-			if ($ThisFileInfo['ape']['tag_offset_start'] >= $ThisFileInfo['lyrics3']['tag_offset_end']) {
-				// Current APE tag between Lyrics3 and ID3v1/EOF
-				// This break Lyrics3 functionality
-				if (!$this->DeleteAPEtag()) {
-					return false;
-				}
-				$ThisFileInfo = $getID3->analyze($this->filename);
-			}
-		}
-
-		if ($this->always_preserve_replaygain) {
-			$ReplayGainTagsToPreserve = array('mp3gain_minmax', 'mp3gain_album_minmax', 'mp3gain_undo', 'replaygain_track_peak', 'replaygain_track_gain', 'replaygain_album_peak', 'replaygain_album_gain');
-			foreach ($ReplayGainTagsToPreserve as $rg_key) {
-				if (isset($ThisFileInfo['ape']['items'][strtolower($rg_key)]['data'][0]) && !isset($this->tag_data[strtoupper($rg_key)][0])) {
-					$this->tag_data[strtoupper($rg_key)][0] = $ThisFileInfo['ape']['items'][strtolower($rg_key)]['data'][0];
-				}
-			}
-		}
-
-		if ($APEtag = $this->GenerateAPEtag()) {
-			if (is_writable($this->filename) && is_file($this->filename) && ($fp = fopen($this->filename, 'a+b'))) {
-				$oldignoreuserabort = ignore_user_abort(true);
-				flock($fp, LOCK_EX);
-
-				$PostAPEdataOffset = $ThisFileInfo['avdataend'];
-				if (isset($ThisFileInfo['ape']['tag_offset_end'])) {
-					$PostAPEdataOffset = max($PostAPEdataOffset, $ThisFileInfo['ape']['tag_offset_end']);
-				}
-				if (isset($ThisFileInfo['lyrics3']['tag_offset_start'])) {
-					$PostAPEdataOffset = max($PostAPEdataOffset, $ThisFileInfo['lyrics3']['tag_offset_start']);
-				}
-				fseek($fp, $PostAPEdataOffset, SEEK_SET);
-				$PostAPEdata = '';
-				if ($ThisFileInfo['filesize'] > $PostAPEdataOffset) {
-					$PostAPEdata = fread($fp, $ThisFileInfo['filesize'] - $PostAPEdataOffset);
-				}
-
-				fseek($fp, $PostAPEdataOffset, SEEK_SET);
-				if (isset($ThisFileInfo['ape']['tag_offset_start'])) {
-					fseek($fp, $ThisFileInfo['ape']['tag_offset_start'], SEEK_SET);
-				}
-				ftruncate($fp, ftell($fp));
-				fwrite($fp, $APEtag, strlen($APEtag));
-				if (!empty($PostAPEdata)) {
-					fwrite($fp, $PostAPEdata, strlen($PostAPEdata));
-				}
-				flock($fp, LOCK_UN);
-				fclose($fp);
-				ignore_user_abort($oldignoreuserabort);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	function DeleteAPEtag() {
-		$getID3 = new getID3;
-		$ThisFileInfo = $getID3->analyze($this->filename);
-		if (isset($ThisFileInfo['ape']['tag_offset_start']) && isset($ThisFileInfo['ape']['tag_offset_end'])) {
-			if (is_writable($this->filename) && is_file($this->filename) && ($fp = fopen($this->filename, 'a+b'))) {
-
-				flock($fp, LOCK_EX);
-				$oldignoreuserabort = ignore_user_abort(true);
-
-				fseek($fp, $ThisFileInfo['ape']['tag_offset_end'], SEEK_SET);
-				$DataAfterAPE = '';
-				if ($ThisFileInfo['filesize'] > $ThisFileInfo['ape']['tag_offset_end']) {
-					$DataAfterAPE = fread($fp, $ThisFileInfo['filesize'] - $ThisFileInfo['ape']['tag_offset_end']);
-				}
-
-				ftruncate($fp, $ThisFileInfo['ape']['tag_offset_start']);
-				fseek($fp, $ThisFileInfo['ape']['tag_offset_start'], SEEK_SET);
-
-				if (!empty($DataAfterAPE)) {
-					fwrite($fp, $DataAfterAPE, strlen($DataAfterAPE));
-				}
-
-				flock($fp, LOCK_UN);
-				fclose($fp);
-				ignore_user_abort($oldignoreuserabort);
-
-				return true;
-			}
-			return false;
-		}
-		return true;
-	}
-
-
-	function GenerateAPEtag() {
-		// NOTE: All data passed to this function must be UTF-8 format
-
-		$items = array();
-		if (!is_array($this->tag_data)) {
-			return false;
-		}
-		foreach ($this->tag_data as $key => $arrayofvalues) {
-			if (!is_array($arrayofvalues)) {
-				return false;
-			}
-
-			$valuestring = '';
-			foreach ($arrayofvalues as $value) {
-				$valuestring .= str_replace("\x00", '', $value)."\x00";
-			}
-			$valuestring = rtrim($valuestring, "\x00");
-
-			// Length of the assigned value in bytes
-			$tagitem  = getid3_lib::LittleEndian2String(strlen($valuestring), 4);
-
-			//$tagitem .= $this->GenerateAPEtagFlags(true, true, false, 0, false);
-			$tagitem .= "\x00\x00\x00\x00";
-
-			$tagitem .= $this->CleanAPEtagItemKey($key)."\x00";
-			$tagitem .= $valuestring;
-
-			$items[] = $tagitem;
-
-		}
-
-		return $this->GenerateAPEtagHeaderFooter($items, true).implode('', $items).$this->GenerateAPEtagHeaderFooter($items, false);
-	}
-
-	function GenerateAPEtagHeaderFooter(&$items, $isheader=false) {
-		$tagdatalength = 0;
-		foreach ($items as $itemdata) {
-			$tagdatalength += strlen($itemdata);
-		}
-
-		$APEheader  = 'APETAGEX';
-		$APEheader .= getid3_lib::LittleEndian2String(2000, 4);
-		$APEheader .= getid3_lib::LittleEndian2String(32 + $tagdatalength, 4);
-		$APEheader .= getid3_lib::LittleEndian2String(count($items), 4);
-		$APEheader .= $this->GenerateAPEtagFlags(true, true, $isheader, 0, false);
-		$APEheader .= str_repeat("\x00", 8);
-
-		return $APEheader;
-	}
-
-	function GenerateAPEtagFlags($header=true, $footer=true, $isheader=false, $encodingid=0, $readonly=false) {
-		$APEtagFlags = array_fill(0, 4, 0);
-		if ($header) {
-			$APEtagFlags[0] |= 0x80; // Tag contains a header
-		}
-		if (!$footer) {
-			$APEtagFlags[0] |= 0x40; // Tag contains no footer
-		}
-		if ($isheader) {
-			$APEtagFlags[0] |= 0x20; // This is the header, not the footer
-		}
-
-		// 0: Item contains text information coded in UTF-8
-		// 1: Item contains binary information �)
-		// 2: Item is a locator of external stored information ��)
-		// 3: reserved
-		$APEtagFlags[3] |= ($encodingid << 1);
-
-		if ($readonly) {
-			$APEtagFlags[3] |= 0x01; // Tag or Item is Read Only
-		}
-
-		return chr($APEtagFlags[3]).chr($APEtagFlags[2]).chr($APEtagFlags[1]).chr($APEtagFlags[0]);
-	}
-
-	function CleanAPEtagItemKey($itemkey) {
-		$itemkey = preg_replace("#[^\x20-\x7E]#i", '', $itemkey);
-
-		// http://www.personal.uni-jena.de/~pfk/mpp/sv8/apekey.html
-		switch (strtoupper($itemkey)) {
-			case 'EAN/UPC':
-			case 'ISBN':
-			case 'LC':
-			case 'ISRC':
-				$itemkey = strtoupper($itemkey);
-				break;
-
-			default:
-				$itemkey = ucwords($itemkey);
-				break;
-		}
-		return $itemkey;
-
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/write.id3v1.php b/lib/getid3/getid3/write.id3v1.php
deleted file mode 100644
index cecccd8ac..000000000
--- a/lib/getid3/getid3/write.id3v1.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// write.id3v1.php                                             //
-// module for writing ID3v1 tags                               //
-// dependencies: module.tag.id3v1.php                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v1.php', __FILE__, true);
-
-class getid3_write_id3v1
-{
-	var $filename;
-	var $filesize;
-	var $tag_data;
-	var $warnings = array(); // any non-critical errors will be stored here
-	var $errors   = array(); // any critical errors will be stored here
-
-	function getid3_write_id3v1() {
-		return true;
-	}
-
-	function WriteID3v1() {
-		// File MUST be writeable - CHMOD(646) at least
-		if (!empty($this->filename) && is_readable($this->filename) && is_writable($this->filename) && is_file($this->filename)) {
-			$this->setRealFileSize();
-			if (($this->filesize <= 0) || !getid3_lib::intValueSupported($this->filesize)) {
-				$this->errors[] = 'Unable to WriteID3v1('.$this->filename.') because filesize ('.$this->filesize.') is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
-				return false;
-			}
-			if ($fp_source = fopen($this->filename, 'r+b')) {
-				fseek($fp_source, -128, SEEK_END);
-				if (fread($fp_source, 3) == 'TAG') {
-					fseek($fp_source, -128, SEEK_END); // overwrite existing ID3v1 tag
-				} else {
-					fseek($fp_source, 0, SEEK_END);    // append new ID3v1 tag
-				}
-				$this->tag_data['track'] = (isset($this->tag_data['track']) ? $this->tag_data['track'] : (isset($this->tag_data['track_number']) ? $this->tag_data['track_number'] : (isset($this->tag_data['tracknumber']) ? $this->tag_data['tracknumber'] : '')));
-
-				$new_id3v1_tag_data = getid3_id3v1::GenerateID3v1Tag(
-														(isset($this->tag_data['title']  ) ? $this->tag_data['title']   : ''),
-														(isset($this->tag_data['artist'] ) ? $this->tag_data['artist']  : ''),
-														(isset($this->tag_data['album']  ) ? $this->tag_data['album']   : ''),
-														(isset($this->tag_data['year']   ) ? $this->tag_data['year']    : ''),
-														(isset($this->tag_data['genreid']) ? $this->tag_data['genreid'] : ''),
-														(isset($this->tag_data['comment']) ? $this->tag_data['comment'] : ''),
-														(isset($this->tag_data['track']  ) ? $this->tag_data['track']   : ''));
-				fwrite($fp_source, $new_id3v1_tag_data, 128);
-				fclose($fp_source);
-				return true;
-
-			} else {
-				$this->errors[] = 'Could not fopen('.$this->filename.', "r+b")';
-				return false;
-			}
-		}
-		$this->errors[] = 'File is not writeable: '.$this->filename;
-		return false;
-	}
-
-	function FixID3v1Padding() {
-		// ID3v1 data is supposed to be padded with NULL characters, but some taggers incorrectly use spaces
-		// This function rewrites the ID3v1 tag with correct padding
-
-		// Initialize getID3 engine
-		$getID3 = new getID3;
-		$getID3->option_tag_id3v2  = false;
-		$getID3->option_tag_apetag = false;
-		$getID3->option_tags_html  = false;
-		$getID3->option_extra_info = false;
-		$getID3->option_tag_id3v1  = true;
-		$ThisFileInfo = $getID3->analyze($this->filename);
-		if (isset($ThisFileInfo['tags']['id3v1'])) {
-			foreach ($ThisFileInfo['tags']['id3v1'] as $key => $value) {
-				$id3v1data[$key] = implode(',', $value);
-			}
-			$this->tag_data = $id3v1data;
-			return $this->WriteID3v1();
-		}
-		return false;
-	}
-
-	function RemoveID3v1() {
-		// File MUST be writeable - CHMOD(646) at least
-		if (!empty($this->filename) && is_readable($this->filename) && is_writable($this->filename) && is_file($this->filename)) {
-			$this->setRealFileSize();
-			if (($this->filesize <= 0) || !getid3_lib::intValueSupported($this->filesize)) {
-				$this->errors[] = 'Unable to RemoveID3v1('.$this->filename.') because filesize ('.$this->filesize.') is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
-				return false;
-			}
-			if ($fp_source = fopen($this->filename, 'r+b')) {
-
-				fseek($fp_source, -128, SEEK_END);
-				if (fread($fp_source, 3) == 'TAG') {
-					ftruncate($fp_source, $this->filesize - 128);
-				} else {
-					// no ID3v1 tag to begin with - do nothing
-				}
-				fclose($fp_source);
-				return true;
-
-			} else {
-				$this->errors[] = 'Could not fopen('.$this->filename.', "r+b")';
-			}
-		} else {
-			$this->errors[] = $this->filename.' is not writeable';
-		}
-		return false;
-	}
-
-	function setRealFileSize() {
-		if (PHP_INT_MAX > 2147483647) {
-			$this->filesize = filesize($this->filename);
-			return true;
-		}
-		// 32-bit PHP will not return correct values for filesize() if file is >=2GB
-		// but getID3->analyze() has workarounds to get actual filesize
-		$getID3 = new getID3;
-		$getID3->option_tag_id3v1  = false;
-		$getID3->option_tag_id3v2  = false;
-		$getID3->option_tag_apetag = false;
-		$getID3->option_tags_html  = false;
-		$getID3->option_extra_info = false;
-		$ThisFileInfo = $getID3->analyze($this->filename);
-		$this->filesize = $ThisFileInfo['filesize'];
-		return true;
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/write.id3v2.php b/lib/getid3/getid3/write.id3v2.php
deleted file mode 100644
index ee7c5de2d..000000000
--- a/lib/getid3/getid3/write.id3v2.php
+++ /dev/null
@@ -1,2050 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-///                                                            //
-// write.id3v2.php                                             //
-// module for writing ID3v2 tags                               //
-// dependencies: module.tag.id3v2.php                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true);
-
-class getid3_write_id3v2
-{
-	var $filename;
-	var $tag_data;
-	var $fread_buffer_size           = 32768;    // read buffer size in bytes
-	var $paddedlength                = 4096;     // minimum length of ID3v2 tag in bytes
-	var $majorversion                = 3;        // ID3v2 major version (2, 3 (recommended), 4)
-	var $minorversion                = 0;        // ID3v2 minor version - always 0
-	var $merge_existing_data         = false;    // if true, merge new data with existing tags; if false, delete old tag data and only write new tags
-	var $id3v2_default_encodingid    = 0;        // default text encoding (ISO-8859-1) if not explicitly passed
-	var $id3v2_use_unsynchronisation = false;    // the specs say it should be TRUE, but most other ID3v2-aware programs are broken if unsynchronization is used, so by default don't use it.
-	var $warnings                    = array();  // any non-critical errors will be stored here
-	var $errors                      = array();  // any critical errors will be stored here
-
-	function getid3_write_id3v2() {
-		return true;
-	}
-
-	function WriteID3v2() {
-		// File MUST be writeable - CHMOD(646) at least. It's best if the
-		// directory is also writeable, because that method is both faster and less susceptible to errors.
-
-		if (!empty($this->filename) && (is_writeable($this->filename) || (!file_exists($this->filename) && is_writeable(dirname($this->filename))))) {
-			// Initialize getID3 engine
-			$getID3 = new getID3;
-			$OldThisFileInfo = $getID3->analyze($this->filename);
-			if (!getid3_lib::intValueSupported($OldThisFileInfo['filesize'])) {
-				$this->errors[] = 'Unable to write ID3v2 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
-				fclose($fp_source);
-				return false;
-			}
-			if ($this->merge_existing_data) {
-				// merge with existing data
-				if (!empty($OldThisFileInfo['id3v2'])) {
-					$this->tag_data = $this->array_join_merge($OldThisFileInfo['id3v2'], $this->tag_data);
-				}
-			}
-			$this->paddedlength = (isset($OldThisFileInfo['id3v2']['headerlength']) ? max($OldThisFileInfo['id3v2']['headerlength'], $this->paddedlength) : $this->paddedlength);
-
-			if ($NewID3v2Tag = $this->GenerateID3v2Tag()) {
-
-				if (file_exists($this->filename) && is_writeable($this->filename) && isset($OldThisFileInfo['id3v2']['headerlength']) && ($OldThisFileInfo['id3v2']['headerlength'] == strlen($NewID3v2Tag))) {
-
-					// best and fastest method - insert-overwrite existing tag (padded to length of old tag if neccesary)
-					if (file_exists($this->filename)) {
-
-						if (is_readable($this->filename) && is_writable($this->filename) && is_file($this->filename) && ($fp = fopen($this->filename, 'r+b'))) {
-							rewind($fp);
-							fwrite($fp, $NewID3v2Tag, strlen($NewID3v2Tag));
-							fclose($fp);
-						} else {
-							$this->errors[] = 'Could not fopen("'.$this->filename.'", "r+b")';
-						}
-
-					} else {
-
-						if (is_writable($this->filename) && is_file($this->filename) && ($fp = fopen($this->filename, 'wb'))) {
-							rewind($fp);
-							fwrite($fp, $NewID3v2Tag, strlen($NewID3v2Tag));
-							fclose($fp);
-						} else {
-							$this->errors[] = 'Could not fopen("'.$this->filename.'", "wb")';
-						}
-
-					}
-
-				} else {
-
-					if ($tempfilename = tempnam(GETID3_TEMP_DIR, 'getID3')) {
-						if (is_readable($this->filename) && is_file($this->filename) && ($fp_source = fopen($this->filename, 'rb'))) {
-							if (is_writable($tempfilename) && is_file($tempfilename) && ($fp_temp = fopen($tempfilename, 'wb'))) {
-
-								fwrite($fp_temp, $NewID3v2Tag, strlen($NewID3v2Tag));
-
-								rewind($fp_source);
-								if (!empty($OldThisFileInfo['avdataoffset'])) {
-									fseek($fp_source, $OldThisFileInfo['avdataoffset'], SEEK_SET);
-								}
-
-								while ($buffer = fread($fp_source, $this->fread_buffer_size)) {
-									fwrite($fp_temp, $buffer, strlen($buffer));
-								}
-
-								fclose($fp_temp);
-								fclose($fp_source);
-								copy($tempfilename, $this->filename);
-								unlink($tempfilename);
-								return true;
-
-							} else {
-								$this->errors[] = 'Could not fopen("'.$tempfilename.'", "wb")';
-							}
-							fclose($fp_source);
-
-						} else {
-							$this->errors[] = 'Could not fopen("'.$this->filename.'", "rb")';
-						}
-					}
-					return false;
-
-				}
-
-			} else {
-
-				$this->errors[] = '$this->GenerateID3v2Tag() failed';
-
-			}
-
-			if (!empty($this->errors)) {
-				return false;
-			}
-			return true;
-		} else {
-			$this->errors[] = 'WriteID3v2() failed: !is_writeable('.$this->filename.')';
-		}
-		return false;
-	}
-
-	function RemoveID3v2() {
-		// File MUST be writeable - CHMOD(646) at least. It's best if the
-		// directory is also writeable, because that method is both faster and less susceptible to errors.
-		if (is_writeable(dirname($this->filename))) {
-
-			// preferred method - only one copying operation, minimal chance of corrupting
-			// original file if script is interrupted, but required directory to be writeable
-			if (is_readable($this->filename) && is_file($this->filename) && ($fp_source = fopen($this->filename, 'rb'))) {
-
-				// Initialize getID3 engine
-				$getID3 = new getID3;
-				$OldThisFileInfo = $getID3->analyze($this->filename);
-				if (!getid3_lib::intValueSupported($OldThisFileInfo['filesize'])) {
-					$this->errors[] = 'Unable to remove ID3v2 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
-					fclose($fp_source);
-					return false;
-				}
-				rewind($fp_source);
-				if ($OldThisFileInfo['avdataoffset'] !== false) {
-					fseek($fp_source, $OldThisFileInfo['avdataoffset'], SEEK_SET);
-				}
-				if (is_writable($this->filename) && is_file($this->filename) && ($fp_temp = fopen($this->filename.'getid3tmp', 'w+b'))) {
-					while ($buffer = fread($fp_source, $this->fread_buffer_size)) {
-						fwrite($fp_temp, $buffer, strlen($buffer));
-					}
-					fclose($fp_temp);
-				} else {
-					$this->errors[] = 'Could not fopen("'.$this->filename.'getid3tmp", "w+b")';
-				}
-				fclose($fp_source);
-			} else {
-				$this->errors[] = 'Could not fopen("'.$this->filename.'", "rb")';
-			}
-			if (file_exists($this->filename)) {
-				unlink($this->filename);
-			}
-			rename($this->filename.'getid3tmp', $this->filename);
-
-		} elseif (is_writable($this->filename)) {
-
-			// less desirable alternate method - double-copies the file, overwrites original file
-			// and could corrupt source file if the script is interrupted or an error occurs.
-			if (is_readable($this->filename) && is_file($this->filename) && ($fp_source = fopen($this->filename, 'rb'))) {
-
-				// Initialize getID3 engine
-				$getID3 = new getID3;
-				$OldThisFileInfo = $getID3->analyze($this->filename);
-				if (!getid3_lib::intValueSupported($OldThisFileInfo['filesize'])) {
-					$this->errors[] = 'Unable to remove ID3v2 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
-					fclose($fp_source);
-					return false;
-				}
-				rewind($fp_source);
-				if ($OldThisFileInfo['avdataoffset'] !== false) {
-					fseek($fp_source, $OldThisFileInfo['avdataoffset'], SEEK_SET);
-				}
-				if ($fp_temp = tmpfile()) {
-					while ($buffer = fread($fp_source, $this->fread_buffer_size)) {
-						fwrite($fp_temp, $buffer, strlen($buffer));
-					}
-					fclose($fp_source);
-					if (is_writable($this->filename) && is_file($this->filename) && ($fp_source = fopen($this->filename, 'wb'))) {
-						rewind($fp_temp);
-						while ($buffer = fread($fp_temp, $this->fread_buffer_size)) {
-							fwrite($fp_source, $buffer, strlen($buffer));
-						}
-						fseek($fp_temp, -128, SEEK_END);
-						fclose($fp_source);
-					} else {
-						$this->errors[] = 'Could not fopen("'.$this->filename.'", "wb")';
-					}
-					fclose($fp_temp);
-				} else {
-					$this->errors[] = 'Could not create tmpfile()';
-				}
-			} else {
-				$this->errors[] = 'Could not fopen("'.$this->filename.'", "rb")';
-			}
-
-		} else {
-
-			$this->errors[] = 'Directory and file both not writeable';
-
-		}
-
-		if (!empty($this->errors)) {
-			return false;
-		}
-		return true;
-	}
-
-
-	function GenerateID3v2TagFlags($flags) {
-		switch ($this->majorversion) {
-			case 4:
-				// %abcd0000
-				$flag  = (!empty($flags['unsynchronisation']) ? '1' : '0'); // a - Unsynchronisation
-				$flag .= (!empty($flags['extendedheader']   ) ? '1' : '0'); // b - Extended header
-				$flag .= (!empty($flags['experimental']     ) ? '1' : '0'); // c - Experimental indicator
-				$flag .= (!empty($flags['footer']           ) ? '1' : '0'); // d - Footer present
-				$flag .= '0000';
-				break;
-
-			case 3:
-				// %abc00000
-				$flag  = (!empty($flags['unsynchronisation']) ? '1' : '0'); // a - Unsynchronisation
-				$flag .= (!empty($flags['extendedheader']   ) ? '1' : '0'); // b - Extended header
-				$flag .= (!empty($flags['experimental']     ) ? '1' : '0'); // c - Experimental indicator
-				$flag .= '00000';
-				break;
-
-			case 2:
-				// %ab000000
-				$flag  = (!empty($flags['unsynchronisation']) ? '1' : '0'); // a - Unsynchronisation
-				$flag .= (!empty($flags['compression']      ) ? '1' : '0'); // b - Compression
-				$flag .= '000000';
-				break;
-
-			default:
-				return false;
-				break;
-		}
-		return chr(bindec($flag));
-	}
-
-
-	function GenerateID3v2FrameFlags($TagAlter=false, $FileAlter=false, $ReadOnly=false, $Compression=false, $Encryption=false, $GroupingIdentity=false, $Unsynchronisation=false, $DataLengthIndicator=false) {
-		switch ($this->majorversion) {
-			case 4:
-				// %0abc0000 %0h00kmnp
-				$flag1  = '0';
-				$flag1 .= $TagAlter  ? '1' : '0'; // a - Tag alter preservation (true == discard)
-				$flag1 .= $FileAlter ? '1' : '0'; // b - File alter preservation (true == discard)
-				$flag1 .= $ReadOnly  ? '1' : '0'; // c - Read only (true == read only)
-				$flag1 .= '0000';
-
-				$flag2  = '0';
-				$flag2 .= $GroupingIdentity    ? '1' : '0'; // h - Grouping identity (true == contains group information)
-				$flag2 .= '00';
-				$flag2 .= $Compression         ? '1' : '0'; // k - Compression (true == compressed)
-				$flag2 .= $Encryption          ? '1' : '0'; // m - Encryption (true == encrypted)
-				$flag2 .= $Unsynchronisation   ? '1' : '0'; // n - Unsynchronisation (true == unsynchronised)
-				$flag2 .= $DataLengthIndicator ? '1' : '0'; // p - Data length indicator (true == data length indicator added)
-				break;
-
-			case 3:
-				// %abc00000 %ijk00000
-				$flag1  = $TagAlter  ? '1' : '0';  // a - Tag alter preservation (true == discard)
-				$flag1 .= $FileAlter ? '1' : '0';  // b - File alter preservation (true == discard)
-				$flag1 .= $ReadOnly  ? '1' : '0';  // c - Read only (true == read only)
-				$flag1 .= '00000';
-
-				$flag2  = $Compression      ? '1' : '0';      // i - Compression (true == compressed)
-				$flag2 .= $Encryption       ? '1' : '0';      // j - Encryption (true == encrypted)
-				$flag2 .= $GroupingIdentity ? '1' : '0';      // k - Grouping identity (true == contains group information)
-				$flag2 .= '00000';
-				break;
-
-			default:
-				return false;
-				break;
-
-		}
-		return chr(bindec($flag1)).chr(bindec($flag2));
-	}
-
-	function GenerateID3v2FrameData($frame_name, $source_data_array) {
-		if (!getid3_id3v2::IsValidID3v2FrameName($frame_name, $this->majorversion)) {
-			return false;
-		}
-		$framedata = '';
-
-		if (($this->majorversion < 3) || ($this->majorversion > 4)) {
-
-			$this->errors[] = 'Only ID3v2.3 and ID3v2.4 are supported in GenerateID3v2FrameData()';
-
-		} else { // $this->majorversion 3 or 4
-
-			switch ($frame_name) {
-				case 'UFID':
-					// 4.1   UFID Unique file identifier
-					// Owner identifier        <text string> $00
-					// Identifier              <up to 64 bytes binary data>
-					if (strlen($source_data_array['data']) > 64) {
-						$this->errors[] = 'Identifier not allowed to be longer than 64 bytes in '.$frame_name.' (supplied data was '.strlen($source_data_array['data']).' bytes long)';
-					} else {
-						$framedata .= str_replace("\x00", '', $source_data_array['ownerid'])."\x00";
-						$framedata .= substr($source_data_array['data'], 0, 64); // max 64 bytes - truncate anything longer
-					}
-					break;
-
-				case 'TXXX':
-					// 4.2.2 TXXX User defined text information frame
-					// Text encoding     $xx
-					// Description       <text string according to encoding> $00 (00)
-					// Value             <text string according to encoding>
-					$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
-					if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'], $this->majorversion)) {
-						$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].') for ID3v2.'.$this->majorversion;
-					} else {
-						$framedata .= chr($source_data_array['encodingid']);
-						$framedata .= $source_data_array['description'].getid3_id3v2::TextEncodingTerminatorLookup($source_data_array['encodingid']);
-						$framedata .= $source_data_array['data'];
-					}
-					break;
-
-				case 'WXXX':
-					// 4.3.2 WXXX User defined URL link frame
-					// Text encoding     $xx
-					// Description       <text string according to encoding> $00 (00)
-					// URL               <text string>
-					$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
-					if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'], $this->majorversion)) {
-						$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].') for ID3v2.'.$this->majorversion;
-					} elseif (!isset($source_data_array['data']) || !$this->IsValidURL($source_data_array['data'], false, false)) {
-						//$this->errors[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
-						// probably should be an error, need to rewrite IsValidURL() to handle other encodings
-						$this->warnings[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
-					} else {
-						$framedata .= chr($source_data_array['encodingid']);
-						$framedata .= $source_data_array['description'].getid3_id3v2::TextEncodingTerminatorLookup($source_data_array['encodingid']);
-						$framedata .= $source_data_array['data'];
-					}
-					break;
-
-				case 'IPLS':
-					// 4.4  IPLS Involved people list (ID3v2.3 only)
-					// Text encoding     $xx
-					// People list strings    <textstrings>
-					$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
-					if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'], $this->majorversion)) {
-						$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].') for ID3v2.'.$this->majorversion;
-					} else {
-						$framedata .= chr($source_data_array['encodingid']);
-						$framedata .= $source_data_array['data'];
-					}
-					break;
-
-				case 'MCDI':
-					// 4.4   MCDI Music CD identifier
-					// CD TOC                <binary data>
-					$framedata .= $source_data_array['data'];
-					break;
-
-				case 'ETCO':
-					// 4.5   ETCO Event timing codes
-					// Time stamp format    $xx
-					//   Where time stamp format is:
-					// $01  (32-bit value) MPEG frames from beginning of file
-					// $02  (32-bit value) milliseconds from beginning of file
-					//   Followed by a list of key events in the following format:
-					// Type of event   $xx
-					// Time stamp      $xx (xx ...)
-					//   The 'Time stamp' is set to zero if directly at the beginning of the sound
-					//   or after the previous event. All events MUST be sorted in chronological order.
-					if (($source_data_array['timestampformat'] > 2) || ($source_data_array['timestampformat'] < 1)) {
-						$this->errors[] = 'Invalid Time Stamp Format byte in '.$frame_name.' ('.$source_data_array['timestampformat'].')';
-					} else {
-						$framedata .= chr($source_data_array['timestampformat']);
-						foreach ($source_data_array as $key => $val) {
-							if (!$this->ID3v2IsValidETCOevent($val['typeid'])) {
-								$this->errors[] = 'Invalid Event Type byte in '.$frame_name.' ('.$val['typeid'].')';
-							} elseif (($key != 'timestampformat') && ($key != 'flags')) {
-								if (($val['timestamp'] > 0) && ($previousETCOtimestamp >= $val['timestamp'])) {
-									//   The 'Time stamp' is set to zero if directly at the beginning of the sound
-									//   or after the previous event. All events MUST be sorted in chronological order.
-									$this->errors[] = 'Out-of-order timestamp in '.$frame_name.' ('.$val['timestamp'].') for Event Type ('.$val['typeid'].')';
-								} else {
-									$framedata .= chr($val['typeid']);
-									$framedata .= getid3_lib::BigEndian2String($val['timestamp'], 4, false);
-								}
-							}
-						}
-					}
-					break;
-
-				case 'MLLT':
-					// 4.6   MLLT MPEG location lookup table
-					// MPEG frames between reference  $xx xx
-					// Bytes between reference        $xx xx xx
-					// Milliseconds between reference $xx xx xx
-					// Bits for bytes deviation       $xx
-					// Bits for milliseconds dev.     $xx
-					//   Then for every reference the following data is included;
-					// Deviation in bytes         %xxx....
-					// Deviation in milliseconds  %xxx....
-					if (($source_data_array['framesbetweenreferences'] > 0) && ($source_data_array['framesbetweenreferences'] <= 65535)) {
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['framesbetweenreferences'], 2, false);
-					} else {
-						$this->errors[] = 'Invalid MPEG Frames Between References in '.$frame_name.' ('.$source_data_array['framesbetweenreferences'].')';
-					}
-					if (($source_data_array['bytesbetweenreferences'] > 0) && ($source_data_array['bytesbetweenreferences'] <= 16777215)) {
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['bytesbetweenreferences'], 3, false);
-					} else {
-						$this->errors[] = 'Invalid bytes Between References in '.$frame_name.' ('.$source_data_array['bytesbetweenreferences'].')';
-					}
-					if (($source_data_array['msbetweenreferences'] > 0) && ($source_data_array['msbetweenreferences'] <= 16777215)) {
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['msbetweenreferences'], 3, false);
-					} else {
-						$this->errors[] = 'Invalid Milliseconds Between References in '.$frame_name.' ('.$source_data_array['msbetweenreferences'].')';
-					}
-					if (!$this->IsWithinBitRange($source_data_array['bitsforbytesdeviation'], 8, false)) {
-						if (($source_data_array['bitsforbytesdeviation'] % 4) == 0) {
-							$framedata .= chr($source_data_array['bitsforbytesdeviation']);
-						} else {
-							$this->errors[] = 'Bits For Bytes Deviation in '.$frame_name.' ('.$source_data_array['bitsforbytesdeviation'].') must be a multiple of 4.';
-						}
-					} else {
-						$this->errors[] = 'Invalid Bits For Bytes Deviation in '.$frame_name.' ('.$source_data_array['bitsforbytesdeviation'].')';
-					}
-					if (!$this->IsWithinBitRange($source_data_array['bitsformsdeviation'], 8, false)) {
-						if (($source_data_array['bitsformsdeviation'] % 4) == 0) {
-							$framedata .= chr($source_data_array['bitsformsdeviation']);
-						} else {
-							$this->errors[] = 'Bits For Milliseconds Deviation in '.$frame_name.' ('.$source_data_array['bitsforbytesdeviation'].') must be a multiple of 4.';
-						}
-					} else {
-						$this->errors[] = 'Invalid Bits For Milliseconds Deviation in '.$frame_name.' ('.$source_data_array['bitsformsdeviation'].')';
-					}
-					foreach ($source_data_array as $key => $val) {
-						if (($key != 'framesbetweenreferences') && ($key != 'bytesbetweenreferences') && ($key != 'msbetweenreferences') && ($key != 'bitsforbytesdeviation') && ($key != 'bitsformsdeviation') && ($key != 'flags')) {
-							$unwrittenbitstream .= str_pad(getid3_lib::Dec2Bin($val['bytedeviation']), $source_data_array['bitsforbytesdeviation'], '0', STR_PAD_LEFT);
-							$unwrittenbitstream .= str_pad(getid3_lib::Dec2Bin($val['msdeviation']),   $source_data_array['bitsformsdeviation'],    '0', STR_PAD_LEFT);
-						}
-					}
-					for ($i = 0; $i < strlen($unwrittenbitstream); $i += 8) {
-						$highnibble = bindec(substr($unwrittenbitstream, $i, 4)) << 4;
-						$lownibble  = bindec(substr($unwrittenbitstream, $i + 4, 4));
-						$framedata .= chr($highnibble & $lownibble);
-					}
-					break;
-
-				case 'SYTC':
-					// 4.7   SYTC Synchronised tempo codes
-					// Time stamp format   $xx
-					// Tempo data          <binary data>
-					//   Where time stamp format is:
-					// $01  (32-bit value) MPEG frames from beginning of file
-					// $02  (32-bit value) milliseconds from beginning of file
-					if (($source_data_array['timestampformat'] > 2) || ($source_data_array['timestampformat'] < 1)) {
-						$this->errors[] = 'Invalid Time Stamp Format byte in '.$frame_name.' ('.$source_data_array['timestampformat'].')';
-					} else {
-						$framedata .= chr($source_data_array['timestampformat']);
-						foreach ($source_data_array as $key => $val) {
-							if (!$this->ID3v2IsValidETCOevent($val['typeid'])) {
-								$this->errors[] = 'Invalid Event Type byte in '.$frame_name.' ('.$val['typeid'].')';
-							} elseif (($key != 'timestampformat') && ($key != 'flags')) {
-								if (($val['tempo'] < 0) || ($val['tempo'] > 510)) {
-									$this->errors[] = 'Invalid Tempo (max = 510) in '.$frame_name.' ('.$val['tempo'].') at timestamp ('.$val['timestamp'].')';
-								} else {
-									if ($val['tempo'] > 255) {
-										$framedata .= chr(255);
-										$val['tempo'] -= 255;
-									}
-									$framedata .= chr($val['tempo']);
-									$framedata .= getid3_lib::BigEndian2String($val['timestamp'], 4, false);
-								}
-							}
-						}
-					}
-					break;
-
-				case 'USLT':
-					// 4.8   USLT Unsynchronised lyric/text transcription
-					// Text encoding        $xx
-					// Language             $xx xx xx
-					// Content descriptor   <text string according to encoding> $00 (00)
-					// Lyrics/text          <full text string according to encoding>
-					$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
-					if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'])) {
-						$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].') for ID3v2.'.$this->majorversion;
-					} elseif (getid3_id3v2::LanguageLookup($source_data_array['language'], true) == '') {
-						$this->errors[] = 'Invalid Language in '.$frame_name.' ('.$source_data_array['language'].')';
-					} else {
-						$framedata .= chr($source_data_array['encodingid']);
-						$framedata .= strtolower($source_data_array['language']);
-						$framedata .= $source_data_array['description'].getid3_id3v2::TextEncodingTerminatorLookup($source_data_array['encodingid']);
-						$framedata .= $source_data_array['data'];
-					}
-					break;
-
-				case 'SYLT':
-					// 4.9   SYLT Synchronised lyric/text
-					// Text encoding        $xx
-					// Language             $xx xx xx
-					// Time stamp format    $xx
-					//   $01  (32-bit value) MPEG frames from beginning of file
-					//   $02  (32-bit value) milliseconds from beginning of file
-					// Content type         $xx
-					// Content descriptor   <text string according to encoding> $00 (00)
-					//   Terminated text to be synced (typically a syllable)
-					//   Sync identifier (terminator to above string)   $00 (00)
-					//   Time stamp                                     $xx (xx ...)
-					$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
-					if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'])) {
-						$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].') for ID3v2.'.$this->majorversion;
-					} elseif (getid3_id3v2::LanguageLookup($source_data_array['language'], true) == '') {
-						$this->errors[] = 'Invalid Language in '.$frame_name.' ('.$source_data_array['language'].')';
-					} elseif (($source_data_array['timestampformat'] > 2) || ($source_data_array['timestampformat'] < 1)) {
-						$this->errors[] = 'Invalid Time Stamp Format byte in '.$frame_name.' ('.$source_data_array['timestampformat'].')';
-					} elseif (!$this->ID3v2IsValidSYLTtype($source_data_array['contenttypeid'])) {
-						$this->errors[] = 'Invalid Content Type byte in '.$frame_name.' ('.$source_data_array['contenttypeid'].')';
-					} elseif (!is_array($source_data_array['data'])) {
-						$this->errors[] = 'Invalid Lyric/Timestamp data in '.$frame_name.' (must be an array)';
-					} else {
-						$framedata .= chr($source_data_array['encodingid']);
-						$framedata .= strtolower($source_data_array['language']);
-						$framedata .= chr($source_data_array['timestampformat']);
-						$framedata .= chr($source_data_array['contenttypeid']);
-						$framedata .= $source_data_array['description'].getid3_id3v2::TextEncodingTerminatorLookup($source_data_array['encodingid']);
-						ksort($source_data_array['data']);
-						foreach ($source_data_array['data'] as $key => $val) {
-							$framedata .= $val['data'].getid3_id3v2::TextEncodingTerminatorLookup($source_data_array['encodingid']);
-							$framedata .= getid3_lib::BigEndian2String($val['timestamp'], 4, false);
-						}
-					}
-					break;
-
-				case 'COMM':
-					// 4.10  COMM Comments
-					// Text encoding          $xx
-					// Language               $xx xx xx
-					// Short content descrip. <text string according to encoding> $00 (00)
-					// The actual text        <full text string according to encoding>
-					$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
-					if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'])) {
-						$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].') for ID3v2.'.$this->majorversion;
-					} elseif (getid3_id3v2::LanguageLookup($source_data_array['language'], true) == '') {
-						$this->errors[] = 'Invalid Language in '.$frame_name.' ('.$source_data_array['language'].')';
-					} else {
-						$framedata .= chr($source_data_array['encodingid']);
-						$framedata .= strtolower($source_data_array['language']);
-						$framedata .= $source_data_array['description'].getid3_id3v2::TextEncodingTerminatorLookup($source_data_array['encodingid']);
-						$framedata .= $source_data_array['data'];
-					}
-					break;
-
-				case 'RVA2':
-					// 4.11  RVA2 Relative volume adjustment (2) (ID3v2.4+ only)
-					// Identification          <text string> $00
-					//   The 'identification' string is used to identify the situation and/or
-					//   device where this adjustment should apply. The following is then
-					//   repeated for every channel:
-					// Type of channel         $xx
-					// Volume adjustment       $xx xx
-					// Bits representing peak  $xx
-					// Peak volume             $xx (xx ...)
-					$framedata .= str_replace("\x00", '', $source_data_array['description'])."\x00";
-					foreach ($source_data_array as $key => $val) {
-						if ($key != 'description') {
-							$framedata .= chr($val['channeltypeid']);
-							$framedata .= getid3_lib::BigEndian2String($val['volumeadjust'], 2, false, true); // signed 16-bit
-							if (!$this->IsWithinBitRange($source_data_array['bitspeakvolume'], 8, false)) {
-								$framedata .= chr($val['bitspeakvolume']);
-								if ($val['bitspeakvolume'] > 0) {
-									$framedata .= getid3_lib::BigEndian2String($val['peakvolume'], ceil($val['bitspeakvolume'] / 8), false, false);
-								}
-							} else {
-								$this->errors[] = 'Invalid Bits Representing Peak Volume in '.$frame_name.' ('.$val['bitspeakvolume'].') (range = 0 to 255)';
-							}
-						}
-					}
-					break;
-
-				case 'RVAD':
-					// 4.12  RVAD Relative volume adjustment (ID3v2.3 only)
-					// Increment/decrement     %00fedcba
-					// Bits used for volume descr.        $xx
-					// Relative volume change, right      $xx xx (xx ...) // a
-					// Relative volume change, left       $xx xx (xx ...) // b
-					// Peak volume right                  $xx xx (xx ...)
-					// Peak volume left                   $xx xx (xx ...)
-					// Relative volume change, right back $xx xx (xx ...) // c
-					// Relative volume change, left back  $xx xx (xx ...) // d
-					// Peak volume right back             $xx xx (xx ...)
-					// Peak volume left back              $xx xx (xx ...)
-					// Relative volume change, center     $xx xx (xx ...) // e
-					// Peak volume center                 $xx xx (xx ...)
-					// Relative volume change, bass       $xx xx (xx ...) // f
-					// Peak volume bass                   $xx xx (xx ...)
-					if (!$this->IsWithinBitRange($source_data_array['bitsvolume'], 8, false)) {
-						$this->errors[] = 'Invalid Bits For Volume Description byte in '.$frame_name.' ('.$source_data_array['bitsvolume'].') (range = 1 to 255)';
-					} else {
-						$incdecflag .= '00';
-						$incdecflag .= $source_data_array['incdec']['right']     ? '1' : '0';     // a - Relative volume change, right
-						$incdecflag .= $source_data_array['incdec']['left']      ? '1' : '0';      // b - Relative volume change, left
-						$incdecflag .= $source_data_array['incdec']['rightrear'] ? '1' : '0'; // c - Relative volume change, right back
-						$incdecflag .= $source_data_array['incdec']['leftrear']  ? '1' : '0';  // d - Relative volume change, left back
-						$incdecflag .= $source_data_array['incdec']['center']    ? '1' : '0';    // e - Relative volume change, center
-						$incdecflag .= $source_data_array['incdec']['bass']      ? '1' : '0';      // f - Relative volume change, bass
-						$framedata .= chr(bindec($incdecflag));
-						$framedata .= chr($source_data_array['bitsvolume']);
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['volumechange']['right'], ceil($source_data_array['bitsvolume'] / 8), false);
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['volumechange']['left'],  ceil($source_data_array['bitsvolume'] / 8), false);
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['peakvolume']['right'], ceil($source_data_array['bitsvolume'] / 8), false);
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['peakvolume']['left'],  ceil($source_data_array['bitsvolume'] / 8), false);
-						if ($source_data_array['volumechange']['rightrear'] || $source_data_array['volumechange']['leftrear'] ||
-							$source_data_array['peakvolume']['rightrear'] || $source_data_array['peakvolume']['leftrear'] ||
-							$source_data_array['volumechange']['center'] || $source_data_array['peakvolume']['center'] ||
-							$source_data_array['volumechange']['bass'] || $source_data_array['peakvolume']['bass']) {
-								$framedata .= getid3_lib::BigEndian2String($source_data_array['volumechange']['rightrear'], ceil($source_data_array['bitsvolume']/8), false);
-								$framedata .= getid3_lib::BigEndian2String($source_data_array['volumechange']['leftrear'],  ceil($source_data_array['bitsvolume']/8), false);
-								$framedata .= getid3_lib::BigEndian2String($source_data_array['peakvolume']['rightrear'], ceil($source_data_array['bitsvolume']/8), false);
-								$framedata .= getid3_lib::BigEndian2String($source_data_array['peakvolume']['leftrear'],  ceil($source_data_array['bitsvolume']/8), false);
-						}
-						if ($source_data_array['volumechange']['center'] || $source_data_array['peakvolume']['center'] ||
-							$source_data_array['volumechange']['bass'] || $source_data_array['peakvolume']['bass']) {
-								$framedata .= getid3_lib::BigEndian2String($source_data_array['volumechange']['center'], ceil($source_data_array['bitsvolume']/8), false);
-								$framedata .= getid3_lib::BigEndian2String($source_data_array['peakvolume']['center'], ceil($source_data_array['bitsvolume']/8), false);
-						}
-						if ($source_data_array['volumechange']['bass'] || $source_data_array['peakvolume']['bass']) {
-								$framedata .= getid3_lib::BigEndian2String($source_data_array['volumechange']['bass'], ceil($source_data_array['bitsvolume']/8), false);
-								$framedata .= getid3_lib::BigEndian2String($source_data_array['peakvolume']['bass'], ceil($source_data_array['bitsvolume']/8), false);
-						}
-					}
-					break;
-
-				case 'EQU2':
-					// 4.12  EQU2 Equalisation (2) (ID3v2.4+ only)
-					// Interpolation method  $xx
-					//   $00  Band
-					//   $01  Linear
-					// Identification        <text string> $00
-					//   The following is then repeated for every adjustment point
-					// Frequency          $xx xx
-					// Volume adjustment  $xx xx
-					if (($source_data_array['interpolationmethod'] < 0) || ($source_data_array['interpolationmethod'] > 1)) {
-						$this->errors[] = 'Invalid Interpolation Method byte in '.$frame_name.' ('.$source_data_array['interpolationmethod'].') (valid = 0 or 1)';
-					} else {
-						$framedata .= chr($source_data_array['interpolationmethod']);
-						$framedata .= str_replace("\x00", '', $source_data_array['description'])."\x00";
-						foreach ($source_data_array['data'] as $key => $val) {
-							$framedata .= getid3_lib::BigEndian2String(intval(round($key * 2)), 2, false);
-							$framedata .= getid3_lib::BigEndian2String($val, 2, false, true); // signed 16-bit
-						}
-					}
-					break;
-
-				case 'EQUA':
-					// 4.12  EQUA Equalisation (ID3v2.3 only)
-					// Adjustment bits    $xx
-					//   This is followed by 2 bytes + ('adjustment bits' rounded up to the
-					//   nearest byte) for every equalisation band in the following format,
-					//   giving a frequency range of 0 - 32767Hz:
-					// Increment/decrement   %x (MSB of the Frequency)
-					// Frequency             (lower 15 bits)
-					// Adjustment            $xx (xx ...)
-					if (!$this->IsWithinBitRange($source_data_array['bitsvolume'], 8, false)) {
-						$this->errors[] = 'Invalid Adjustment Bits byte in '.$frame_name.' ('.$source_data_array['bitsvolume'].') (range = 1 to 255)';
-					} else {
-						$framedata .= chr($source_data_array['adjustmentbits']);
-						foreach ($source_data_array as $key => $val) {
-							if ($key != 'bitsvolume') {
-								if (($key > 32767) || ($key < 0)) {
-									$this->errors[] = 'Invalid Frequency in '.$frame_name.' ('.$key.') (range = 0 to 32767)';
-								} else {
-									if ($val >= 0) {
-										// put MSB of frequency to 1 if increment, 0 if decrement
-										$key |= 0x8000;
-									}
-									$framedata .= getid3_lib::BigEndian2String($key, 2, false);
-									$framedata .= getid3_lib::BigEndian2String($val, ceil($source_data_array['adjustmentbits'] / 8), false);
-								}
-							}
-						}
-					}
-					break;
-
-				case 'RVRB':
-					// 4.13  RVRB Reverb
-					// Reverb left (ms)                 $xx xx
-					// Reverb right (ms)                $xx xx
-					// Reverb bounces, left             $xx
-					// Reverb bounces, right            $xx
-					// Reverb feedback, left to left    $xx
-					// Reverb feedback, left to right   $xx
-					// Reverb feedback, right to right  $xx
-					// Reverb feedback, right to left   $xx
-					// Premix left to right             $xx
-					// Premix right to left             $xx
-					if (!$this->IsWithinBitRange($source_data_array['left'], 16, false)) {
-						$this->errors[] = 'Invalid Reverb Left in '.$frame_name.' ('.$source_data_array['left'].') (range = 0 to 65535)';
-					} elseif (!$this->IsWithinBitRange($source_data_array['right'], 16, false)) {
-						$this->errors[] = 'Invalid Reverb Left in '.$frame_name.' ('.$source_data_array['right'].') (range = 0 to 65535)';
-					} elseif (!$this->IsWithinBitRange($source_data_array['bouncesL'], 8, false)) {
-						$this->errors[] = 'Invalid Reverb Bounces, Left in '.$frame_name.' ('.$source_data_array['bouncesL'].') (range = 0 to 255)';
-					} elseif (!$this->IsWithinBitRange($source_data_array['bouncesR'], 8, false)) {
-						$this->errors[] = 'Invalid Reverb Bounces, Right in '.$frame_name.' ('.$source_data_array['bouncesR'].') (range = 0 to 255)';
-					} elseif (!$this->IsWithinBitRange($source_data_array['feedbackLL'], 8, false)) {
-						$this->errors[] = 'Invalid Reverb Feedback, Left-To-Left in '.$frame_name.' ('.$source_data_array['feedbackLL'].') (range = 0 to 255)';
-					} elseif (!$this->IsWithinBitRange($source_data_array['feedbackLR'], 8, false)) {
-						$this->errors[] = 'Invalid Reverb Feedback, Left-To-Right in '.$frame_name.' ('.$source_data_array['feedbackLR'].') (range = 0 to 255)';
-					} elseif (!$this->IsWithinBitRange($source_data_array['feedbackRR'], 8, false)) {
-						$this->errors[] = 'Invalid Reverb Feedback, Right-To-Right in '.$frame_name.' ('.$source_data_array['feedbackRR'].') (range = 0 to 255)';
-					} elseif (!$this->IsWithinBitRange($source_data_array['feedbackRL'], 8, false)) {
-						$this->errors[] = 'Invalid Reverb Feedback, Right-To-Left in '.$frame_name.' ('.$source_data_array['feedbackRL'].') (range = 0 to 255)';
-					} elseif (!$this->IsWithinBitRange($source_data_array['premixLR'], 8, false)) {
-						$this->errors[] = 'Invalid Premix, Left-To-Right in '.$frame_name.' ('.$source_data_array['premixLR'].') (range = 0 to 255)';
-					} elseif (!$this->IsWithinBitRange($source_data_array['premixRL'], 8, false)) {
-						$this->errors[] = 'Invalid Premix, Right-To-Left in '.$frame_name.' ('.$source_data_array['premixRL'].') (range = 0 to 255)';
-					} else {
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['left'], 2, false);
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['right'], 2, false);
-						$framedata .= chr($source_data_array['bouncesL']);
-						$framedata .= chr($source_data_array['bouncesR']);
-						$framedata .= chr($source_data_array['feedbackLL']);
-						$framedata .= chr($source_data_array['feedbackLR']);
-						$framedata .= chr($source_data_array['feedbackRR']);
-						$framedata .= chr($source_data_array['feedbackRL']);
-						$framedata .= chr($source_data_array['premixLR']);
-						$framedata .= chr($source_data_array['premixRL']);
-					}
-					break;
-
-				case 'APIC':
-					// 4.14  APIC Attached picture
-					// Text encoding      $xx
-					// MIME type          <text string> $00
-					// Picture type       $xx
-					// Description        <text string according to encoding> $00 (00)
-					// Picture data       <binary data>
-					$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
-					if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'])) {
-						$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].') for ID3v2.'.$this->majorversion;
-					} elseif (!$this->ID3v2IsValidAPICpicturetype($source_data_array['picturetypeid'])) {
-						$this->errors[] = 'Invalid Picture Type byte in '.$frame_name.' ('.$source_data_array['picturetypeid'].') for ID3v2.'.$this->majorversion;
-					} elseif (($this->majorversion >= 3) && (!$this->ID3v2IsValidAPICimageformat($source_data_array['mime']))) {
-						$this->errors[] = 'Invalid MIME Type in '.$frame_name.' ('.$source_data_array['mime'].') for ID3v2.'.$this->majorversion;
-					} elseif (($source_data_array['mime'] == '-->') && (!$this->IsValidURL($source_data_array['data'], false, false))) {
-						//$this->errors[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
-						// probably should be an error, need to rewrite IsValidURL() to handle other encodings
-						$this->warnings[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
-					} else {
-						$framedata .= chr($source_data_array['encodingid']);
-						$framedata .= str_replace("\x00", '', $source_data_array['mime'])."\x00";
-						$framedata .= chr($source_data_array['picturetypeid']);
-						$framedata .= (!empty($source_data_array['description']) ? $source_data_array['description'] : '').getid3_id3v2::TextEncodingTerminatorLookup($source_data_array['encodingid']);
-						$framedata .= $source_data_array['data'];
-					}
-					break;
-
-				case 'GEOB':
-					// 4.15  GEOB General encapsulated object
-					// Text encoding          $xx
-					// MIME type              <text string> $00
-					// Filename               <text string according to encoding> $00 (00)
-					// Content description    <text string according to encoding> $00 (00)
-					// Encapsulated object    <binary data>
-					$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
-					if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'])) {
-						$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].') for ID3v2.'.$this->majorversion;
-					} elseif (!$this->IsValidMIMEstring($source_data_array['mime'])) {
-						$this->errors[] = 'Invalid MIME Type in '.$frame_name.' ('.$source_data_array['mime'].')';
-					} elseif (!$source_data_array['description']) {
-						$this->errors[] = 'Missing Description in '.$frame_name;
-					} else {
-						$framedata .= chr($source_data_array['encodingid']);
-						$framedata .= str_replace("\x00", '', $source_data_array['mime'])."\x00";
-						$framedata .= $source_data_array['filename'].getid3_id3v2::TextEncodingTerminatorLookup($source_data_array['encodingid']);
-						$framedata .= $source_data_array['description'].getid3_id3v2::TextEncodingTerminatorLookup($source_data_array['encodingid']);
-						$framedata .= $source_data_array['data'];
-					}
-					break;
-
-				case 'PCNT':
-					// 4.16  PCNT Play counter
-					//   When the counter reaches all one's, one byte is inserted in
-					//   front of the counter thus making the counter eight bits bigger
-					// Counter        $xx xx xx xx (xx ...)
-					$framedata .= getid3_lib::BigEndian2String($source_data_array['data'], 4, false);
-					break;
-
-				case 'POPM':
-					// 4.17  POPM Popularimeter
-					//   When the counter reaches all one's, one byte is inserted in
-					//   front of the counter thus making the counter eight bits bigger
-					// Email to user   <text string> $00
-					// Rating          $xx
-					// Counter         $xx xx xx xx (xx ...)
-					if (!$this->IsWithinBitRange($source_data_array['rating'], 8, false)) {
-						$this->errors[] = 'Invalid Rating byte in '.$frame_name.' ('.$source_data_array['rating'].') (range = 0 to 255)';
-					} elseif (!IsValidEmail($source_data_array['email'])) {
-						$this->errors[] = 'Invalid Email in '.$frame_name.' ('.$source_data_array['email'].')';
-					} else {
-						$framedata .= str_replace("\x00", '', $source_data_array['email'])."\x00";
-						$framedata .= chr($source_data_array['rating']);
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['data'], 4, false);
-					}
-					break;
-
-				case 'RBUF':
-					// 4.18  RBUF Recommended buffer size
-					// Buffer size               $xx xx xx
-					// Embedded info flag        %0000000x
-					// Offset to next tag        $xx xx xx xx
-					if (!$this->IsWithinBitRange($source_data_array['buffersize'], 24, false)) {
-						$this->errors[] = 'Invalid Buffer Size in '.$frame_name;
-					} elseif (!$this->IsWithinBitRange($source_data_array['nexttagoffset'], 32, false)) {
-						$this->errors[] = 'Invalid Offset To Next Tag in '.$frame_name;
-					} else {
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['buffersize'], 3, false);
-						$flag .= '0000000';
-						$flag .= $source_data_array['flags']['embededinfo'] ? '1' : '0';
-						$framedata .= chr(bindec($flag));
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['nexttagoffset'], 4, false);
-					}
-					break;
-
-				case 'AENC':
-					// 4.19  AENC Audio encryption
-					// Owner identifier   <text string> $00
-					// Preview start      $xx xx
-					// Preview length     $xx xx
-					// Encryption info    <binary data>
-					if (!$this->IsWithinBitRange($source_data_array['previewstart'], 16, false)) {
-						$this->errors[] = 'Invalid Preview Start in '.$frame_name.' ('.$source_data_array['previewstart'].')';
-					} elseif (!$this->IsWithinBitRange($source_data_array['previewlength'], 16, false)) {
-						$this->errors[] = 'Invalid Preview Length in '.$frame_name.' ('.$source_data_array['previewlength'].')';
-					} else {
-						$framedata .= str_replace("\x00", '', $source_data_array['ownerid'])."\x00";
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['previewstart'], 2, false);
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['previewlength'], 2, false);
-						$framedata .= $source_data_array['encryptioninfo'];
-					}
-					break;
-
-				case 'LINK':
-					// 4.20  LINK Linked information
-					// Frame identifier               $xx xx xx xx
-					// URL                            <text string> $00
-					// ID and additional data         <text string(s)>
-					if (!getid3_id3v2::IsValidID3v2FrameName($source_data_array['frameid'], $this->majorversion)) {
-						$this->errors[] = 'Invalid Frame Identifier in '.$frame_name.' ('.$source_data_array['frameid'].')';
-					} elseif (!$this->IsValidURL($source_data_array['data'], true, false)) {
-						//$this->errors[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
-						// probably should be an error, need to rewrite IsValidURL() to handle other encodings
-						$this->warnings[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
-					} elseif ((($source_data_array['frameid'] == 'AENC') || ($source_data_array['frameid'] == 'APIC') || ($source_data_array['frameid'] == 'GEOB') || ($source_data_array['frameid'] == 'TXXX')) && ($source_data_array['additionaldata'] == '')) {
-						$this->errors[] = 'Content Descriptor must be specified as additional data for Frame Identifier of '.$source_data_array['frameid'].' in '.$frame_name;
-					} elseif (($source_data_array['frameid'] == 'USER') && (getid3_id3v2::LanguageLookup($source_data_array['additionaldata'], true) == '')) {
-						$this->errors[] = 'Language must be specified as additional data for Frame Identifier of '.$source_data_array['frameid'].' in '.$frame_name;
-					} elseif (($source_data_array['frameid'] == 'PRIV') && ($source_data_array['additionaldata'] == '')) {
-						$this->errors[] = 'Owner Identifier must be specified as additional data for Frame Identifier of '.$source_data_array['frameid'].' in '.$frame_name;
-					} elseif ((($source_data_array['frameid'] == 'COMM') || ($source_data_array['frameid'] == 'SYLT') || ($source_data_array['frameid'] == 'USLT')) && ((getid3_id3v2::LanguageLookup(substr($source_data_array['additionaldata'], 0, 3), true) == '') || (substr($source_data_array['additionaldata'], 3) == ''))) {
-						$this->errors[] = 'Language followed by Content Descriptor must be specified as additional data for Frame Identifier of '.$source_data_array['frameid'].' in '.$frame_name;
-					} else {
-						$framedata .= $source_data_array['frameid'];
-						$framedata .= str_replace("\x00", '', $source_data_array['data'])."\x00";
-						switch ($source_data_array['frameid']) {
-							case 'COMM':
-							case 'SYLT':
-							case 'USLT':
-							case 'PRIV':
-							case 'USER':
-							case 'AENC':
-							case 'APIC':
-							case 'GEOB':
-							case 'TXXX':
-								$framedata .= $source_data_array['additionaldata'];
-								break;
-							case 'ASPI':
-							case 'ETCO':
-							case 'EQU2':
-							case 'MCID':
-							case 'MLLT':
-							case 'OWNE':
-							case 'RVA2':
-							case 'RVRB':
-							case 'SYTC':
-							case 'IPLS':
-							case 'RVAD':
-							case 'EQUA':
-								// no additional data required
-								break;
-							case 'RBUF':
-								if ($this->majorversion == 3) {
-									// no additional data required
-								} else {
-									$this->errors[] = $source_data_array['frameid'].' is not a valid Frame Identifier in '.$frame_name.' (in ID3v2.'.$this->majorversion.')';
-								}
-
-							default:
-								if ((substr($source_data_array['frameid'], 0, 1) == 'T') || (substr($source_data_array['frameid'], 0, 1) == 'W')) {
-									// no additional data required
-								} else {
-									$this->errors[] = $source_data_array['frameid'].' is not a valid Frame Identifier in '.$frame_name.' (in ID3v2.'.$this->majorversion.')';
-								}
-								break;
-						}
-					}
-					break;
-
-				case 'POSS':
-					// 4.21  POSS Position synchronisation frame (ID3v2.3+ only)
-					// Time stamp format         $xx
-					// Position                  $xx (xx ...)
-					if (($source_data_array['timestampformat'] < 1) || ($source_data_array['timestampformat'] > 2)) {
-						$this->errors[] = 'Invalid Time Stamp Format in '.$frame_name.' ('.$source_data_array['timestampformat'].') (valid = 1 or 2)';
-					} elseif (!$this->IsWithinBitRange($source_data_array['position'], 32, false)) {
-						$this->errors[] = 'Invalid Position in '.$frame_name.' ('.$source_data_array['position'].') (range = 0 to 4294967295)';
-					} else {
-						$framedata .= chr($source_data_array['timestampformat']);
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['position'], 4, false);
-					}
-					break;
-
-				case 'USER':
-					// 4.22  USER Terms of use (ID3v2.3+ only)
-					// Text encoding        $xx
-					// Language             $xx xx xx
-					// The actual text      <text string according to encoding>
-					$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
-					if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'])) {
-						$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].')';
-					} elseif (getid3_id3v2::LanguageLookup($source_data_array['language'], true) == '') {
-						$this->errors[] = 'Invalid Language in '.$frame_name.' ('.$source_data_array['language'].')';
-					} else {
-						$framedata .= chr($source_data_array['encodingid']);
-						$framedata .= strtolower($source_data_array['language']);
-						$framedata .= $source_data_array['data'];
-					}
-					break;
-
-				case 'OWNE':
-					// 4.23  OWNE Ownership frame (ID3v2.3+ only)
-					// Text encoding     $xx
-					// Price paid        <text string> $00
-					// Date of purch.    <text string>
-					// Seller            <text string according to encoding>
-					$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
-					if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'])) {
-						$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].')';
-					} elseif (!$this->IsANumber($source_data_array['pricepaid']['value'], false)) {
-						$this->errors[] = 'Invalid Price Paid in '.$frame_name.' ('.$source_data_array['pricepaid']['value'].')';
-					} elseif (!$this->IsValidDateStampString($source_data_array['purchasedate'])) {
-						$this->errors[] = 'Invalid Date Of Purchase in '.$frame_name.' ('.$source_data_array['purchasedate'].') (format = YYYYMMDD)';
-					} else {
-						$framedata .= chr($source_data_array['encodingid']);
-						$framedata .= str_replace("\x00", '', $source_data_array['pricepaid']['value'])."\x00";
-						$framedata .= $source_data_array['purchasedate'];
-						$framedata .= $source_data_array['seller'];
-					}
-					break;
-
-				case 'COMR':
-					// 4.24  COMR Commercial frame (ID3v2.3+ only)
-					// Text encoding      $xx
-					// Price string       <text string> $00
-					// Valid until        <text string>
-					// Contact URL        <text string> $00
-					// Received as        $xx
-					// Name of seller     <text string according to encoding> $00 (00)
-					// Description        <text string according to encoding> $00 (00)
-					// Picture MIME type  <string> $00
-					// Seller logo        <binary data>
-					$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
-					if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'])) {
-						$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].')';
-					} elseif (!$this->IsValidDateStampString($source_data_array['pricevaliduntil'])) {
-						$this->errors[] = 'Invalid Valid Until date in '.$frame_name.' ('.$source_data_array['pricevaliduntil'].') (format = YYYYMMDD)';
-					} elseif (!$this->IsValidURL($source_data_array['contacturl'], false, true)) {
-						$this->errors[] = 'Invalid Contact URL in '.$frame_name.' ('.$source_data_array['contacturl'].') (allowed schemes: http, https, ftp, mailto)';
-					} elseif (!$this->ID3v2IsValidCOMRreceivedAs($source_data_array['receivedasid'])) {
-						$this->errors[] = 'Invalid Received As byte in '.$frame_name.' ('.$source_data_array['contacturl'].') (range = 0 to 8)';
-					} elseif (!$this->IsValidMIMEstring($source_data_array['mime'])) {
-						$this->errors[] = 'Invalid MIME Type in '.$frame_name.' ('.$source_data_array['mime'].')';
-					} else {
-						$framedata .= chr($source_data_array['encodingid']);
-						unset($pricestring);
-						foreach ($source_data_array['price'] as $key => $val) {
-							if ($this->ID3v2IsValidPriceString($key.$val['value'])) {
-								$pricestrings[] = $key.$val['value'];
-							} else {
-								$this->errors[] = 'Invalid Price String in '.$frame_name.' ('.$key.$val['value'].')';
-							}
-						}
-						$framedata .= implode('/', $pricestrings);
-						$framedata .= $source_data_array['pricevaliduntil'];
-						$framedata .= str_replace("\x00", '', $source_data_array['contacturl'])."\x00";
-						$framedata .= chr($source_data_array['receivedasid']);
-						$framedata .= $source_data_array['sellername'].getid3_id3v2::TextEncodingTerminatorLookup($source_data_array['encodingid']);
-						$framedata .= $source_data_array['description'].getid3_id3v2::TextEncodingTerminatorLookup($source_data_array['encodingid']);
-						$framedata .= $source_data_array['mime']."\x00";
-						$framedata .= $source_data_array['logo'];
-					}
-					break;
-
-				case 'ENCR':
-					// 4.25  ENCR Encryption method registration (ID3v2.3+ only)
-					// Owner identifier    <text string> $00
-					// Method symbol       $xx
-					// Encryption data     <binary data>
-					if (!$this->IsWithinBitRange($source_data_array['methodsymbol'], 8, false)) {
-						$this->errors[] = 'Invalid Group Symbol in '.$frame_name.' ('.$source_data_array['methodsymbol'].') (range = 0 to 255)';
-					} else {
-						$framedata .= str_replace("\x00", '', $source_data_array['ownerid'])."\x00";
-						$framedata .= ord($source_data_array['methodsymbol']);
-						$framedata .= $source_data_array['data'];
-					}
-					break;
-
-				case 'GRID':
-					// 4.26  GRID Group identification registration (ID3v2.3+ only)
-					// Owner identifier      <text string> $00
-					// Group symbol          $xx
-					// Group dependent data  <binary data>
-					if (!$this->IsWithinBitRange($source_data_array['groupsymbol'], 8, false)) {
-						$this->errors[] = 'Invalid Group Symbol in '.$frame_name.' ('.$source_data_array['groupsymbol'].') (range = 0 to 255)';
-					} else {
-						$framedata .= str_replace("\x00", '', $source_data_array['ownerid'])."\x00";
-						$framedata .= ord($source_data_array['groupsymbol']);
-						$framedata .= $source_data_array['data'];
-					}
-					break;
-
-				case 'PRIV':
-					// 4.27  PRIV Private frame (ID3v2.3+ only)
-					// Owner identifier      <text string> $00
-					// The private data      <binary data>
-					$framedata .= str_replace("\x00", '', $source_data_array['ownerid'])."\x00";
-					$framedata .= $source_data_array['data'];
-					break;
-
-				case 'SIGN':
-					// 4.28  SIGN Signature frame (ID3v2.4+ only)
-					// Group symbol      $xx
-					// Signature         <binary data>
-					if (!$this->IsWithinBitRange($source_data_array['groupsymbol'], 8, false)) {
-						$this->errors[] = 'Invalid Group Symbol in '.$frame_name.' ('.$source_data_array['groupsymbol'].') (range = 0 to 255)';
-					} else {
-						$framedata .= ord($source_data_array['groupsymbol']);
-						$framedata .= $source_data_array['data'];
-					}
-					break;
-
-				case 'SEEK':
-					// 4.29  SEEK Seek frame (ID3v2.4+ only)
-					// Minimum offset to next tag       $xx xx xx xx
-					if (!$this->IsWithinBitRange($source_data_array['data'], 32, false)) {
-						$this->errors[] = 'Invalid Minimum Offset in '.$frame_name.' ('.$source_data_array['data'].') (range = 0 to 4294967295)';
-					} else {
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['data'], 4, false);
-					}
-					break;
-
-				case 'ASPI':
-					// 4.30  ASPI Audio seek point index (ID3v2.4+ only)
-					// Indexed data start (S)         $xx xx xx xx
-					// Indexed data length (L)        $xx xx xx xx
-					// Number of index points (N)     $xx xx
-					// Bits per index point (b)       $xx
-					//   Then for every index point the following data is included:
-					// Fraction at index (Fi)          $xx (xx)
-					if (!$this->IsWithinBitRange($source_data_array['datastart'], 32, false)) {
-						$this->errors[] = 'Invalid Indexed Data Start in '.$frame_name.' ('.$source_data_array['datastart'].') (range = 0 to 4294967295)';
-					} elseif (!$this->IsWithinBitRange($source_data_array['datalength'], 32, false)) {
-						$this->errors[] = 'Invalid Indexed Data Length in '.$frame_name.' ('.$source_data_array['datalength'].') (range = 0 to 4294967295)';
-					} elseif (!$this->IsWithinBitRange($source_data_array['indexpoints'], 16, false)) {
-						$this->errors[] = 'Invalid Number Of Index Points in '.$frame_name.' ('.$source_data_array['indexpoints'].') (range = 0 to 65535)';
-					} elseif (!$this->IsWithinBitRange($source_data_array['bitsperpoint'], 8, false)) {
-						$this->errors[] = 'Invalid Bits Per Index Point in '.$frame_name.' ('.$source_data_array['bitsperpoint'].') (range = 0 to 255)';
-					} elseif ($source_data_array['indexpoints'] != count($source_data_array['indexes'])) {
-						$this->errors[] = 'Number Of Index Points does not match actual supplied data in '.$frame_name;
-					} else {
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['datastart'], 4, false);
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['datalength'], 4, false);
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['indexpoints'], 2, false);
-						$framedata .= getid3_lib::BigEndian2String($source_data_array['bitsperpoint'], 1, false);
-						foreach ($source_data_array['indexes'] as $key => $val) {
-							$framedata .= getid3_lib::BigEndian2String($val, ceil($source_data_array['bitsperpoint'] / 8), false);
-						}
-					}
-					break;
-
-				case 'RGAD':
-					//   RGAD Replay Gain Adjustment
-					//   http://privatewww.essex.ac.uk/~djmrob/replaygain/
-					// Peak Amplitude                     $xx $xx $xx $xx
-					// Radio Replay Gain Adjustment        %aaabbbcd %dddddddd
-					// Audiophile Replay Gain Adjustment   %aaabbbcd %dddddddd
-					//   a - name code
-					//   b - originator code
-					//   c - sign bit
-					//   d - replay gain adjustment
-
-					if (($source_data_array['track_adjustment'] > 51) || ($source_data_array['track_adjustment'] < -51)) {
-						$this->errors[] = 'Invalid Track Adjustment in '.$frame_name.' ('.$source_data_array['track_adjustment'].') (range = -51.0 to +51.0)';
-					} elseif (($source_data_array['album_adjustment'] > 51) || ($source_data_array['album_adjustment'] < -51)) {
-						$this->errors[] = 'Invalid Album Adjustment in '.$frame_name.' ('.$source_data_array['album_adjustment'].') (range = -51.0 to +51.0)';
-					} elseif (!$this->ID3v2IsValidRGADname($source_data_array['raw']['track_name'])) {
-						$this->errors[] = 'Invalid Track Name Code in '.$frame_name.' ('.$source_data_array['raw']['track_name'].') (range = 0 to 2)';
-					} elseif (!$this->ID3v2IsValidRGADname($source_data_array['raw']['album_name'])) {
-						$this->errors[] = 'Invalid Album Name Code in '.$frame_name.' ('.$source_data_array['raw']['album_name'].') (range = 0 to 2)';
-					} elseif (!$this->ID3v2IsValidRGADoriginator($source_data_array['raw']['track_originator'])) {
-						$this->errors[] = 'Invalid Track Originator Code in '.$frame_name.' ('.$source_data_array['raw']['track_originator'].') (range = 0 to 3)';
-					} elseif (!$this->ID3v2IsValidRGADoriginator($source_data_array['raw']['album_originator'])) {
-						$this->errors[] = 'Invalid Album Originator Code in '.$frame_name.' ('.$source_data_array['raw']['album_originator'].') (range = 0 to 3)';
-					} else {
-						$framedata .= getid3_lib::Float2String($source_data_array['peakamplitude'], 32);
-						$framedata .= getid3_lib::RGADgainString($source_data_array['raw']['track_name'], $source_data_array['raw']['track_originator'], $source_data_array['track_adjustment']);
-						$framedata .= getid3_lib::RGADgainString($source_data_array['raw']['album_name'], $source_data_array['raw']['album_originator'], $source_data_array['album_adjustment']);
-					}
-					break;
-
-				default:
-					if ((($this->majorversion == 2) && (strlen($frame_name) != 3)) || (($this->majorversion > 2) && (strlen($frame_name) != 4))) {
-						$this->errors[] = 'Invalid frame name "'.$frame_name.'" for ID3v2.'.$this->majorversion;
-					} elseif ($frame_name{0} == 'T') {
-						// 4.2. T???  Text information frames
-						// Text encoding                $xx
-						// Information                  <text string(s) according to encoding>
-						$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
-						if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'])) {
-							$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].') for ID3v2.'.$this->majorversion;
-						} else {
-							$framedata .= chr($source_data_array['encodingid']);
-							$framedata .= $source_data_array['data'];
-						}
-					} elseif ($frame_name{0} == 'W') {
-						// 4.3. W???  URL link frames
-						// URL              <text string>
-						if (!$this->IsValidURL($source_data_array['data'], false, false)) {
-							//$this->errors[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
-							// probably should be an error, need to rewrite IsValidURL() to handle other encodings
-							$this->warnings[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
-						} else {
-							$framedata .= $source_data_array['data'];
-						}
-					} else {
-						$this->errors[] = $frame_name.' not yet supported in $this->GenerateID3v2FrameData()';
-					}
-					break;
-			}
-		}
-		if (!empty($this->errors)) {
-			return false;
-		}
-		return $framedata;
-	}
-
-	function ID3v2FrameIsAllowed($frame_name, $source_data_array) {
-		static $PreviousFrames = array();
-
-		if ($frame_name === null) {
-			// if the writing functions are called multiple times, the static array needs to be
-			// cleared - this can be done by calling $this->ID3v2FrameIsAllowed(null, '')
-			$PreviousFrames = array();
-			return true;
-		}
-
-		if ($this->majorversion == 4) {
-			switch ($frame_name) {
-				case 'UFID':
-				case 'AENC':
-				case 'ENCR':
-				case 'GRID':
-					if (!isset($source_data_array['ownerid'])) {
-						$this->errors[] = '[ownerid] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['ownerid'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same OwnerID ('.$source_data_array['ownerid'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['ownerid'];
-					}
-					break;
-
-				case 'TXXX':
-				case 'WXXX':
-				case 'RVA2':
-				case 'EQU2':
-				case 'APIC':
-				case 'GEOB':
-					if (!isset($source_data_array['description'])) {
-						$this->errors[] = '[description] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['description'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same Description ('.$source_data_array['description'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['description'];
-					}
-					break;
-
-				case 'USER':
-					if (!isset($source_data_array['language'])) {
-						$this->errors[] = '[language] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['language'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same Language ('.$source_data_array['language'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['language'];
-					}
-					break;
-
-				case 'USLT':
-				case 'SYLT':
-				case 'COMM':
-					if (!isset($source_data_array['language'])) {
-						$this->errors[] = '[language] not specified for '.$frame_name;
-					} elseif (!isset($source_data_array['description'])) {
-						$this->errors[] = '[description] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['language'].$source_data_array['description'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same Language + Description ('.$source_data_array['language'].' + '.$source_data_array['description'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['language'].$source_data_array['description'];
-					}
-					break;
-
-				case 'POPM':
-					if (!isset($source_data_array['email'])) {
-						$this->errors[] = '[email] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['email'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same Email ('.$source_data_array['email'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['email'];
-					}
-					break;
-
-				case 'IPLS':
-				case 'MCDI':
-				case 'ETCO':
-				case 'MLLT':
-				case 'SYTC':
-				case 'RVRB':
-				case 'PCNT':
-				case 'RBUF':
-				case 'POSS':
-				case 'OWNE':
-				case 'SEEK':
-				case 'ASPI':
-				case 'RGAD':
-					if (in_array($frame_name, $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed';
-					} else {
-						$PreviousFrames[] = $frame_name;
-					}
-					break;
-
-				case 'LINK':
-					// this isn't implemented quite right (yet) - it should check the target frame data for compliance
-					// but right now it just allows one linked frame of each type, to be safe.
-					if (!isset($source_data_array['frameid'])) {
-						$this->errors[] = '[frameid] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['frameid'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same FrameID ('.$source_data_array['frameid'].')';
-					} elseif (in_array($source_data_array['frameid'], $PreviousFrames)) {
-						// no links to singleton tags
-						$this->errors[] = 'Cannot specify a '.$frame_name.' tag to a singleton tag that already exists ('.$source_data_array['frameid'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['frameid']; // only one linked tag of this type
-						$PreviousFrames[] = $source_data_array['frameid'];             // no non-linked singleton tags of this type
-					}
-					break;
-
-				case 'COMR':
-					//   There may be more than one 'commercial frame' in a tag, but no two may be identical
-					// Checking isn't implemented at all (yet) - just assumes that it's OK.
-					break;
-
-				case 'PRIV':
-				case 'SIGN':
-					if (!isset($source_data_array['ownerid'])) {
-						$this->errors[] = '[ownerid] not specified for '.$frame_name;
-					} elseif (!isset($source_data_array['data'])) {
-						$this->errors[] = '[data] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['ownerid'].$source_data_array['data'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same OwnerID + Data ('.$source_data_array['ownerid'].' + '.$source_data_array['data'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['ownerid'].$source_data_array['data'];
-					}
-					break;
-
-				default:
-					if (($frame_name{0} != 'T') && ($frame_name{0} != 'W')) {
-						$this->errors[] = 'Frame not allowed in ID3v2.'.$this->majorversion.': '.$frame_name;
-					}
-					break;
-			}
-
-		} elseif ($this->majorversion == 3) {
-
-			switch ($frame_name) {
-				case 'UFID':
-				case 'AENC':
-				case 'ENCR':
-				case 'GRID':
-					if (!isset($source_data_array['ownerid'])) {
-						$this->errors[] = '[ownerid] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['ownerid'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same OwnerID ('.$source_data_array['ownerid'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['ownerid'];
-					}
-					break;
-
-				case 'TXXX':
-				case 'WXXX':
-				case 'APIC':
-				case 'GEOB':
-					if (!isset($source_data_array['description'])) {
-						$this->errors[] = '[description] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['description'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same Description ('.$source_data_array['description'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['description'];
-					}
-					break;
-
-				case 'USER':
-					if (!isset($source_data_array['language'])) {
-						$this->errors[] = '[language] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['language'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same Language ('.$source_data_array['language'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['language'];
-					}
-					break;
-
-				case 'USLT':
-				case 'SYLT':
-				case 'COMM':
-					if (!isset($source_data_array['language'])) {
-						$this->errors[] = '[language] not specified for '.$frame_name;
-					} elseif (!isset($source_data_array['description'])) {
-						$this->errors[] = '[description] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['language'].$source_data_array['description'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same Language + Description ('.$source_data_array['language'].' + '.$source_data_array['description'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['language'].$source_data_array['description'];
-					}
-					break;
-
-				case 'POPM':
-					if (!isset($source_data_array['email'])) {
-						$this->errors[] = '[email] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['email'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same Email ('.$source_data_array['email'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['email'];
-					}
-					break;
-
-				case 'IPLS':
-				case 'MCDI':
-				case 'ETCO':
-				case 'MLLT':
-				case 'SYTC':
-				case 'RVAD':
-				case 'EQUA':
-				case 'RVRB':
-				case 'PCNT':
-				case 'RBUF':
-				case 'POSS':
-				case 'OWNE':
-				case 'RGAD':
-					if (in_array($frame_name, $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed';
-					} else {
-						$PreviousFrames[] = $frame_name;
-					}
-					break;
-
-				case 'LINK':
-					// this isn't implemented quite right (yet) - it should check the target frame data for compliance
-					// but right now it just allows one linked frame of each type, to be safe.
-					if (!isset($source_data_array['frameid'])) {
-						$this->errors[] = '[frameid] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['frameid'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same FrameID ('.$source_data_array['frameid'].')';
-					} elseif (in_array($source_data_array['frameid'], $PreviousFrames)) {
-						// no links to singleton tags
-						$this->errors[] = 'Cannot specify a '.$frame_name.' tag to a singleton tag that already exists ('.$source_data_array['frameid'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['frameid']; // only one linked tag of this type
-						$PreviousFrames[] = $source_data_array['frameid'];             // no non-linked singleton tags of this type
-					}
-					break;
-
-				case 'COMR':
-					//   There may be more than one 'commercial frame' in a tag, but no two may be identical
-					// Checking isn't implemented at all (yet) - just assumes that it's OK.
-					break;
-
-				case 'PRIV':
-					if (!isset($source_data_array['ownerid'])) {
-						$this->errors[] = '[ownerid] not specified for '.$frame_name;
-					} elseif (!isset($source_data_array['data'])) {
-						$this->errors[] = '[data] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['ownerid'].$source_data_array['data'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same OwnerID + Data ('.$source_data_array['ownerid'].' + '.$source_data_array['data'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['ownerid'].$source_data_array['data'];
-					}
-					break;
-
-				default:
-					if (($frame_name{0} != 'T') && ($frame_name{0} != 'W')) {
-						$this->errors[] = 'Frame not allowed in ID3v2.'.$this->majorversion.': '.$frame_name;
-					}
-					break;
-			}
-
-		} elseif ($this->majorversion == 2) {
-
-			switch ($frame_name) {
-				case 'UFI':
-				case 'CRM':
-				case 'CRA':
-					if (!isset($source_data_array['ownerid'])) {
-						$this->errors[] = '[ownerid] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['ownerid'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same OwnerID ('.$source_data_array['ownerid'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['ownerid'];
-					}
-					break;
-
-				case 'TXX':
-				case 'WXX':
-				case 'PIC':
-				case 'GEO':
-					if (!isset($source_data_array['description'])) {
-						$this->errors[] = '[description] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['description'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same Description ('.$source_data_array['description'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['description'];
-					}
-					break;
-
-				case 'ULT':
-				case 'SLT':
-				case 'COM':
-					if (!isset($source_data_array['language'])) {
-						$this->errors[] = '[language] not specified for '.$frame_name;
-					} elseif (!isset($source_data_array['description'])) {
-						$this->errors[] = '[description] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['language'].$source_data_array['description'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same Language + Description ('.$source_data_array['language'].' + '.$source_data_array['description'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['language'].$source_data_array['description'];
-					}
-					break;
-
-				case 'POP':
-					if (!isset($source_data_array['email'])) {
-						$this->errors[] = '[email] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['email'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same Email ('.$source_data_array['email'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['email'];
-					}
-					break;
-
-				case 'IPL':
-				case 'MCI':
-				case 'ETC':
-				case 'MLL':
-				case 'STC':
-				case 'RVA':
-				case 'EQU':
-				case 'REV':
-				case 'CNT':
-				case 'BUF':
-					if (in_array($frame_name, $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed';
-					} else {
-						$PreviousFrames[] = $frame_name;
-					}
-					break;
-
-				case 'LNK':
-					// this isn't implemented quite right (yet) - it should check the target frame data for compliance
-					// but right now it just allows one linked frame of each type, to be safe.
-					if (!isset($source_data_array['frameid'])) {
-						$this->errors[] = '[frameid] not specified for '.$frame_name;
-					} elseif (in_array($frame_name.$source_data_array['frameid'], $PreviousFrames)) {
-						$this->errors[] = 'Only one '.$frame_name.' tag allowed with the same FrameID ('.$source_data_array['frameid'].')';
-					} elseif (in_array($source_data_array['frameid'], $PreviousFrames)) {
-						// no links to singleton tags
-						$this->errors[] = 'Cannot specify a '.$frame_name.' tag to a singleton tag that already exists ('.$source_data_array['frameid'].')';
-					} else {
-						$PreviousFrames[] = $frame_name.$source_data_array['frameid']; // only one linked tag of this type
-						$PreviousFrames[] = $source_data_array['frameid'];             // no non-linked singleton tags of this type
-					}
-					break;
-
-				default:
-					if (($frame_name{0} != 'T') && ($frame_name{0} != 'W')) {
-						$this->errors[] = 'Frame not allowed in ID3v2.'.$this->majorversion.': '.$frame_name;
-					}
-					break;
-			}
-		}
-
-		if (!empty($this->errors)) {
-			return false;
-		}
-		return true;
-	}
-
-	function GenerateID3v2Tag($noerrorsonly=true) {
-		$this->ID3v2FrameIsAllowed(null, ''); // clear static array in case this isn't the first call to $this->GenerateID3v2Tag()
-
-		$tagstring = '';
-		if (is_array($this->tag_data)) {
-			foreach ($this->tag_data as $frame_name => $frame_rawinputdata) {
-				foreach ($frame_rawinputdata as $irrelevantindex => $source_data_array) {
-					if (getid3_id3v2::IsValidID3v2FrameName($frame_name, $this->majorversion)) {
-						unset($frame_length);
-						unset($frame_flags);
-						$frame_data = false;
-						if ($this->ID3v2FrameIsAllowed($frame_name, $source_data_array)) {
-							if ($frame_data = $this->GenerateID3v2FrameData($frame_name, $source_data_array)) {
-								$FrameUnsynchronisation = false;
-								if ($this->majorversion >= 4) {
-									// frame-level unsynchronisation
-									$unsynchdata = $frame_data;
-									if ($this->id3v2_use_unsynchronisation) {
-										$unsynchdata = $this->Unsynchronise($frame_data);
-									}
-									if (strlen($unsynchdata) != strlen($frame_data)) {
-										// unsynchronisation needed
-										$FrameUnsynchronisation = true;
-										$frame_data = $unsynchdata;
-										if (isset($TagUnsynchronisation) && $TagUnsynchronisation === false) {
-											// only set to true if ALL frames are unsynchronised
-										} else {
-											$TagUnsynchronisation = true;
-										}
-									} else {
-										if (isset($TagUnsynchronisation)) {
-											$TagUnsynchronisation = false;
-										}
-									}
-									unset($unsynchdata);
-
-									$frame_length = getid3_lib::BigEndian2String(strlen($frame_data), 4, true);
-								} else {
-									$frame_length = getid3_lib::BigEndian2String(strlen($frame_data), 4, false);
-								}
-								$frame_flags  = $this->GenerateID3v2FrameFlags($this->ID3v2FrameFlagsLookupTagAlter($frame_name), $this->ID3v2FrameFlagsLookupFileAlter($frame_name), false, false, false, false, $FrameUnsynchronisation, false);
-							}
-						} else {
-							$this->errors[] = 'Frame "'.$frame_name.'" is NOT allowed';
-						}
-						if ($frame_data === false) {
-							$this->errors[] = '$this->GenerateID3v2FrameData() failed for "'.$frame_name.'"';
-							if ($noerrorsonly) {
-								return false;
-							} else {
-								unset($frame_name);
-							}
-						}
-					} else {
-						// ignore any invalid frame names, including 'title', 'header', etc
-						$this->warnings[] = 'Ignoring invalid ID3v2 frame type: "'.$frame_name.'"';
-						unset($frame_name);
-						unset($frame_length);
-						unset($frame_flags);
-						unset($frame_data);
-					}
-					if (isset($frame_name) && isset($frame_length) && isset($frame_flags) && isset($frame_data)) {
-						$tagstring .= $frame_name.$frame_length.$frame_flags.$frame_data;
-					}
-				}
-			}
-
-			if (!isset($TagUnsynchronisation)) {
-				$TagUnsynchronisation = false;
-			}
-			if (($this->majorversion <= 3) && $this->id3v2_use_unsynchronisation) {
-				// tag-level unsynchronisation
-				$unsynchdata = $this->Unsynchronise($tagstring);
-				if (strlen($unsynchdata) != strlen($tagstring)) {
-					// unsynchronisation needed
-					$TagUnsynchronisation = true;
-					$tagstring = $unsynchdata;
-				}
-			}
-
-			while ($this->paddedlength < (strlen($tagstring) + getid3_id3v2::ID3v2HeaderLength($this->majorversion))) {
-				$this->paddedlength += 1024;
-			}
-
-			$footer = false; // ID3v2 footers not yet supported in getID3()
-			if (!$footer && ($this->paddedlength > (strlen($tagstring) + getid3_id3v2::ID3v2HeaderLength($this->majorversion)))) {
-				// pad up to $paddedlength bytes if unpadded tag is shorter than $paddedlength
-				// "Furthermore it MUST NOT have any padding when a tag footer is added to the tag."
-				if (($this->paddedlength - strlen($tagstring) - getid3_id3v2::ID3v2HeaderLength($this->majorversion)) > 0) {
-					$tagstring .= str_repeat("\x00", $this->paddedlength - strlen($tagstring) - getid3_id3v2::ID3v2HeaderLength($this->majorversion));
-				}
-			}
-			if ($this->id3v2_use_unsynchronisation && (substr($tagstring, strlen($tagstring) - 1, 1) == "\xFF")) {
-				// special unsynchronisation case:
-				// if last byte == $FF then appended a $00
-				$TagUnsynchronisation = true;
-				$tagstring .= "\x00";
-			}
-
-			$tagheader  = 'ID3';
-			$tagheader .= chr($this->majorversion);
-			$tagheader .= chr($this->minorversion);
-			$tagheader .= $this->GenerateID3v2TagFlags(array('unsynchronisation'=>$TagUnsynchronisation));
-			$tagheader .= getid3_lib::BigEndian2String(strlen($tagstring), 4, true);
-
-			return $tagheader.$tagstring;
-		}
-		$this->errors[] = 'tag_data is not an array in GenerateID3v2Tag()';
-		return false;
-	}
-
-	function ID3v2IsValidPriceString($pricestring) {
-		if (getid3_id3v2::LanguageLookup(substr($pricestring, 0, 3), true) == '') {
-			return false;
-		} elseif (!$this->IsANumber(substr($pricestring, 3), true)) {
-			return false;
-		}
-		return true;
-	}
-
-	function ID3v2FrameFlagsLookupTagAlter($framename) {
-		// unfinished
-		switch ($framename) {
-			case 'RGAD':
-				$allow = true;
-			default:
-				$allow = false;
-				break;
-		}
-		return $allow;
-	}
-
-	function ID3v2FrameFlagsLookupFileAlter($framename) {
-		// unfinished
-		switch ($framename) {
-			case 'RGAD':
-				return false;
-				break;
-
-			default:
-				return false;
-				break;
-		}
-	}
-
-	function ID3v2IsValidETCOevent($eventid) {
-		if (($eventid < 0) || ($eventid > 0xFF)) {
-			// outside range of 1 byte
-			return false;
-		} elseif (($eventid >= 0xF0) && ($eventid <= 0xFC)) {
-			// reserved for future use
-			return false;
-		} elseif (($eventid >= 0x17) && ($eventid <= 0xDF)) {
-			// reserved for future use
-			return false;
-		} elseif (($eventid >= 0x0E) && ($eventid <= 0x16) && ($this->majorversion == 2)) {
-			// not defined in ID3v2.2
-			return false;
-		} elseif (($eventid >= 0x15) && ($eventid <= 0x16) && ($this->majorversion == 3)) {
-			// not defined in ID3v2.3
-			return false;
-		}
-		return true;
-	}
-
-	function ID3v2IsValidSYLTtype($contenttype) {
-		if (($contenttype >= 0) && ($contenttype <= 8) && ($this->majorversion == 4)) {
-			return true;
-		} elseif (($contenttype >= 0) && ($contenttype <= 6) && ($this->majorversion == 3)) {
-			return true;
-		}
-		return false;
-	}
-
-	function ID3v2IsValidRVA2channeltype($channeltype) {
-		if (($channeltype >= 0) && ($channeltype <= 8) && ($this->majorversion == 4)) {
-			return true;
-		}
-		return false;
-	}
-
-	function ID3v2IsValidAPICpicturetype($picturetype) {
-		if (($picturetype >= 0) && ($picturetype <= 0x14) && ($this->majorversion >= 2) && ($this->majorversion <= 4)) {
-			return true;
-		}
-		return false;
-	}
-
-	function ID3v2IsValidAPICimageformat($imageformat) {
-		if ($imageformat == '-->') {
-			return true;
-		} elseif ($this->majorversion == 2) {
-			if ((strlen($imageformat) == 3) && ($imageformat == strtoupper($imageformat))) {
-				return true;
-			}
-		} elseif (($this->majorversion == 3) || ($this->majorversion == 4)) {
-			if ($this->IsValidMIMEstring($imageformat)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	function ID3v2IsValidCOMRreceivedAs($receivedas) {
-		if (($this->majorversion >= 3) && ($receivedas >= 0) && ($receivedas <= 8)) {
-			return true;
-		}
-		return false;
-	}
-
-	function ID3v2IsValidRGADname($RGADname) {
-		if (($RGADname >= 0) && ($RGADname <= 2)) {
-			return true;
-		}
-		return false;
-	}
-
-	function ID3v2IsValidRGADoriginator($RGADoriginator) {
-		if (($RGADoriginator >= 0) && ($RGADoriginator <= 3)) {
-			return true;
-		}
-		return false;
-	}
-
-	function ID3v2IsValidTextEncoding($textencodingbyte) {
-		static $ID3v2IsValidTextEncoding_cache = array(
-			2 => array(true, true),
-			3 => array(true, true),
-			4 => array(true, true, true, true));
-		return isset($ID3v2IsValidTextEncoding_cache[$this->majorversion][$textencodingbyte]);
-	}
-
-	function Unsynchronise($data) {
-		// Whenever a false synchronisation is found within the tag, one zeroed
-		// byte is inserted after the first false synchronisation byte. The
-		// format of a correct sync that should be altered by ID3 encoders is as
-		// follows:
-		//      %11111111 111xxxxx
-		// And should be replaced with:
-		//      %11111111 00000000 111xxxxx
-		// This has the side effect that all $FF 00 combinations have to be
-		// altered, so they won't be affected by the decoding process. Therefore
-		// all the $FF 00 combinations have to be replaced with the $FF 00 00
-		// combination during the unsynchronisation.
-
-		$data = str_replace("\xFF\x00", "\xFF\x00\x00", $data);
-		$unsyncheddata = '';
-		$datalength = strlen($data);
-		for ($i = 0; $i < $datalength; $i++) {
-			$thischar = $data{$i};
-			$unsyncheddata .= $thischar;
-			if ($thischar == "\xFF") {
-				$nextchar = ord($data{$i + 1});
-				if (($nextchar & 0xE0) == 0xE0) {
-					// previous byte = 11111111, this byte = 111?????
-					$unsyncheddata .= "\x00";
-				}
-			}
-		}
-		return $unsyncheddata;
-	}
-
-	function is_hash($var) {
-		// written by dev-null�christophe*vg
-		// taken from http://www.php.net/manual/en/function.array-merge-recursive.php
-		if (is_array($var)) {
-			$keys = array_keys($var);
-			$all_num = true;
-			for ($i = 0; $i < count($keys); $i++) {
-				if (is_string($keys[$i])) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	function array_join_merge($arr1, $arr2) {
-		// written by dev-null�christophe*vg
-		// taken from http://www.php.net/manual/en/function.array-merge-recursive.php
-		if (is_array($arr1) && is_array($arr2)) {
-			// the same -> merge
-			$new_array = array();
-
-			if ($this->is_hash($arr1) && $this->is_hash($arr2)) {
-				// hashes -> merge based on keys
-				$keys = array_merge(array_keys($arr1), array_keys($arr2));
-				foreach ($keys as $key) {
-					$new_array[$key] = $this->array_join_merge((isset($arr1[$key]) ? $arr1[$key] : ''), (isset($arr2[$key]) ? $arr2[$key] : ''));
-				}
-			} else {
-				// two real arrays -> merge
-				$new_array = array_reverse(array_unique(array_reverse(array_merge($arr1, $arr2))));
-			}
-			return $new_array;
-		} else {
-			// not the same ... take new one if defined, else the old one stays
-			return $arr2 ? $arr2 : $arr1;
-		}
-	}
-
-	function IsValidMIMEstring($mimestring) {
-		if ((strlen($mimestring) >= 3) && (strpos($mimestring, '/') > 0) && (strpos($mimestring, '/') < (strlen($mimestring) - 1))) {
-			return true;
-		}
-		return false;
-	}
-
-	function IsWithinBitRange($number, $maxbits, $signed=false) {
-		if ($signed) {
-			if (($number > (0 - pow(2, $maxbits - 1))) && ($number <= pow(2, $maxbits - 1))) {
-				return true;
-			}
-		} else {
-			if (($number >= 0) && ($number <= pow(2, $maxbits))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	function safe_parse_url($url) {
-		$parts = @parse_url($url);
-		$parts['scheme'] = (isset($parts['scheme']) ? $parts['scheme'] : '');
-		$parts['host']   = (isset($parts['host'])   ? $parts['host']   : '');
-		$parts['user']   = (isset($parts['user'])   ? $parts['user']   : '');
-		$parts['pass']   = (isset($parts['pass'])   ? $parts['pass']   : '');
-		$parts['path']   = (isset($parts['path'])   ? $parts['path']   : '');
-		$parts['query']  = (isset($parts['query'])  ? $parts['query']  : '');
-		return $parts;
-	}
-
-	function IsValidURL($url, $allowUserPass=false) {
-		if ($url == '') {
-			return false;
-		}
-		if ($allowUserPass !== true) {
-			if (strstr($url, '@')) {
-				// in the format http://user:pass@example.com  or http://user@example.com
-				// but could easily be somebody incorrectly entering an email address in place of a URL
-				return false;
-			}
-		}
-		if ($parts = $this->safe_parse_url($url)) {
-			if (($parts['scheme'] != 'http') && ($parts['scheme'] != 'https') && ($parts['scheme'] != 'ftp') && ($parts['scheme'] != 'gopher')) {
-				return false;
-			} elseif (!preg_match('#^[[:alnum:]]([-.]?[0-9a-z])*\\.[a-z]{2,3}$#i', $parts['host'], $regs) && !preg_match('#^[0-9]{1,3}(\\.[0-9]{1,3}){3}$#', $parts['host'])) {
-				return false;
-			} elseif (!preg_match('#^([[:alnum:]-]|[\\_])*$#i', $parts['user'], $regs)) {
-				return false;
-			} elseif (!preg_match('#^([[:alnum:]-]|[\\_])*$#i', $parts['pass'], $regs)) {
-				return false;
-			} elseif (!preg_match('#^[[:alnum:]/_\\.@~-]*$#i', $parts['path'], $regs)) {
-				return false;
-			} elseif (!empty($parts['query']) && !preg_match('#^[[:alnum:]?&=+:;_()%\\#/,\\.-]*$#i', $parts['query'], $regs)) {
-				return false;
-			} else {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	static function ID3v2ShortFrameNameLookup($majorversion, $long_description) {
-		$long_description = str_replace(' ', '_', strtolower(trim($long_description)));
-		static $ID3v2ShortFrameNameLookup = array();
-		if (empty($ID3v2ShortFrameNameLookup)) {
-
-			// The following are unique to ID3v2.2
-			$ID3v2ShortFrameNameLookup[2]['comment']                                          = 'COM';
-			$ID3v2ShortFrameNameLookup[2]['album']                                            = 'TAL';
-			$ID3v2ShortFrameNameLookup[2]['beats_per_minute']                                 = 'TBP';
-			$ID3v2ShortFrameNameLookup[2]['composer']                                         = 'TCM';
-			$ID3v2ShortFrameNameLookup[2]['genre']                                            = 'TCO';
-			$ID3v2ShortFrameNameLookup[2]['itunescompilation']                                = 'TCP';
-			$ID3v2ShortFrameNameLookup[2]['copyright']                                        = 'TCR';
-			$ID3v2ShortFrameNameLookup[2]['encoded_by']                                       = 'TEN';
-			$ID3v2ShortFrameNameLookup[2]['language']                                         = 'TLA';
-			$ID3v2ShortFrameNameLookup[2]['length']                                           = 'TLE';
-			$ID3v2ShortFrameNameLookup[2]['original_artist']                                  = 'TOA';
-			$ID3v2ShortFrameNameLookup[2]['original_filename']                                = 'TOF';
-			$ID3v2ShortFrameNameLookup[2]['original_lyricist']                                = 'TOL';
-			$ID3v2ShortFrameNameLookup[2]['original_album_title']                             = 'TOT';
-			$ID3v2ShortFrameNameLookup[2]['artist']                                           = 'TP1';
-			$ID3v2ShortFrameNameLookup[2]['band']                                             = 'TP2';
-			$ID3v2ShortFrameNameLookup[2]['conductor']                                        = 'TP3';
-			$ID3v2ShortFrameNameLookup[2]['remixer']                                          = 'TP4';
-			$ID3v2ShortFrameNameLookup[2]['publisher']                                        = 'TPB';
-			$ID3v2ShortFrameNameLookup[2]['isrc']                                             = 'TRC';
-			$ID3v2ShortFrameNameLookup[2]['tracknumber']                                      = 'TRK';
-			$ID3v2ShortFrameNameLookup[2]['size']                                             = 'TSI';
-			$ID3v2ShortFrameNameLookup[2]['encoder_settings']                                 = 'TSS';
-			$ID3v2ShortFrameNameLookup[2]['description']                                      = 'TT1';
-			$ID3v2ShortFrameNameLookup[2]['title']                                            = 'TT2';
-			$ID3v2ShortFrameNameLookup[2]['subtitle']                                         = 'TT3';
-			$ID3v2ShortFrameNameLookup[2]['lyricist']                                         = 'TXT';
-			$ID3v2ShortFrameNameLookup[2]['user_text']                                        = 'TXX';
-			$ID3v2ShortFrameNameLookup[2]['year']                                             = 'TYE';
-			$ID3v2ShortFrameNameLookup[2]['unique_file_identifier']                           = 'UFI';
-			$ID3v2ShortFrameNameLookup[2]['unsynchronised_lyrics']                            = 'ULT';
-			$ID3v2ShortFrameNameLookup[2]['url_file']                                         = 'WAF';
-			$ID3v2ShortFrameNameLookup[2]['url_artist']                                       = 'WAR';
-			$ID3v2ShortFrameNameLookup[2]['url_source']                                       = 'WAS';
-			$ID3v2ShortFrameNameLookup[2]['copyright_information']                            = 'WCP';
-			$ID3v2ShortFrameNameLookup[2]['url_publisher']                                    = 'WPB';
-			$ID3v2ShortFrameNameLookup[2]['url_user']                                         = 'WXX';
-
-			// The following are common to ID3v2.3 and ID3v2.4
-			$ID3v2ShortFrameNameLookup[3]['audio_encryption']                                 = 'AENC';
-			$ID3v2ShortFrameNameLookup[3]['attached_picture']                                 = 'APIC';
-			$ID3v2ShortFrameNameLookup[3]['comment']                                          = 'COMM';
-			$ID3v2ShortFrameNameLookup[3]['commercial']                                       = 'COMR';
-			$ID3v2ShortFrameNameLookup[3]['encryption_method_registration']                   = 'ENCR';
-			$ID3v2ShortFrameNameLookup[3]['event_timing_codes']                               = 'ETCO';
-			$ID3v2ShortFrameNameLookup[3]['general_encapsulated_object']                      = 'GEOB';
-			$ID3v2ShortFrameNameLookup[3]['group_identification_registration']                = 'GRID';
-			$ID3v2ShortFrameNameLookup[3]['linked_information']                               = 'LINK';
-			$ID3v2ShortFrameNameLookup[3]['music_cd_identifier']                              = 'MCDI';
-			$ID3v2ShortFrameNameLookup[3]['mpeg_location_lookup_table']                       = 'MLLT';
-			$ID3v2ShortFrameNameLookup[3]['ownership']                                        = 'OWNE';
-			$ID3v2ShortFrameNameLookup[3]['play_counter']                                     = 'PCNT';
-			$ID3v2ShortFrameNameLookup[3]['popularimeter']                                    = 'POPM';
-			$ID3v2ShortFrameNameLookup[3]['position_synchronisation']                         = 'POSS';
-			$ID3v2ShortFrameNameLookup[3]['private']                                          = 'PRIV';
-			$ID3v2ShortFrameNameLookup[3]['recommended_buffer_size']                          = 'RBUF';
-			$ID3v2ShortFrameNameLookup[3]['reverb']                                           = 'RVRB';
-			$ID3v2ShortFrameNameLookup[3]['synchronised_lyrics']                              = 'SYLT';
-			$ID3v2ShortFrameNameLookup[3]['synchronised_tempo_codes']                         = 'SYTC';
-			$ID3v2ShortFrameNameLookup[3]['album']                                            = 'TALB';
-			$ID3v2ShortFrameNameLookup[3]['beats_per_minute']                                 = 'TBPM';
-			$ID3v2ShortFrameNameLookup[3]['itunescompilation']                                = 'TCMP';
-			$ID3v2ShortFrameNameLookup[3]['composer']                                         = 'TCOM';
-			$ID3v2ShortFrameNameLookup[3]['genre']                                            = 'TCON';
-			$ID3v2ShortFrameNameLookup[3]['copyright']                                        = 'TCOP';
-			$ID3v2ShortFrameNameLookup[3]['playlist_delay']                                   = 'TDLY';
-			$ID3v2ShortFrameNameLookup[3]['encoded_by']                                       = 'TENC';
-			$ID3v2ShortFrameNameLookup[3]['lyricist']                                         = 'TEXT';
-			$ID3v2ShortFrameNameLookup[3]['file_type']                                        = 'TFLT';
-			$ID3v2ShortFrameNameLookup[3]['content_group_description']                        = 'TIT1';
-			$ID3v2ShortFrameNameLookup[3]['title']                                            = 'TIT2';
-			$ID3v2ShortFrameNameLookup[3]['subtitle']                                         = 'TIT3';
-			$ID3v2ShortFrameNameLookup[3]['initial_key']                                      = 'TKEY';
-			$ID3v2ShortFrameNameLookup[3]['language']                                         = 'TLAN';
-			$ID3v2ShortFrameNameLookup[3]['length']                                           = 'TLEN';
-			$ID3v2ShortFrameNameLookup[3]['media_type']                                       = 'TMED';
-			$ID3v2ShortFrameNameLookup[3]['original_album_title']                             = 'TOAL';
-			$ID3v2ShortFrameNameLookup[3]['original_filename']                                = 'TOFN';
-			$ID3v2ShortFrameNameLookup[3]['original_lyricist']                                = 'TOLY';
-			$ID3v2ShortFrameNameLookup[3]['original_artist']                                  = 'TOPE';
-			$ID3v2ShortFrameNameLookup[3]['file_owner']                                       = 'TOWN';
-			$ID3v2ShortFrameNameLookup[3]['artist']                                           = 'TPE1';
-			$ID3v2ShortFrameNameLookup[3]['band']                                             = 'TPE2';
-			$ID3v2ShortFrameNameLookup[3]['conductor']                                        = 'TPE3';
-			$ID3v2ShortFrameNameLookup[3]['remixer']                                          = 'TPE4';
-			$ID3v2ShortFrameNameLookup[3]['part_of_a_set']                                    = 'TPOS';
-			$ID3v2ShortFrameNameLookup[3]['publisher']                                        = 'TPUB';
-			$ID3v2ShortFrameNameLookup[3]['tracknumber']                                      = 'TRCK';
-			$ID3v2ShortFrameNameLookup[3]['internet_radio_station_name']                      = 'TRSN';
-			$ID3v2ShortFrameNameLookup[3]['internet_radio_station_owner']                     = 'TRSO';
-			$ID3v2ShortFrameNameLookup[3]['isrc']                                             = 'TSRC';
-			$ID3v2ShortFrameNameLookup[3]['encoder_settings']                                 = 'TSSE';
-			$ID3v2ShortFrameNameLookup[3]['user_text']                                        = 'TXXX';
-			$ID3v2ShortFrameNameLookup[3]['unique_file_identifier']                           = 'UFID';
-			$ID3v2ShortFrameNameLookup[3]['terms_of_use']                                     = 'USER';
-			$ID3v2ShortFrameNameLookup[3]['unsynchronised_lyrics']                            = 'USLT';
-			$ID3v2ShortFrameNameLookup[3]['commercial']                                       = 'WCOM';
-			$ID3v2ShortFrameNameLookup[3]['copyright_information']                            = 'WCOP';
-			$ID3v2ShortFrameNameLookup[3]['url_file']                                         = 'WOAF';
-			$ID3v2ShortFrameNameLookup[3]['url_artist']                                       = 'WOAR';
-			$ID3v2ShortFrameNameLookup[3]['url_source']                                       = 'WOAS';
-			$ID3v2ShortFrameNameLookup[3]['url_station']                                      = 'WORS';
-			$ID3v2ShortFrameNameLookup[3]['payment']                                          = 'WPAY';
-			$ID3v2ShortFrameNameLookup[3]['url_publisher']                                    = 'WPUB';
-			$ID3v2ShortFrameNameLookup[3]['url_user']                                         = 'WXXX';
-
-			// The above are common to ID3v2.3 and ID3v2.4
-			// so copy them to ID3v2.4 before adding specifics for 2.3 and 2.4
-			$ID3v2ShortFrameNameLookup[4] = $ID3v2ShortFrameNameLookup[3];
-
-			// The following are unique to ID3v2.3
-			$ID3v2ShortFrameNameLookup[3]['equalisation']                                     = 'EQUA';
-			$ID3v2ShortFrameNameLookup[3]['involved_people_list']                             = 'IPLS';
-			$ID3v2ShortFrameNameLookup[3]['relative_volume_adjustment']                       = 'RVAD';
-			$ID3v2ShortFrameNameLookup[3]['date']                                             = 'TDAT';
-			$ID3v2ShortFrameNameLookup[3]['time']                                             = 'TIME';
-			$ID3v2ShortFrameNameLookup[3]['original_release_year']                            = 'TORY';
-			$ID3v2ShortFrameNameLookup[3]['recording_dates']                                  = 'TRDA';
-			$ID3v2ShortFrameNameLookup[3]['size']                                             = 'TSIZ';
-			$ID3v2ShortFrameNameLookup[3]['year']                                             = 'TYER';
-
-
-			// The following are unique to ID3v2.4
-			$ID3v2ShortFrameNameLookup[4]['audio_seek_point_index']                           = 'ASPI';
-			$ID3v2ShortFrameNameLookup[4]['equalisation']                                     = 'EQU2';
-			$ID3v2ShortFrameNameLookup[4]['relative_volume_adjustment']                       = 'RVA2';
-			$ID3v2ShortFrameNameLookup[4]['seek']                                             = 'SEEK';
-			$ID3v2ShortFrameNameLookup[4]['signature']                                        = 'SIGN';
-			$ID3v2ShortFrameNameLookup[4]['encoding_time']                                    = 'TDEN';
-			$ID3v2ShortFrameNameLookup[4]['original_release_time']                            = 'TDOR';
-			$ID3v2ShortFrameNameLookup[4]['recording_time']                                   = 'TDRC';
-			$ID3v2ShortFrameNameLookup[4]['release_time']                                     = 'TDRL';
-			$ID3v2ShortFrameNameLookup[4]['tagging_time']                                     = 'TDTG';
-			$ID3v2ShortFrameNameLookup[4]['involved_people_list']                             = 'TIPL';
-			$ID3v2ShortFrameNameLookup[4]['musician_credits_list']                            = 'TMCL';
-			$ID3v2ShortFrameNameLookup[4]['mood']                                             = 'TMOO';
-			$ID3v2ShortFrameNameLookup[4]['produced_notice']                                  = 'TPRO';
-			$ID3v2ShortFrameNameLookup[4]['album_sort_order']                                 = 'TSOA';
-			$ID3v2ShortFrameNameLookup[4]['performer_sort_order']                             = 'TSOP';
-			$ID3v2ShortFrameNameLookup[4]['title_sort_order']                                 = 'TSOT';
-			$ID3v2ShortFrameNameLookup[4]['set_subtitle']                                     = 'TSST';
-		}
-		return (isset($ID3v2ShortFrameNameLookup[$majorversion][strtolower($long_description)]) ? $ID3v2ShortFrameNameLookup[$majorversion][strtolower($long_description)] : '');
-
-	}
-
-}
-
-?>
diff --git a/lib/getid3/getid3/write.lyrics3.php b/lib/getid3/getid3/write.lyrics3.php
deleted file mode 100644
index fa49cd16e..000000000
--- a/lib/getid3/getid3/write.lyrics3.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// write.lyrics3.php                                           //
-// module for writing Lyrics3 tags                             //
-// dependencies: module.tag.lyrics3.php                        //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_write_lyrics3
-{
-	var $filename;
-	var $tag_data;
-	//var $lyrics3_version = 2;       // 1 or 2
-	var $warnings        = array(); // any non-critical errors will be stored here
-	var $errors          = array(); // any critical errors will be stored here
-
-	function getid3_write_lyrics3() {
-		return true;
-	}
-
-	function WriteLyrics3() {
-		$this->errors[] = 'WriteLyrics3() not yet functional - cannot write Lyrics3';
-		return false;
-	}
-	function DeleteLyrics3() {
-		// Initialize getID3 engine
-		$getID3 = new getID3;
-		$ThisFileInfo = $getID3->analyze($this->filename);
-		if (isset($ThisFileInfo['lyrics3']['tag_offset_start']) && isset($ThisFileInfo['lyrics3']['tag_offset_end'])) {
-			if (is_readable($this->filename) && is_writable($this->filename) && is_file($this->filename) && ($fp = fopen($this->filename, 'a+b'))) {
-
-				flock($fp, LOCK_EX);
-				$oldignoreuserabort = ignore_user_abort(true);
-
-				fseek($fp, $ThisFileInfo['lyrics3']['tag_offset_end'], SEEK_SET);
-				$DataAfterLyrics3 = '';
-				if ($ThisFileInfo['filesize'] > $ThisFileInfo['lyrics3']['tag_offset_end']) {
-					$DataAfterLyrics3 = fread($fp, $ThisFileInfo['filesize'] - $ThisFileInfo['lyrics3']['tag_offset_end']);
-				}
-
-				ftruncate($fp, $ThisFileInfo['lyrics3']['tag_offset_start']);
-
-				if (!empty($DataAfterLyrics3)) {
-					fseek($fp, $ThisFileInfo['lyrics3']['tag_offset_start'], SEEK_SET);
-					fwrite($fp, $DataAfterLyrics3, strlen($DataAfterLyrics3));
-				}
-
-				flock($fp, LOCK_UN);
-				fclose($fp);
-				ignore_user_abort($oldignoreuserabort);
-
-				return true;
-
-			} else {
-				$this->errors[] = 'Cannot fopen('.$this->filename.', "a+b")';
-				return false;
-			}
-		}
-		// no Lyrics3 present
-		return true;
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/write.metaflac.php b/lib/getid3/getid3/write.metaflac.php
deleted file mode 100644
index dfd6950aa..000000000
--- a/lib/getid3/getid3/write.metaflac.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// write.metaflac.php                                          //
-// module for writing metaflac tags                            //
-// dependencies: /helperapps/metaflac.exe                      //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_write_metaflac
-{
-
-	var $filename;
-	var $tag_data;
-	var $warnings = array(); // any non-critical errors will be stored here
-	var $errors   = array(); // any critical errors will be stored here
-
-	function getid3_write_metaflac() {
-		return true;
-	}
-
-	function WriteMetaFLAC() {
-
-		if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
-			$this->errors[] = 'PHP running in Safe Mode (backtick operator not available) - cannot call metaflac, tags not written';
-			return false;
-		}
-
-		// Create file with new comments
-		$tempcommentsfilename = tempnam(GETID3_TEMP_DIR, 'getID3');
-		if (is_writable($tempcommentsfilename) && is_file($tempcommentsfilename) && ($fpcomments = fopen($tempcommentsfilename, 'wb'))) {
-			foreach ($this->tag_data as $key => $value) {
-				foreach ($value as $commentdata) {
-					fwrite($fpcomments, $this->CleanmetaflacName($key).'='.$commentdata."\n");
-				}
-			}
-			fclose($fpcomments);
-
-		} else {
-			$this->errors[] = 'failed to open temporary tags file, tags not written - fopen("'.$tempcommentsfilename.'", "wb")';
-			return false;
-		}
-
-		$oldignoreuserabort = ignore_user_abort(true);
-		if (GETID3_OS_ISWINDOWS) {
-
-			if (file_exists(GETID3_HELPERAPPSDIR.'metaflac.exe')) {
-				//$commandline = '"'.GETID3_HELPERAPPSDIR.'metaflac.exe" --no-utf8-convert --remove-all-tags --import-tags-from="'.$tempcommentsfilename.'" "'.str_replace('/', '\\', $this->filename).'"';
-				//  metaflac works fine if you copy-paste the above commandline into a command prompt,
-				//  but refuses to work with `backtick` if there are "doublequotes" present around BOTH
-				//  the metaflac pathname and the target filename. For whatever reason...??
-				//  The solution is simply ensure that the metaflac pathname has no spaces,
-				//  and therefore does not need to be quoted
-
-				// On top of that, if error messages are not always captured properly under Windows
-				// To at least see if there was a problem, compare file modification timestamps before and after writing
-				clearstatcache();
-				$timestampbeforewriting = filemtime($this->filename);
-
-				$commandline = GETID3_HELPERAPPSDIR.'metaflac.exe --no-utf8-convert --remove-all-tags --import-tags-from='.escapeshellarg($tempcommentsfilename).' '.escapeshellarg($this->filename).' 2>&1';
-				$metaflacError = `$commandline`;
-
-				if (empty($metaflacError)) {
-					clearstatcache();
-					if ($timestampbeforewriting == filemtime($this->filename)) {
-						$metaflacError = 'File modification timestamp has not changed - it looks like the tags were not written';
-					}
-				}
-			} else {
-				$metaflacError = 'metaflac.exe not found in '.GETID3_HELPERAPPSDIR;
-			}
-
-		} else {
-
-			// It's simpler on *nix
-			$commandline = 'metaflac --no-utf8-convert --remove-all-tags --import-tags-from='.escapeshellarg($tempcommentsfilename).' '.escapeshellarg($this->filename).' 2>&1';
-			$metaflacError = `$commandline`;
-
-		}
-
-		// Remove temporary comments file
-		unlink($tempcommentsfilename);
-		ignore_user_abort($oldignoreuserabort);
-
-		if (!empty($metaflacError)) {
-
-			$this->errors[] = 'System call to metaflac failed with this message returned: '."\n\n".$metaflacError;
-			return false;
-
-		}
-
-		return true;
-	}
-
-
-	function DeleteMetaFLAC() {
-
-		if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
-			$this->errors[] = 'PHP running in Safe Mode (backtick operator not available) - cannot call metaflac, tags not deleted';
-			return false;
-		}
-
-		$oldignoreuserabort = ignore_user_abort(true);
-		if (GETID3_OS_ISWINDOWS) {
-
-			if (file_exists(GETID3_HELPERAPPSDIR.'metaflac.exe')) {
-				// To at least see if there was a problem, compare file modification timestamps before and after writing
-				clearstatcache();
-				$timestampbeforewriting = filemtime($this->filename);
-
-				$commandline = GETID3_HELPERAPPSDIR.'metaflac.exe --remove-all-tags "'.$this->filename.'" 2>&1';
-				$metaflacError = `$commandline`;
-
-				if (empty($metaflacError)) {
-					clearstatcache();
-					if ($timestampbeforewriting == filemtime($this->filename)) {
-						$metaflacError = 'File modification timestamp has not changed - it looks like the tags were not deleted';
-					}
-				}
-			} else {
-				$metaflacError = 'metaflac.exe not found in '.GETID3_HELPERAPPSDIR;
-			}
-
-		} else {
-
-			// It's simpler on *nix
-			$commandline = 'metaflac --remove-all-tags "'.$this->filename.'" 2>&1';
-			$metaflacError = `$commandline`;
-
-		}
-
-		ignore_user_abort($oldignoreuserabort);
-
-		if (!empty($metaflacError)) {
-			$this->errors[] = 'System call to metaflac failed with this message returned: '."\n\n".$metaflacError;
-			return false;
-		}
-		return true;
-	}
-
-
-	function CleanmetaflacName($originalcommentname) {
-		// A case-insensitive field name that may consist of ASCII 0x20 through 0x7D, 0x3D ('=') excluded.
-		// ASCII 0x41 through 0x5A inclusive (A-Z) is to be considered equivalent to ASCII 0x61 through
-		// 0x7A inclusive (a-z).
-
-		// replace invalid chars with a space, return uppercase text
-		// Thanks Chris Bolt <chris-getid3�bolt*cx> for improving this function
-		// note: *reg_replace() replaces nulls with empty string (not space)
-		return strtoupper(preg_replace('#[^ -<>-}]#', ' ', str_replace("\x00", ' ', $originalcommentname)));
-
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/write.php b/lib/getid3/getid3/write.php
deleted file mode 100644
index 16b19c7d7..000000000
--- a/lib/getid3/getid3/write.php
+++ /dev/null
@@ -1,615 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-///                                                            //
-// write.php                                                   //
-// module for writing tags (APEv2, ID3v1, ID3v2)               //
-// dependencies: getid3.lib.php                                //
-//               write.apetag.php (optional)                   //
-//               write.id3v1.php (optional)                    //
-//               write.id3v2.php (optional)                    //
-//               write.vorbiscomment.php (optional)            //
-//               write.metaflac.php (optional)                 //
-//               write.lyrics3.php (optional)                  //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-if (!defined('GETID3_INCLUDEPATH')) {
-	throw new Exception('getid3.php MUST be included before calling getid3_writetags');
-}
-if (!include_once(GETID3_INCLUDEPATH.'getid3.lib.php')) {
-	throw new Exception('write.php depends on getid3.lib.php, which is missing.');
-}
-
-
-// NOTES:
-//
-// You should pass data here with standard field names as follows:
-// * TITLE
-// * ARTIST
-// * ALBUM
-// * TRACKNUMBER
-// * COMMENT
-// * GENRE
-// * YEAR
-// * ATTACHED_PICTURE (ID3v2 only)
-//
-// http://www.personal.uni-jena.de/~pfk/mpp/sv8/apekey.html
-// The APEv2 Tag Items Keys definition says "TRACK" is correct but foobar2000 uses "TRACKNUMBER" instead
-// Pass data here as "TRACKNUMBER" for compatability with all formats
-
-
-class getid3_writetags
-{
-	// public
-	var $filename;                            // absolute filename of file to write tags to
-	var $tagformats         = array();        // array of tag formats to write ('id3v1', 'id3v2.2', 'id2v2.3', 'id3v2.4', 'ape', 'vorbiscomment', 'metaflac', 'real')
-	var $tag_data           = array(array()); // 2-dimensional array of tag data (ex: $data['ARTIST'][0] = 'Elvis')
-	var $tag_encoding       = 'ISO-8859-1';   // text encoding used for tag data ('ISO-8859-1', 'UTF-8', 'UTF-16', 'UTF-16LE', 'UTF-16BE', )
-	var $overwrite_tags     = true;          // if true will erase existing tag data and write only passed data; if false will merge passed data with existing tag data
-	var $remove_other_tags  = false;          // if true will erase remove all existing tags and only write those passed in $tagformats; if false will ignore any tags not mentioned in $tagformats
-
-	var $id3v2_tag_language = 'eng';          // ISO-639-2 3-character language code needed for some ID3v2 frames (http://www.id3.org/iso639-2.html)
-	var $id3v2_paddedlength = 4096;           // minimum length of ID3v2 tags (will be padded to this length if tag data is shorter)
-
-	var $warnings           = array();        // any non-critical errors will be stored here
-	var $errors             = array();        // any critical errors will be stored here
-
-	// private
-	var $ThisFileInfo; // analysis of file before writing
-
-	function getid3_writetags() {
-		return true;
-	}
-
-
-	function WriteTags() {
-
-		if (empty($this->filename)) {
-			$this->errors[] = 'filename is undefined in getid3_writetags';
-			return false;
-		} elseif (!file_exists($this->filename)) {
-			$this->errors[] = 'filename set to non-existant file "'.$this->filename.'" in getid3_writetags';
-			return false;
-		}
-
-		if (!is_array($this->tagformats)) {
-			$this->errors[] = 'tagformats must be an array in getid3_writetags';
-			return false;
-		}
-
-		$TagFormatsToRemove = array();
-		if (filesize($this->filename) == 0) {
-
-			// empty file special case - allow any tag format, don't check existing format
-			// could be useful if you want to generate tag data for a non-existant file
-			$this->ThisFileInfo = array('fileformat'=>'');
-			$AllowedTagFormats = array('id3v1', 'id3v2.2', 'id3v2.3', 'id3v2.4', 'ape', 'lyrics3');
-
-		} else {
-
-			$getID3 = new getID3;
-			$getID3->encoding = $this->tag_encoding;
-			$this->ThisFileInfo = $getID3->analyze($this->filename);
-
-			// check for what file types are allowed on this fileformat
-			switch (isset($this->ThisFileInfo['fileformat']) ? $this->ThisFileInfo['fileformat'] : '') {
-				case 'mp3':
-				case 'mp2':
-				case 'mp1':
-				case 'riff': // maybe not officially, but people do it anyway
-					$AllowedTagFormats = array('id3v1', 'id3v2.2', 'id3v2.3', 'id3v2.4', 'ape', 'lyrics3');
-					break;
-
-				case 'mpc':
-					$AllowedTagFormats = array('ape');
-					break;
-
-				case 'flac':
-					$AllowedTagFormats = array('metaflac');
-					break;
-
-				case 'real':
-					$AllowedTagFormats = array('real');
-					break;
-
-				case 'ogg':
-					switch (isset($this->ThisFileInfo['audio']['dataformat']) ? $this->ThisFileInfo['audio']['dataformat'] : '') {
-						case 'flac':
-							//$AllowedTagFormats = array('metaflac');
-							$this->errors[] = 'metaflac is not (yet) compatible with OggFLAC files';
-							return false;
-							break;
-						case 'vorbis':
-							$AllowedTagFormats = array('vorbiscomment');
-							break;
-						default:
-							$this->errors[] = 'metaflac is not (yet) compatible with Ogg files other than OggVorbis';
-							return false;
-							break;
-					}
-					break;
-
-				default:
-					$AllowedTagFormats = array();
-					break;
-			}
-			foreach ($this->tagformats as $requested_tag_format) {
-				if (!in_array($requested_tag_format, $AllowedTagFormats)) {
-					$errormessage = 'Tag format "'.$requested_tag_format.'" is not allowed on "'.(isset($this->ThisFileInfo['fileformat']) ? $this->ThisFileInfo['fileformat'] : '');
-					$errormessage .= (isset($this->ThisFileInfo['audio']['dataformat']) ? '.'.$this->ThisFileInfo['audio']['dataformat'] : '');
-					$errormessage .= '" files';
-					$this->errors[] = $errormessage;
-					return false;
-				}
-			}
-
-			// List of other tag formats, removed if requested
-			if ($this->remove_other_tags) {
-				foreach ($AllowedTagFormats as $AllowedTagFormat) {
-					switch ($AllowedTagFormat) {
-						case 'id3v2.2':
-						case 'id3v2.3':
-						case 'id3v2.4':
-							if (!in_array('id3v2', $TagFormatsToRemove) && !in_array('id3v2.2', $this->tagformats) && !in_array('id3v2.3', $this->tagformats) && !in_array('id3v2.4', $this->tagformats)) {
-								$TagFormatsToRemove[] = 'id3v2';
-							}
-							break;
-
-						default:
-							if (!in_array($AllowedTagFormat, $this->tagformats)) {
-								$TagFormatsToRemove[] = $AllowedTagFormat;
-							}
-							break;
-					}
-				}
-			}
-		}
-
-		$WritingFilesToInclude = array_merge($this->tagformats, $TagFormatsToRemove);
-
-		// Check for required include files and include them
-		foreach ($WritingFilesToInclude as $tagformat) {
-			switch ($tagformat) {
-				case 'ape':
-					$GETID3_ERRORARRAY = &$this->errors;
-					if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'write.apetag.php', __FILE__, false)) {
-						return false;
-					}
-					break;
-
-				case 'id3v1':
-				case 'lyrics3':
-				case 'vorbiscomment':
-				case 'metaflac':
-				case 'real':
-					$GETID3_ERRORARRAY = &$this->errors;
-					if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'write.'.$tagformat.'.php', __FILE__, false)) {
-						return false;
-					}
-					break;
-
-				case 'id3v2.2':
-				case 'id3v2.3':
-				case 'id3v2.4':
-				case 'id3v2':
-					$GETID3_ERRORARRAY = &$this->errors;
-					if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'write.id3v2.php', __FILE__, false)) {
-						return false;
-					}
-					break;
-
-				default:
-					$this->errors[] = 'unknown tag format "'.$tagformat.'" in $tagformats in WriteTags()';
-					return false;
-					break;
-			}
-
-		}
-
-		// Validation of supplied data
-		if (!is_array($this->tag_data)) {
-			$this->errors[] = '$this->tag_data is not an array in WriteTags()';
-			return false;
-		}
-		// convert supplied data array keys to upper case, if they're not already
-		foreach ($this->tag_data as $tag_key => $tag_array) {
-			if (strtoupper($tag_key) !== $tag_key) {
-				$this->tag_data[strtoupper($tag_key)] = $this->tag_data[$tag_key];
-				unset($this->tag_data[$tag_key]);
-			}
-		}
-		// convert source data array keys to upper case, if they're not already
-		if (!empty($this->ThisFileInfo['tags'])) {
-			foreach ($this->ThisFileInfo['tags'] as $tag_format => $tag_data_array) {
-				foreach ($tag_data_array as $tag_key => $tag_array) {
-					if (strtoupper($tag_key) !== $tag_key) {
-						$this->ThisFileInfo['tags'][$tag_format][strtoupper($tag_key)] = $this->ThisFileInfo['tags'][$tag_format][$tag_key];
-						unset($this->ThisFileInfo['tags'][$tag_format][$tag_key]);
-					}
-				}
-			}
-		}
-
-		// Convert "TRACK" to "TRACKNUMBER" (if needed) for compatability with all formats
-		if (isset($this->tag_data['TRACK']) && !isset($this->tag_data['TRACKNUMBER'])) {
-			$this->tag_data['TRACKNUMBER'] = $this->tag_data['TRACK'];
-			unset($this->tag_data['TRACK']);
-		}
-
-		// Remove all other tag formats, if requested
-		if ($this->remove_other_tags) {
-			$this->DeleteTags($TagFormatsToRemove);
-		}
-
-		// Write data for each tag format
-		foreach ($this->tagformats as $tagformat) {
-			$success = false; // overridden if tag writing is successful
-			switch ($tagformat) {
-				case 'ape':
-					$ape_writer = new getid3_write_apetag;
-					if (($ape_writer->tag_data = $this->FormatDataForAPE()) !== false) {
-						$ape_writer->filename = $this->filename;
-						if (($success = $ape_writer->WriteAPEtag()) === false) {
-							$this->errors[] = 'WriteAPEtag() failed with message(s):<pre><ul><li>'.str_replace("\n", '</li><li>', htmlentities(trim(implode("\n", $ape_writer->errors)))).'</li></ul></pre>';
-						}
-					} else {
-						$this->errors[] = 'FormatDataForAPE() failed';
-					}
-					break;
-
-				case 'id3v1':
-					$id3v1_writer = new getid3_write_id3v1;
-					if (($id3v1_writer->tag_data = $this->FormatDataForID3v1()) !== false) {
-						$id3v1_writer->filename = $this->filename;
-						if (($success = $id3v1_writer->WriteID3v1()) === false) {
-							$this->errors[] = 'WriteID3v1() failed with message(s):<pre><ul><li>'.str_replace("\n", '</li><li>', htmlentities(trim(implode("\n", $id3v1_writer->errors)))).'</li></ul></pre>';
-						}
-					} else {
-						$this->errors[] = 'FormatDataForID3v1() failed';
-					}
-					break;
-
-				case 'id3v2.2':
-				case 'id3v2.3':
-				case 'id3v2.4':
-					$id3v2_writer = new getid3_write_id3v2;
-					$id3v2_writer->majorversion = intval(substr($tagformat, -1));
-					$id3v2_writer->paddedlength = $this->id3v2_paddedlength;
-					if (($id3v2_writer->tag_data = $this->FormatDataForID3v2($id3v2_writer->majorversion)) !== false) {
-						$id3v2_writer->filename = $this->filename;
-						if (($success = $id3v2_writer->WriteID3v2()) === false) {
-							$this->errors[] = 'WriteID3v2() failed with message(s):<pre><ul><li>'.str_replace("\n", '</li><li>', htmlentities(trim(implode("\n", $id3v2_writer->errors)))).'</li></ul></pre>';
-						}
-					} else {
-						$this->errors[] = 'FormatDataForID3v2() failed';
-					}
-					break;
-
-				case 'vorbiscomment':
-					$vorbiscomment_writer = new getid3_write_vorbiscomment;
-					if (($vorbiscomment_writer->tag_data = $this->FormatDataForVorbisComment()) !== false) {
-						$vorbiscomment_writer->filename = $this->filename;
-						if (($success = $vorbiscomment_writer->WriteVorbisComment()) === false) {
-							$this->errors[] = 'WriteVorbisComment() failed with message(s):<pre><ul><li>'.str_replace("\n", '</li><li>', htmlentities(trim(implode("\n", $vorbiscomment_writer->errors)))).'</li></ul></pre>';
-						}
-					} else {
-						$this->errors[] = 'FormatDataForVorbisComment() failed';
-					}
-					break;
-
-				case 'metaflac':
-					$metaflac_writer = new getid3_write_metaflac;
-					if (($metaflac_writer->tag_data = $this->FormatDataForMetaFLAC()) !== false) {
-						$metaflac_writer->filename = $this->filename;
-						if (($success = $metaflac_writer->WriteMetaFLAC()) === false) {
-							$this->errors[] = 'WriteMetaFLAC() failed with message(s):<pre><ul><li>'.str_replace("\n", '</li><li>', htmlentities(trim(implode("\n", $metaflac_writer->errors)))).'</li></ul></pre>';
-						}
-					} else {
-						$this->errors[] = 'FormatDataForMetaFLAC() failed';
-					}
-					break;
-
-				case 'real':
-					$real_writer = new getid3_write_real;
-					if (($real_writer->tag_data = $this->FormatDataForReal()) !== false) {
-						$real_writer->filename = $this->filename;
-						if (($success = $real_writer->WriteReal()) === false) {
-							$this->errors[] = 'WriteReal() failed with message(s):<pre><ul><li>'.str_replace("\n", '</li><li>', htmlentities(trim(implode("\n", $real_writer->errors)))).'</li></ul></pre>';
-						}
-					} else {
-						$this->errors[] = 'FormatDataForReal() failed';
-					}
-					break;
-
-				default:
-					$this->errors[] = 'Invalid tag format to write: "'.$tagformat.'"';
-					return false;
-					break;
-			}
-			if (!$success) {
-				return false;
-			}
-		}
-		return true;
-
-	}
-
-
-	function DeleteTags($TagFormatsToDelete) {
-		foreach ($TagFormatsToDelete as $DeleteTagFormat) {
-			$success = false; // overridden if tag deletion is successful
-			switch ($DeleteTagFormat) {
-				case 'id3v1':
-					$id3v1_writer = new getid3_write_id3v1;
-					$id3v1_writer->filename = $this->filename;
-					if (($success = $id3v1_writer->RemoveID3v1()) === false) {
-						$this->errors[] = 'RemoveID3v1() failed with message(s):<PRE><UL><LI>'.trim(implode('</LI><LI>', $id3v1_writer->errors)).'</LI></UL></PRE>';
-					}
-					break;
-
-				case 'id3v2':
-					$id3v2_writer = new getid3_write_id3v2;
-					$id3v2_writer->filename = $this->filename;
-					if (($success = $id3v2_writer->RemoveID3v2()) === false) {
-						$this->errors[] = 'RemoveID3v2() failed with message(s):<PRE><UL><LI>'.trim(implode('</LI><LI>', $id3v2_writer->errors)).'</LI></UL></PRE>';
-					}
-					break;
-
-				case 'ape':
-					$ape_writer = new getid3_write_apetag;
-					$ape_writer->filename = $this->filename;
-					if (($success = $ape_writer->DeleteAPEtag()) === false) {
-						$this->errors[] = 'DeleteAPEtag() failed with message(s):<PRE><UL><LI>'.trim(implode('</LI><LI>', $ape_writer->errors)).'</LI></UL></PRE>';
-					}
-					break;
-
-				case 'vorbiscomment':
-					$vorbiscomment_writer = new getid3_write_vorbiscomment;
-					$vorbiscomment_writer->filename = $this->filename;
-					if (($success = $vorbiscomment_writer->DeleteVorbisComment()) === false) {
-						$this->errors[] = 'DeleteVorbisComment() failed with message(s):<PRE><UL><LI>'.trim(implode('</LI><LI>', $vorbiscomment_writer->errors)).'</LI></UL></PRE>';
-					}
-					break;
-
-				case 'metaflac':
-					$metaflac_writer = new getid3_write_metaflac;
-					$metaflac_writer->filename = $this->filename;
-					if (($success = $metaflac_writer->DeleteMetaFLAC()) === false) {
-						$this->errors[] = 'DeleteMetaFLAC() failed with message(s):<PRE><UL><LI>'.trim(implode('</LI><LI>', $metaflac_writer->errors)).'</LI></UL></PRE>';
-					}
-					break;
-
-				case 'lyrics3':
-					$lyrics3_writer = new getid3_write_lyrics3;
-					$lyrics3_writer->filename = $this->filename;
-					if (($success = $lyrics3_writer->DeleteLyrics3()) === false) {
-						$this->errors[] = 'DeleteLyrics3() failed with message(s):<PRE><UL><LI>'.trim(implode('</LI><LI>', $lyrics3_writer->errors)).'</LI></UL></PRE>';
-					}
-					break;
-
-				case 'real':
-					$real_writer = new getid3_write_real;
-					$real_writer->filename = $this->filename;
-					if (($success = $real_writer->RemoveReal()) === false) {
-						$this->errors[] = 'RemoveReal() failed with message(s):<PRE><UL><LI>'.trim(implode('</LI><LI>', $real_writer->errors)).'</LI></UL></PRE>';
-					}
-					break;
-
-				default:
-					$this->errors[] = 'Invalid tag format to delete: "'.$tagformat.'"';
-					return false;
-					break;
-			}
-			if (!$success) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-
-	function MergeExistingTagData($TagFormat, &$tag_data) {
-		// Merge supplied data with existing data, if requested
-		if ($this->overwrite_tags) {
-			// do nothing - ignore previous data
-		} else {
-throw new Exception('$this->overwrite_tags=false is known to be buggy in this version of getID3. Will be fixed in the near future, check www.getid3.org for a newer version.');
-			if (!isset($this->ThisFileInfo['tags'][$TagFormat])) {
-				return false;
-			}
-			$tag_data = array_merge_recursive($tag_data, $this->ThisFileInfo['tags'][$TagFormat]);
-		}
-		return true;
-	}
-
-	function FormatDataForAPE() {
-		$ape_tag_data = array();
-		foreach ($this->tag_data as $tag_key => $valuearray) {
-			switch ($tag_key) {
-				case 'ATTACHED_PICTURE':
-					// ATTACHED_PICTURE is ID3v2 only - ignore
-					$this->warnings[] = '$data['.$tag_key.'] is assumed to be ID3v2 APIC data - NOT written to APE tag';
-					break;
-
-				default:
-					foreach ($valuearray as $key => $value) {
-						if (is_string($value) || is_numeric($value)) {
-							$ape_tag_data[$tag_key][$key] = getid3_lib::iconv_fallback($this->tag_encoding, 'UTF-8', $value);
-						} else {
-							$this->warnings[] = '$data['.$tag_key.']['.$key.'] is not a string value - all of $data['.$tag_key.'] NOT written to APE tag';
-							unset($ape_tag_data[$tag_key]);
-							break;
-						}
-					}
-					break;
-			}
-		}
-		$this->MergeExistingTagData('ape', $ape_tag_data);
-		return $ape_tag_data;
-	}
-
-
-	function FormatDataForID3v1() {
-		$tag_data_id3v1['genreid'] = 255;
-		if (!empty($this->tag_data['GENRE'])) {
-			foreach ($this->tag_data['GENRE'] as $key => $value) {
-				if (getid3_id3v1::LookupGenreID($value) !== false) {
-					$tag_data_id3v1['genreid'] = getid3_id3v1::LookupGenreID($value);
-					break;
-				}
-			}
-		}
-		$tag_data_id3v1['title']   =        getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['TITLE']      ) ? $this->tag_data['TITLE']       : array())));
-		$tag_data_id3v1['artist']  =        getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['ARTIST']     ) ? $this->tag_data['ARTIST']      : array())));
-		$tag_data_id3v1['album']   =        getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['ALBUM']      ) ? $this->tag_data['ALBUM']       : array())));
-		$tag_data_id3v1['year']    =        getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['YEAR']       ) ? $this->tag_data['YEAR']        : array())));
-		$tag_data_id3v1['comment'] =        getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['COMMENT']    ) ? $this->tag_data['COMMENT']     : array())));
-		$tag_data_id3v1['track']   = intval(getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['TRACKNUMBER']) ? $this->tag_data['TRACKNUMBER'] : array()))));
-		if ($tag_data_id3v1['track'] <= 0) {
-			$tag_data_id3v1['track'] = '';
-		}
-
-		$this->MergeExistingTagData('id3v1', $tag_data_id3v1);
-		return $tag_data_id3v1;
-	}
-
-	function FormatDataForID3v2($id3v2_majorversion) {
-		$tag_data_id3v2 = array();
-
-		$ID3v2_text_encoding_lookup[2] = array('ISO-8859-1'=>0, 'UTF-16'=>1);
-		$ID3v2_text_encoding_lookup[3] = array('ISO-8859-1'=>0, 'UTF-16'=>1);
-		$ID3v2_text_encoding_lookup[4] = array('ISO-8859-1'=>0, 'UTF-16'=>1, 'UTF-16BE'=>2, 'UTF-8'=>3);
-		foreach ($this->tag_data as $tag_key => $valuearray) {
-			$ID3v2_framename = getid3_write_id3v2::ID3v2ShortFrameNameLookup($id3v2_majorversion, $tag_key);
-			switch ($ID3v2_framename) {
-				case 'APIC':
-					foreach ($valuearray as $key => $apic_data_array) {
-						if (isset($apic_data_array['data']) &&
-							isset($apic_data_array['picturetypeid']) &&
-							isset($apic_data_array['description']) &&
-							isset($apic_data_array['mime'])) {
-								$tag_data_id3v2['APIC'][] = $apic_data_array;
-						} else {
-							$this->errors[] = 'ID3v2 APIC data is not properly structured';
-							return false;
-						}
-					}
-					break;
-
-				case '':
-					$this->errors[] = 'ID3v2: Skipping "'.$tag_key.'" because cannot match it to a known ID3v2 frame type';
-					// some other data type, don't know how to handle it, ignore it
-					break;
-
-				default:
-					// most other (text) frames can be copied over as-is
-					foreach ($valuearray as $key => $value) {
-						if (isset($ID3v2_text_encoding_lookup[$id3v2_majorversion][$this->tag_encoding])) {
-							// source encoding is valid in ID3v2 - use it with no conversion
-							$tag_data_id3v2[$ID3v2_framename][$key]['encodingid'] = $ID3v2_text_encoding_lookup[$id3v2_majorversion][$this->tag_encoding];
-							$tag_data_id3v2[$ID3v2_framename][$key]['data']       = $value;
-						} else {
-							// source encoding is NOT valid in ID3v2 - convert it to an ID3v2-valid encoding first
-							if ($id3v2_majorversion < 4) {
-								// convert data from other encoding to UTF-16 (with BOM)
-								// note: some software, notably Windows Media Player and iTunes are broken and treat files tagged with UTF-16BE (with BOM) as corrupt
-								// therefore we force data to UTF-16LE and manually prepend the BOM
-								$ID3v2_tag_data_converted = false;
-								if (!$ID3v2_tag_data_converted && ($this->tag_encoding == 'ISO-8859-1')) {
-									// great, leave data as-is for minimum compatability problems
-									$tag_data_id3v2[$ID3v2_framename][$key]['encodingid'] = 0;
-									$tag_data_id3v2[$ID3v2_framename][$key]['data']       = $value;
-									$ID3v2_tag_data_converted = true;
-								}
-								if (!$ID3v2_tag_data_converted && ($this->tag_encoding == 'UTF-8')) {
-									do {
-										// if UTF-8 string does not include any characters above chr(127) then it is identical to ISO-8859-1
-										for ($i = 0; $i < strlen($value); $i++) {
-											if (ord($value{$i}) > 127) {
-												break 2;
-											}
-										}
-										$tag_data_id3v2[$ID3v2_framename][$key]['encodingid'] = 0;
-										$tag_data_id3v2[$ID3v2_framename][$key]['data']       = $value;
-										$ID3v2_tag_data_converted = true;
-									} while (false);
-								}
-								if (!$ID3v2_tag_data_converted) {
-									$tag_data_id3v2[$ID3v2_framename][$key]['encodingid'] = 1;
-									//$tag_data_id3v2[$ID3v2_framename][$key]['data']       = getid3_lib::iconv_fallback($this->tag_encoding, 'UTF-16', $value); // output is UTF-16LE+BOM or UTF-16BE+BOM depending on system architecture
-									$tag_data_id3v2[$ID3v2_framename][$key]['data']       = "\xFF\xFE".getid3_lib::iconv_fallback($this->tag_encoding, 'UTF-16LE', $value); // force LittleEndian order version of UTF-16
-									$ID3v2_tag_data_converted = true;
-								}
-
-							} else {
-								// convert data from other encoding to UTF-8
-								$tag_data_id3v2[$ID3v2_framename][$key]['encodingid'] = 3;
-								$tag_data_id3v2[$ID3v2_framename][$key]['data']       = getid3_lib::iconv_fallback($this->tag_encoding, 'UTF-8', $value);
-							}
-						}
-
-						// These values are not needed for all frame types, but if they're not used no matter
-						$tag_data_id3v2[$ID3v2_framename][$key]['description'] = '';
-						$tag_data_id3v2[$ID3v2_framename][$key]['language']    = $this->id3v2_tag_language;
-					}
-					break;
-			}
-		}
-		$this->MergeExistingTagData('id3v2', $tag_data_id3v2);
-		return $tag_data_id3v2;
-	}
-
-	function FormatDataForVorbisComment() {
-		$tag_data_vorbiscomment = $this->tag_data;
-
-		// check for multi-line comment values - split out to multiple comments if neccesary
-		// and convert data to UTF-8 strings
-		foreach ($tag_data_vorbiscomment as $tag_key => $valuearray) {
-			foreach ($valuearray as $key => $value) {
-				str_replace("\r", "\n", $value);
-				if (strstr($value, "\n")) {
-					unset($tag_data_vorbiscomment[$tag_key][$key]);
-					$multilineexploded = explode("\n", $value);
-					foreach ($multilineexploded as $newcomment) {
-						if (strlen(trim($newcomment)) > 0) {
-							$tag_data_vorbiscomment[$tag_key][] = getid3_lib::iconv_fallback($this->tag_encoding, 'UTF-8', $newcomment);
-						}
-					}
-				} elseif (is_string($value) || is_numeric($value)) {
-					$tag_data_vorbiscomment[$tag_key][$key] = getid3_lib::iconv_fallback($this->tag_encoding, 'UTF-8', $value);
-				} else {
-					$this->warnings[] = '$data['.$tag_key.']['.$key.'] is not a string value - all of $data['.$tag_key.'] NOT written to VorbisComment tag';
-					unset($tag_data_vorbiscomment[$tag_key]);
-					break;
-				}
-			}
-		}
-		$this->MergeExistingTagData('vorbiscomment', $tag_data_vorbiscomment);
-		return $tag_data_vorbiscomment;
-	}
-
-	function FormatDataForMetaFLAC() {
-		// FLAC & OggFLAC use VorbisComments same as OggVorbis
-		// but require metaflac to do the writing rather than vorbiscomment
-		return $this->FormatDataForVorbisComment();
-	}
-
-	function FormatDataForReal() {
-		$tag_data_real['title']     = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['TITLE']    ) ? $this->tag_data['TITLE']     : array())));
-		$tag_data_real['artist']    = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['ARTIST']   ) ? $this->tag_data['ARTIST']    : array())));
-		$tag_data_real['copyright'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['COPYRIGHT']) ? $this->tag_data['COPYRIGHT'] : array())));
-		$tag_data_real['comment']   = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['COMMENT']  ) ? $this->tag_data['COMMENT']   : array())));
-
-		$this->MergeExistingTagData('real', $tag_data_real);
-		return $tag_data_real;
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/write.real.php b/lib/getid3/getid3/write.real.php
deleted file mode 100644
index ad37e74ad..000000000
--- a/lib/getid3/getid3/write.real.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// write.real.php                                              //
-// module for writing RealAudio/RealVideo tags                 //
-// dependencies: module.tag.real.php                           //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-class getid3_write_real
-{
-	var $filename;
-	var $tag_data          = array();
-	var $fread_buffer_size = 32768;   // read buffer size in bytes
-	var $warnings          = array(); // any non-critical errors will be stored here
-	var $errors            = array(); // any critical errors will be stored here
-	var $paddedlength      = 512;     // minimum length of CONT tag in bytes
-
-	function getid3_write_real() {
-		return true;
-	}
-
-	function WriteReal() {
-		// File MUST be writeable - CHMOD(646) at least
-		if (is_writeable($this->filename) && is_file($this->filename) && ($fp_source = fopen($this->filename, 'r+b'))) {
-
-			// Initialize getID3 engine
-			$getID3 = new getID3;
-			$OldThisFileInfo = $getID3->analyze($this->filename);
-			if (empty($OldThisFileInfo['real']['chunks']) && !empty($OldThisFileInfo['real']['old_ra_header'])) {
-				$this->errors[] = 'Cannot write Real tags on old-style file format';
-				fclose($fp_source);
-				return false;
-			}
-
-			if (empty($OldThisFileInfo['real']['chunks'])) {
-				$this->errors[] = 'Cannot write Real tags because cannot find DATA chunk in file';
-				fclose($fp_source);
-				return false;
-			}
-			foreach ($OldThisFileInfo['real']['chunks'] as $chunknumber => $chunkarray) {
-				$oldChunkInfo[$chunkarray['name']] = $chunkarray;
-			}
-			if (!empty($oldChunkInfo['CONT']['length'])) {
-				$this->paddedlength = max($oldChunkInfo['CONT']['length'], $this->paddedlength);
-			}
-
-			$new_CONT_tag_data = $this->GenerateCONTchunk();
-			$new_PROP_tag_data = $this->GeneratePROPchunk($OldThisFileInfo['real']['chunks'], $new_CONT_tag_data);
-			$new__RMF_tag_data = $this->GenerateRMFchunk($OldThisFileInfo['real']['chunks']);
-
-			if (isset($oldChunkInfo['.RMF']['length']) && ($oldChunkInfo['.RMF']['length'] == strlen($new__RMF_tag_data))) {
-				fseek($fp_source, $oldChunkInfo['.RMF']['offset'], SEEK_SET);
-				fwrite($fp_source, $new__RMF_tag_data);
-			} else {
-				$this->errors[] = 'new .RMF tag ('.strlen($new__RMF_tag_data).' bytes) different length than old .RMF tag ('.$oldChunkInfo['.RMF']['length'].' bytes)';
-				fclose($fp_source);
-				return false;
-			}
-
-			if (isset($oldChunkInfo['PROP']['length']) && ($oldChunkInfo['PROP']['length'] == strlen($new_PROP_tag_data))) {
-				fseek($fp_source, $oldChunkInfo['PROP']['offset'], SEEK_SET);
-				fwrite($fp_source, $new_PROP_tag_data);
-			} else {
-				$this->errors[] = 'new PROP tag ('.strlen($new_PROP_tag_data).' bytes) different length than old PROP tag ('.$oldChunkInfo['PROP']['length'].' bytes)';
-				fclose($fp_source);
-				return false;
-			}
-
-			if (isset($oldChunkInfo['CONT']['length']) && ($oldChunkInfo['CONT']['length'] == strlen($new_CONT_tag_data))) {
-
-				// new data length is same as old data length - just overwrite
-				fseek($fp_source, $oldChunkInfo['CONT']['offset'], SEEK_SET);
-				fwrite($fp_source, $new_CONT_tag_data);
-				fclose($fp_source);
-				return true;
-
-			} else {
-
-				if (empty($oldChunkInfo['CONT'])) {
-					// no existing CONT chunk
-					$BeforeOffset = $oldChunkInfo['DATA']['offset'];
-					$AfterOffset  = $oldChunkInfo['DATA']['offset'];
-				} else {
-					// new data is longer than old data
-					$BeforeOffset = $oldChunkInfo['CONT']['offset'];
-					$AfterOffset  = $oldChunkInfo['CONT']['offset'] + $oldChunkInfo['CONT']['length'];
-				}
-				if ($tempfilename = tempnam(GETID3_TEMP_DIR, 'getID3')) {
-					if (is_writable($tempfilename) && is_file($tempfilename) && ($fp_temp = fopen($tempfilename, 'wb'))) {
-
-						rewind($fp_source);
-						fwrite($fp_temp, fread($fp_source, $BeforeOffset));
-						fwrite($fp_temp, $new_CONT_tag_data);
-						fseek($fp_source, $AfterOffset, SEEK_SET);
-						while ($buffer = fread($fp_source, $this->fread_buffer_size)) {
-							fwrite($fp_temp, $buffer, strlen($buffer));
-						}
-						fclose($fp_temp);
-
-						if (copy($tempfilename, $this->filename)) {
-							unlink($tempfilename);
-							fclose($fp_source);
-							return true;
-						}
-						unlink($tempfilename);
-						$this->errors[] = 'FAILED: copy('.$tempfilename.', '.$this->filename.')';
-
-					} else {
-						$this->errors[] = 'Could not fopen("'.$tempfilename.'", "wb")';
-					}
-				}
-				fclose($fp_source);
-				return false;
-
-			}
-
-		}
-		$this->errors[] = 'Could not fopen("'.$this->filename.'", "r+b")';
-		return false;
-	}
-
-	function GenerateRMFchunk(&$chunks) {
-		$oldCONTexists = false;
-		foreach ($chunks as $key => $chunk) {
-			$chunkNameKeys[$chunk['name']] = $key;
-			if ($chunk['name'] == 'CONT') {
-				$oldCONTexists = true;
-			}
-		}
-		$newHeadersCount = $chunks[$chunkNameKeys['.RMF']]['headers_count'] + ($oldCONTexists ? 0 : 1);
-
-		$RMFchunk  = "\x00\x00"; // object version
-		$RMFchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['.RMF']]['file_version'], 4);
-		$RMFchunk .= getid3_lib::BigEndian2String($newHeadersCount,                                4);
-
-		$RMFchunk  = '.RMF'.getid3_lib::BigEndian2String(strlen($RMFchunk) + 8, 4).$RMFchunk; // .RMF chunk identifier + chunk length
-		return $RMFchunk;
-	}
-
-	function GeneratePROPchunk(&$chunks, &$new_CONT_tag_data) {
-		$old_CONT_length = 0;
-		$old_DATA_offset = 0;
-		$old_INDX_offset = 0;
-		foreach ($chunks as $key => $chunk) {
-			$chunkNameKeys[$chunk['name']] = $key;
-			if ($chunk['name'] == 'CONT') {
-				$old_CONT_length = $chunk['length'];
-			} elseif ($chunk['name'] == 'DATA') {
-				if (!$old_DATA_offset) {
-					$old_DATA_offset = $chunk['offset'];
-				}
-			} elseif ($chunk['name'] == 'INDX') {
-				if (!$old_INDX_offset) {
-					$old_INDX_offset = $chunk['offset'];
-				}
-			}
-		}
-		$CONTdelta = strlen($new_CONT_tag_data) - $old_CONT_length;
-
-		$PROPchunk  = "\x00\x00"; // object version
-		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['max_bit_rate'],    4);
-		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['avg_bit_rate'],    4);
-		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['max_packet_size'], 4);
-		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['avg_packet_size'], 4);
-		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['num_packets'],     4);
-		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['duration'],        4);
-		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['preroll'],         4);
-		$PROPchunk .= getid3_lib::BigEndian2String(max(0, $old_INDX_offset + $CONTdelta),              4);
-		$PROPchunk .= getid3_lib::BigEndian2String(max(0, $old_DATA_offset + $CONTdelta),              4);
-		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['num_streams'],     2);
-		$PROPchunk .= getid3_lib::BigEndian2String($chunks[$chunkNameKeys['PROP']]['flags_raw'],       2);
-
-		$PROPchunk  = 'PROP'.getid3_lib::BigEndian2String(strlen($PROPchunk) + 8, 4).$PROPchunk; // PROP chunk identifier + chunk length
-		return $PROPchunk;
-	}
-
-	function GenerateCONTchunk() {
-		foreach ($this->tag_data as $key => $value) {
-			// limit each value to 0xFFFF bytes
-			$this->tag_data[$key] = substr($value, 0, 65535);
-		}
-
-		$CONTchunk  = "\x00\x00"; // object version
-
-		$CONTchunk .= getid3_lib::BigEndian2String((!empty($this->tag_data['title'])     ? strlen($this->tag_data['title'])     : 0), 2);
-		$CONTchunk .= (!empty($this->tag_data['title'])     ? strlen($this->tag_data['title'])     : '');
-
-		$CONTchunk .= getid3_lib::BigEndian2String((!empty($this->tag_data['artist'])    ? strlen($this->tag_data['artist'])    : 0), 2);
-		$CONTchunk .= (!empty($this->tag_data['artist'])    ? strlen($this->tag_data['artist'])    : '');
-
-		$CONTchunk .= getid3_lib::BigEndian2String((!empty($this->tag_data['copyright']) ? strlen($this->tag_data['copyright']) : 0), 2);
-		$CONTchunk .= (!empty($this->tag_data['copyright']) ? strlen($this->tag_data['copyright']) : '');
-
-		$CONTchunk .= getid3_lib::BigEndian2String((!empty($this->tag_data['comment'])   ? strlen($this->tag_data['comment'])   : 0), 2);
-		$CONTchunk .= (!empty($this->tag_data['comment'])   ? strlen($this->tag_data['comment'])   : '');
-
-		if ($this->paddedlength > (strlen($CONTchunk) + 8)) {
-			$CONTchunk .= str_repeat("\x00", $this->paddedlength - strlen($CONTchunk) - 8);
-		}
-
-		$CONTchunk  = 'CONT'.getid3_lib::BigEndian2String(strlen($CONTchunk) + 8, 4).$CONTchunk; // CONT chunk identifier + chunk length
-
-		return $CONTchunk;
-	}
-
-	function RemoveReal() {
-		// File MUST be writeable - CHMOD(646) at least
-		if (is_writeable($this->filename) && is_file($this->filename) && ($fp_source = fopen($this->filename, 'r+b'))) {
-
-			// Initialize getID3 engine
-			$getID3 = new getID3;
-			$OldThisFileInfo = $getID3->analyze($this->filename);
-			if (empty($OldThisFileInfo['real']['chunks']) && !empty($OldThisFileInfo['real']['old_ra_header'])) {
-				$this->errors[] = 'Cannot remove Real tags from old-style file format';
-				fclose($fp_source);
-				return false;
-			}
-
-			if (empty($OldThisFileInfo['real']['chunks'])) {
-				$this->errors[] = 'Cannot remove Real tags because cannot find DATA chunk in file';
-				fclose($fp_source);
-				return false;
-			}
-			foreach ($OldThisFileInfo['real']['chunks'] as $chunknumber => $chunkarray) {
-				$oldChunkInfo[$chunkarray['name']] = $chunkarray;
-			}
-
-			if (empty($oldChunkInfo['CONT'])) {
-				// no existing CONT chunk
-				fclose($fp_source);
-				return true;
-			}
-
-			$BeforeOffset = $oldChunkInfo['CONT']['offset'];
-			$AfterOffset  = $oldChunkInfo['CONT']['offset'] + $oldChunkInfo['CONT']['length'];
-			if ($tempfilename = tempnam(GETID3_TEMP_DIR, 'getID3')) {
-				if (is_writable($tempfilename) && is_file($tempfilename) && ($fp_temp = fopen($tempfilename, 'wb'))) {
-
-					rewind($fp_source);
-					fwrite($fp_temp, fread($fp_source, $BeforeOffset));
-					fseek($fp_source, $AfterOffset, SEEK_SET);
-					while ($buffer = fread($fp_source, $this->fread_buffer_size)) {
-						fwrite($fp_temp, $buffer, strlen($buffer));
-					}
-					fclose($fp_temp);
-
-					if (copy($tempfilename, $this->filename)) {
-						unlink($tempfilename);
-						fclose($fp_source);
-						return true;
-					}
-					unlink($tempfilename);
-					$this->errors[] = 'FAILED: copy('.$tempfilename.', '.$this->filename.')';
-
-				} else {
-					$this->errors[] = 'Could not fopen("'.$tempfilename.'", "wb")';
-				}
-			}
-			fclose($fp_source);
-			return false;
-		}
-		$this->errors[] = 'Could not fopen("'.$this->filename.'", "r+b")';
-		return false;
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/getid3/write.vorbiscomment.php b/lib/getid3/getid3/write.vorbiscomment.php
deleted file mode 100644
index ac8dc6934..000000000
--- a/lib/getid3/getid3/write.vorbiscomment.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-// See readme.txt for more details                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// write.vorbiscomment.php                                     //
-// module for writing VorbisComment tags                       //
-// dependencies: /helperapps/vorbiscomment.exe                 //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_write_vorbiscomment
-{
-
-	var $filename;
-	var $tag_data;
-	var $warnings = array(); // any non-critical errors will be stored here
-	var $errors   = array(); // any critical errors will be stored here
-
-	function getid3_write_vorbiscomment() {
-		return true;
-	}
-
-	function WriteVorbisComment() {
-
-		if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
-			$this->errors[] = 'PHP running in Safe Mode (backtick operator not available) - cannot call vorbiscomment, tags not written';
-			return false;
-		}
-
-		// Create file with new comments
-		$tempcommentsfilename = tempnam(GETID3_TEMP_DIR, 'getID3');
-		if (is_writable($tempcommentsfilename) && is_file($tempcommentsfilename) && ($fpcomments = fopen($tempcommentsfilename, 'wb'))) {
-
-			foreach ($this->tag_data as $key => $value) {
-				foreach ($value as $commentdata) {
-					fwrite($fpcomments, $this->CleanVorbisCommentName($key).'='.$commentdata."\n");
-				}
-			}
-			fclose($fpcomments);
-
-		} else {
-			$this->errors[] = 'failed to open temporary tags file "'.$tempcommentsfilename.'", tags not written';
-			return false;
-		}
-
-		$oldignoreuserabort = ignore_user_abort(true);
-		if (GETID3_OS_ISWINDOWS) {
-
-			if (file_exists(GETID3_HELPERAPPSDIR.'vorbiscomment.exe')) {
-				//$commandline = '"'.GETID3_HELPERAPPSDIR.'vorbiscomment.exe" -w --raw -c "'.$tempcommentsfilename.'" "'.str_replace('/', '\\', $this->filename).'"';
-				//  vorbiscomment works fine if you copy-paste the above commandline into a command prompt,
-				//  but refuses to work with `backtick` if there are "doublequotes" present around BOTH
-				//  the metaflac pathname and the target filename. For whatever reason...??
-				//  The solution is simply ensure that the metaflac pathname has no spaces,
-				//  and therefore does not need to be quoted
-
-				// On top of that, if error messages are not always captured properly under Windows
-				// To at least see if there was a problem, compare file modification timestamps before and after writing
-				clearstatcache();
-				$timestampbeforewriting = filemtime($this->filename);
-
-				$commandline = GETID3_HELPERAPPSDIR.'vorbiscomment.exe -w --raw -c "'.$tempcommentsfilename.'" "'.$this->filename.'" 2>&1';
-				$VorbiscommentError = `$commandline`;
-
-				if (empty($VorbiscommentError)) {
-					clearstatcache();
-					if ($timestampbeforewriting == filemtime($this->filename)) {
-						$VorbiscommentError = 'File modification timestamp has not changed - it looks like the tags were not written';
-					}
-				}
-			} else {
-				$VorbiscommentError = 'vorbiscomment.exe not found in '.GETID3_HELPERAPPSDIR;
-			}
-
-		} else {
-
-			$commandline = 'vorbiscomment -w --raw -c "'.$tempcommentsfilename.'" "'.$this->filename.'" 2>&1';
-			$VorbiscommentError = `$commandline`;
-
-		}
-
-		// Remove temporary comments file
-		unlink($tempcommentsfilename);
-		ignore_user_abort($oldignoreuserabort);
-
-		if (!empty($VorbiscommentError)) {
-
-			$this->errors[] = 'system call to vorbiscomment failed with message: '."\n\n".$VorbiscommentError;
-			return false;
-
-		}
-
-		return true;
-	}
-
-	function DeleteVorbisComment() {
-		$this->tag_data = array(array());
-		return $this->WriteVorbisComment();
-	}
-
-	function CleanVorbisCommentName($originalcommentname) {
-		// A case-insensitive field name that may consist of ASCII 0x20 through 0x7D, 0x3D ('=') excluded.
-		// ASCII 0x41 through 0x5A inclusive (A-Z) is to be considered equivalent to ASCII 0x61 through
-		// 0x7A inclusive (a-z).
-
-		// replace invalid chars with a space, return uppercase text
-		// Thanks Chris Bolt <chris-getid3�bolt*cx> for improving this function
-		// note: *reg_replace() replaces nulls with empty string (not space)
-		return strtoupper(preg_replace('#[^ -<>-}]#', ' ', str_replace("\x00", ' ', $originalcommentname)));
-
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/getid3/license.commercial.txt b/lib/getid3/license.commercial.txt
deleted file mode 100644
index 416e5a146..000000000
--- a/lib/getid3/license.commercial.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-                  getID3() Commercial License
-                  ===========================
-
-getID3() is licensed under the "GNU Public License" (GPL) and/or the
-"getID3() Commercial License" (gCL). This document describes the gCL.
-
----------------------------------------------------------------------
-
-The license is non-exclusively granted to a single person or company,
-per payment of the license fee, for the lifetime of that person or
-company. The license is non-transferrable.
-
-The gCL grants the licensee the right to use getID3() in commercial
-closed-source projects. Modifications may be made to getID3() with no
-obligation to release the modified source code. getID3() (or pieces
-thereof) may be included in any number of projects authored (in whole
-or in part) by the licensee.
-
-The licensee may use any version of getID3(), past, present or future,
-as is most convenient. This license does not entitle the licensee to
-receive any technical support, updates or bugfixes, except as such are
-made publicly available to all getID3() users.
-
-The licensee may not sub-license getID3() itself, meaning that any
-commercially released product containing all or parts of getID3() must
-have added functionality beyond what is available in getID3();
-getID3() itself may not be re-licensed by the licensee.
diff --git a/lib/getid3/license.txt b/lib/getid3/license.txt
deleted file mode 100644
index 9fec80829..000000000
--- a/lib/getid3/license.txt
+++ /dev/null
@@ -1,340 +0,0 @@
-            GNU GENERAL PUBLIC LICENSE
-               Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-              59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-            GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-             END OF TERMS AND CONDITIONS
-
-        How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

From e07556c62d3421d73ae5961545f1efb46f00dc9f Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 10 Mar 2017 18:20:03 +0000
Subject: [PATCH 234/250] make sure video isn't bigger than container + linting

---
 ext/handle_video/theme.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/ext/handle_video/theme.php b/ext/handle_video/theme.php
index 171582d5e..e8b7008ff 100644
--- a/ext/handle_video/theme.php
+++ b/ext/handle_video/theme.php
@@ -41,18 +41,15 @@ public function display_image(Page $page, Image $image) {
 				//FLV doesn't support <video>.
 				$html .= $html_fallback;
 			} else {
-				$html .= "
-					<video controls class='shm-main-image' id='main_image' alt='main image'"
-						. ($autoplay ? ' autoplay' : '')
-						. ($loop ? ' loop' : '')
-						. " data-width='{$image->width}' "
-						. " data-height='{$image->height}'>
+				$autoplay = ($autoplay ? ' autoplay' : '');
+				$loop     = ($loop ? ' loop' : '');
 
+				$html .= "
+					<video controls class='shm-main-image' id='main_image' alt='main image' {$autoplay} {$loop} style='max-width: 100%'>
 						<source src='{$ilink}' type='{$supportedExts[$ext]}'>
 
 						<!-- If browser doesn't support filetype, fallback to flash -->
 						{$html_fallback}
-
 					</video>";
 			}
 

From 6fc3d510146f7ccfde863c87102ba526772513d6 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 10 Mar 2017 19:12:01 +0000
Subject: [PATCH 235/250] use HTML5 audio player, jsmediatags lib, default
 volume for audio/video

---
 ext/handle_mp3/lib/jsmediatags.min.js  |  75 +++++++++++++++++++++++++
 ext/handle_mp3/main.php                |   4 ++
 ext/handle_mp3/style.css               |  14 +++++
 ext/handle_mp3/theme.php               |  40 +++++++++----
 ext/handle_mp3/xspf_player_license.txt |  10 ----
 ext/handle_mp3/xspf_player_slim.swf    | Bin 56327 -> 0 bytes
 ext/handle_video/theme.php             |   4 +-
 7 files changed, 125 insertions(+), 22 deletions(-)
 create mode 100644 ext/handle_mp3/lib/jsmediatags.min.js
 create mode 100644 ext/handle_mp3/style.css
 delete mode 100644 ext/handle_mp3/xspf_player_license.txt
 delete mode 100644 ext/handle_mp3/xspf_player_slim.swf

diff --git a/ext/handle_mp3/lib/jsmediatags.min.js b/ext/handle_mp3/lib/jsmediatags.min.js
new file mode 100644
index 000000000..fcde0022c
--- /dev/null
+++ b/ext/handle_mp3/lib/jsmediatags.min.js
@@ -0,0 +1,75 @@
+(function(v){"object"===typeof exports&&"undefined"!==typeof module?module.exports=v():"function"===typeof define&&define.amd?define([],v):("undefined"!==typeof window?window:"undefined"!==typeof global?global:"undefined"!==typeof self?self:this).jsmediatags=v()})(function(){return function f(h,m,k){function l(b,a){if(!m[b]){if(!h[b]){var e="function"==typeof require&&require;if(!a&&e)return e(b,!0);if(d)return d(b,!0);e=Error("Cannot find module '"+b+"'");throw e.code="MODULE_NOT_FOUND",e;}e=m[b]=
+{exports:{}};h[b][0].call(e.exports,function(a){var e=h[b][1][a];return l(e?e:a)},e,e.exports,f,h,m,k)}return m[b].exports}for(var d="function"==typeof require&&require,c=0;c<k.length;c++)l(k[c]);return l}({1:[function(f,h,m){},{}],2:[function(f,h,m){h.exports=XMLHttpRequest},{}],3:[function(f,h,m){function k(d,c){if("function"!==typeof c&&null!==c)throw new TypeError("Super expression must either be null or a function, not "+typeof c);d.prototype=Object.create(c&&c.prototype,{constructor:{value:d,
+enumerable:!1,writable:!0,configurable:!0}});c&&(Object.setPrototypeOf?Object.setPrototypeOf(d,c):d.__proto__=c)}var l=function(){function d(c,b){for(var a=0;a<b.length;a++){var e=b[a];e.enumerable=e.enumerable||!1;e.configurable=!0;"value"in e&&(e.writable=!0);Object.defineProperty(c,e.key,e)}}return function(c,b,a){b&&d(c.prototype,b);a&&d(c,a);return c}}();f=function(d){function c(b){if(!(this instanceof c))throw new TypeError("Cannot call a class as a function");var a;a=Object.getPrototypeOf(c).call(this);
+if(!this)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");a=!a||"object"!==typeof a&&"function"!==typeof a?this:a;a._array=b;a._size=b.length;a._isInitialized=!0;return a}k(c,d);l(c,[{key:"init",value:function(b){setTimeout(b.onSuccess,0)}},{key:"loadRange",value:function(b,a){setTimeout(a.onSuccess,0)}},{key:"getByteAt",value:function(b){return this._array[b]}}],[{key:"canReadFile",value:function(b){return Array.isArray(b)||"function"===typeof Buffer&&Buffer.isBuffer(b)}}]);
+return c}(f("./MediaFileReader"));h.exports=f},{"./MediaFileReader":10}],4:[function(f,h,m){function k(c,b){if("function"!==typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);c.prototype=Object.create(b&&b.prototype,{constructor:{value:c,enumerable:!1,writable:!0,configurable:!0}});b&&(Object.setPrototypeOf?Object.setPrototypeOf(c,b):c.__proto__=b)}var l=function(){function c(b,a){for(var e=0;e<a.length;e++){var g=a[e];g.enumerable=g.enumerable||
+!1;g.configurable=!0;"value"in g&&(g.writable=!0);Object.defineProperty(b,g.key,g)}}return function(b,a,e){a&&c(b.prototype,a);e&&c(b,e);return b}}(),d=f("./ChunkedFileData");f=function(c){function b(a){if(!(this instanceof b))throw new TypeError("Cannot call a class as a function");var e;e=Object.getPrototypeOf(b).call(this);if(!this)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");e=!e||"object"!==typeof e&&"function"!==typeof e?this:e;e._blob=a;e._fileData=
+new d;return e}k(b,c);l(b,[{key:"_init",value:function(a){this._size=this._blob.size;setTimeout(a.onSuccess,1)}},{key:"loadRange",value:function(a,b){var g=this,c=(this._blob.slice||this._blob.mozSlice||this._blob.webkitSlice).call(this._blob,a[0],a[1]+1),d=new FileReader;d.onloadend=function(c){c=new Uint8Array(d.result);g._fileData.addData(a[0],c);b.onSuccess()};d.onerror=d.onabort=function(a){if(b.onError)b.onError({type:"blob",info:d.error})};d.readAsArrayBuffer(c)}},{key:"getByteAt",value:function(a){return this._fileData.getByteAt(a)}}],
+[{key:"canReadFile",value:function(a){return"undefined"!==typeof Blob&&a instanceof Blob||"undefined"!==typeof File&&a instanceof File}}]);return b}(f("./MediaFileReader"));h.exports=f},{"./ChunkedFileData":5,"./MediaFileReader":10}],5:[function(f,h,m){var k=function(){function f(d,c){for(var b=0;b<c.length;b++){var a=c[b];a.enumerable=a.enumerable||!1;a.configurable=!0;"value"in a&&(a.writable=!0);Object.defineProperty(d,a.key,a)}}return function(d,c,b){c&&f(d.prototype,c);b&&f(d,b);return d}}();
+f=function(){function f(){if(!(this instanceof f))throw new TypeError("Cannot call a class as a function");this._fileData=[]}k(f,null,[{key:"NOT_FOUND",get:function(){return-1}}]);k(f,[{key:"addData",value:function(d,c){var b=d+c.length-1,a=this._getChunkRange(d,b);if(-1===a.startIx)this._fileData.splice(a.insertIx||0,0,{offset:d,data:c});else{var e=this._fileData[a.startIx],g=this._fileData[a.endIx],b=b<g.offset+g.data.length-1,p={offset:Math.min(d,e.offset),data:c};d>e.offset&&(e=this._sliceData(e.data,
+0,d-e.offset),p.data=this._concatData(e,c));b&&(e=this._sliceData(p.data,0,g.offset-p.offset),p.data=this._concatData(e,g.data));this._fileData.splice(a.startIx,a.endIx-a.startIx+1,p)}}},{key:"_concatData",value:function(d,c){if("undefined"!==typeof ArrayBuffer&&ArrayBuffer.isView(d)){var b=new d.constructor(d.length+c.length);b.set(d,0);b.set(c,d.length);return b}return d.concat(c)}},{key:"_sliceData",value:function(d,c,b){return d.slice?d.slice(c,b):d.subarray(c,b)}},{key:"_getChunkRange",value:function(d,
+c){for(var b=-1,a=-1,e=0,g=0;g<this._fileData.length;g++,e=g){var p=this._fileData[g].offset,q=p+this._fileData[g].data.length;if(c<p-1)break;if(d<=q+1&&c>=p-1){b=g;break}}if(-1===b)return{startIx:-1,endIx:-1,insertIx:e};for(g=b;g<this._fileData.length&&!(p=this._fileData[g].offset,q=p+this._fileData[g].data.length,c>=p-1&&(a=g),c<=q+1);g++);-1===a&&(a=b);return{startIx:b,endIx:a}}},{key:"hasDataRange",value:function(d,c){for(var b=0;b<this._fileData.length;b++){var a=this._fileData[b];if(c<a.offset)break;
+if(d>=a.offset&&c<a.offset+a.data.length)return!0}return!1}},{key:"getByteAt",value:function(d){for(var c,b=0;b<this._fileData.length;b++){var a=this._fileData[b].offset,e=a+this._fileData[b].data.length-1;if(d>=a&&d<=e){c=this._fileData[b];break}}if(c)return c.data[d-c.offset];throw Error("Offset "+d+" hasn't been loaded yet.");}}]);return f}();h.exports=f},{}],6:[function(f,h,m){function k(c,b){if("function"!==typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+
+typeof b);c.prototype=Object.create(b&&b.prototype,{constructor:{value:c,enumerable:!1,writable:!0,configurable:!0}});b&&(Object.setPrototypeOf?Object.setPrototypeOf(c,b):c.__proto__=b)}var l=function(){function c(b,a){for(var e=0;e<a.length;e++){var g=a[e];g.enumerable=g.enumerable||!1;g.configurable=!0;"value"in g&&(g.writable=!0);Object.defineProperty(b,g.key,g)}}return function(b,a,e){a&&c(b.prototype,a);e&&c(b,e);return b}}();m=f("./MediaTagReader");f("./MediaFileReader");f=function(c){function b(){if(!(this instanceof
+b))throw new TypeError("Cannot call a class as a function");var a=Object.getPrototypeOf(b).apply(this,arguments);if(!this)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!a||"object"!==typeof a&&"function"!==typeof a?this:a}k(b,c);l(b,[{key:"_loadData",value:function(a,b){var g=a.getSize();a.loadRange([g-128,g-1],b)}},{key:"_parseData",value:function(a,b){var g=a.getSize()-128,c=a.getStringWithCharsetAt(g+3,30).toString(),q=a.getStringWithCharsetAt(g+33,
+30).toString(),r=a.getStringWithCharsetAt(g+63,30).toString(),f=a.getStringWithCharsetAt(g+93,4).toString(),u=a.getByteAt(g+97+28),n=a.getByteAt(g+97+29);if(0==u&&0!=n)var u="1.1",x=a.getStringWithCharsetAt(g+97,28).toString();else u="1.0",x=a.getStringWithCharsetAt(g+97,30).toString(),n=0;g=a.getByteAt(g+97+30);c={type:"ID3",version:u,tags:{title:c,artist:q,album:r,year:f,comment:x,genre:255>g?d[g]:""}};n&&(c.tags.track=n);return c}}],[{key:"getTagIdentifierByteRange",value:function(){return{offset:-128,
+length:128}}},{key:"canReadTagFormat",value:function(a){return"TAG"===String.fromCharCode.apply(String,a.slice(0,3))}}]);return b}(m);var d="Blues;Classic Rock;Country;Dance;Disco;Funk;Grunge;Hip-Hop;Jazz;Metal;New Age;Oldies;Other;Pop;R&B;Rap;Reggae;Rock;Techno;Industrial;Alternative;Ska;Death Metal;Pranks;Soundtrack;Euro-Techno;Ambient;Trip-Hop;Vocal;Jazz+Funk;Fusion;Trance;Classical;Instrumental;Acid;House;Game;Sound Clip;Gospel;Noise;AlternRock;Bass;Soul;Punk;Space;Meditative;Instrumental Pop;Instrumental Rock;Ethnic;Gothic;Darkwave;Techno-Industrial;Electronic;Pop-Folk;Eurodance;Dream;Southern Rock;Comedy;Cult;Gangsta;Top 40;Christian Rap;Pop/Funk;Jungle;Native American;Cabaret;New Wave;Psychadelic;Rave;Showtunes;Trailer;Lo-Fi;Tribal;Acid Punk;Acid Jazz;Polka;Retro;Musical;Rock & Roll;Hard Rock;Folk;Folk-Rock;National Folk;Swing;Fast Fusion;Bebob;Latin;Revival;Celtic;Bluegrass;Avantgarde;Gothic Rock;Progressive Rock;Psychedelic Rock;Symphonic Rock;Slow Rock;Big Band;Chorus;Easy Listening;Acoustic;Humour;Speech;Chanson;Opera;Chamber Music;Sonata;Symphony;Booty Bass;Primus;Porn Groove;Satire;Slow Jam;Club;Tango;Samba;Folklore;Ballad;Power Ballad;Rhythmic Soul;Freestyle;Duet;Punk Rock;Drum Solo;Acapella;Euro-House;Dance Hall".split(";");
+h.exports=f},{"./MediaFileReader":10,"./MediaTagReader":11}],7:[function(f,h,m){function k(b){var a;switch(b){case 0:a="iso-8859-1";break;case 1:a="utf-16";break;case 2:a="utf-16be";break;case 3:a="utf-8"}return a}function l(b,a,e,g){g=e.getStringWithCharsetAt(b+1,a-1,g);b=e.getStringWithCharsetAt(b+1+g.bytesReadCount,a-1-g.bytesReadCount);return{user_description:g.toString(),data:b.toString()}}f("./MediaFileReader");var d={APIC:function(b,a,e,g,p){p=p||"3";g=b;var d=k(e.getByteAt(b));switch(p){case "2":p=
+e.getStringAt(b+1,3);b+=4;break;case "3":case "4":p=e.getStringWithCharsetAt(b+1,a-1);b+=1+p.bytesReadCount;break;default:throw Error("Couldn't read ID3v2 major version.");}var r=e.getByteAt(b,1),r=c[r],d=e.getStringWithCharsetAt(b+1,a-(b-g)-1,d);b+=1+d.bytesReadCount;return{format:p.toString(),type:r,description:d.toString(),data:e.getBytesAt(b,g+a-b)}},COMM:function(b,a,e,g,c){var d=b,r=k(e.getByteAt(b));g=e.getStringAt(b+1,3);c=e.getStringWithCharsetAt(b+4,a-4,r);b+=4+c.bytesReadCount;b=e.getStringWithCharsetAt(b,
+d+a-b,r);return{language:g,short_description:c.toString(),text:b.toString()}}};d.COM=d.COMM;d.PIC=function(b,a,e,g,c){return d.APIC(b,a,e,g,"2")};d.PCNT=function(b,a,e,g,c){return e.getLongAt(b,!1)};d.CNT=d.PCNT;d["T*"]=function(b,a,e,g,c){g=k(e.getByteAt(b));return e.getStringWithCharsetAt(b+1,a-1,g).toString()};d.TXXX=function(b,a,e,g,c){g=k(e.getByteAt(b));return l(b,a,e,g)};d["W*"]=function(b,a,e,g,c){g=k(e.getByteAt(b));return void 0!==g?l(b,a,e,g):e.getStringWithCharsetAt(b,a,g).toString()};
+d.TCON=function(b,a,e,g){return d["T*"].apply(this,arguments).replace(/^\(\d+\)/,"")};d.TCO=d.TCON;d.USLT=function(b,a,e,g,c){var d=b,r=k(e.getByteAt(b));g=e.getStringAt(b+1,3);c=e.getStringWithCharsetAt(b+4,a-4,r);b+=4+c.bytesReadCount;b=e.getStringWithCharsetAt(b,d+a-b,r);return{language:g,descriptor:c.toString(),lyrics:b.toString()}};d.ULT=d.USLT;var c="Other;32x32 pixels 'file icon' (PNG only);Other file icon;Cover (front);Cover (back);Leaflet page;Media (e.g. label side of CD);Lead artist/lead performer/soloist;Artist/performer;Conductor;Band/Orchestra;Composer;Lyricist/text writer;Recording Location;During recording;During performance;Movie/video screen capture;A bright coloured fish;Illustration;Band/artist logotype;Publisher/Studio logotype".split(";");
+h.exports={getFrameReaderFunction:function(b){return b in d?d[b]:"T"===b[0]?d["T*"]:"W"===b[0]?d["W*"]:null}}},{"./MediaFileReader":10}],8:[function(f,h,m){function k(a,b){if("function"!==typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}});b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}var l=function(){function a(b,
+e){for(var c=0;c<e.length;c++){var d=e[c];d.enumerable=d.enumerable||!1;d.configurable=!0;"value"in d&&(d.writable=!0);Object.defineProperty(b,d.key,d)}}return function(b,c,d){c&&a(b.prototype,c);d&&a(b,d);return b}}();m=f("./MediaTagReader");f("./MediaFileReader");var d=f("./ArrayFileReader"),c=f("./ID3v2FrameReader");f=function(e){function g(){if(!(this instanceof g))throw new TypeError("Cannot call a class as a function");var a=Object.getPrototypeOf(g).apply(this,arguments);if(!this)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+return!a||"object"!==typeof a&&"function"!==typeof a?this:a}k(g,e);l(g,[{key:"_loadData",value:function(a,b){a.loadRange([6,9],{onSuccess:function(){a.loadRange([0,10+a.getSynchsafeInteger32At(6)-1],b)},onError:b.onError})}},{key:"_parseData",value:function(b,e){var c=0,g=b.getByteAt(c+3);if(4<g)return{type:"ID3",version:">2.4",tags:{}};var d=b.getByteAt(c+4),n=b.isBitSetAt(c+5,7),f=b.isBitSetAt(c+5,6),l=b.isBitSetAt(c+5,5),t=b.getSynchsafeInteger32At(c+6),c=c+10;if(f)var k=b.getLongAt(c,!0),c=c+
+(k+4);var g={type:"ID3",version:"2."+g+"."+d,major:g,revision:d,flags:{unsynchronisation:n,extended_header:f,experimental_indicator:l,footer_present:!1},size:t,tags:{}},c=this._readFrames(c,t+10,b,g,e),h;for(h in a)a.hasOwnProperty(h)&&(t=this._getFrameData(c,a[h]))&&(g.tags[h]=t);for(var m in c)c.hasOwnProperty(m)&&(g.tags[m]=c[m]);return g}},{key:"_getUnsyncFileReader",value:function(a,b,c){a=a.getBytesAt(b,c);for(b=0;b<a.length-1;b++)255===a[b]&&0===a[b+1]&&a.splice(b+1,1);return new d(a)}},{key:"_readFrames",
+value:function(a,b,e,g,d){var n={};for(d&&(d=this._expandShortcutTags(d));a<b;){var f=this._readFrameHeader(e,a,g),l=f.id;if(!l)break;var t=f.flags,h=f.size,k=a+f.headerSize,m=e;a+=f.headerSize+f.size;if(!d||-1!==d.indexOf(l)){if(g.flags.unsynchronisation||t&&t.format.unsynchronisation)m=this._getUnsyncFileReader(m,k,h),k=0,h=m.getSize();t&&t.format.data_length_indicator&&(k+=4,h-=4);t=(f=c.getFrameReaderFunction(l))?f(k,h,m,t):null;k=this._getFrameDescription(l);h={id:l,size:h,description:k,data:t};
+l in n?(n[l].id&&(n[l]=[n[l]]),n[l].push(h)):n[l]=h}}return n}},{key:"_readFrameHeader",value:function(a,b,c){c=c.major;var e=null;switch(c){case 2:var g=a.getStringAt(b,3),d=a.getInteger24At(b+3,!0),f=6;break;case 3:g=a.getStringAt(b,4);d=a.getLongAt(b+4,!0);f=10;break;case 4:g=a.getStringAt(b,4),d=a.getSynchsafeInteger32At(b+4),f=10}if(g==String.fromCharCode(0,0,0)||g==String.fromCharCode(0,0,0,0))g="";g&&2<c&&(e=this._readFrameFlags(a,b+8));return{id:g||"",size:d||0,headerSize:f||0,flags:e}}},
+{key:"_readFrameFlags",value:function(a,b){return{message:{tag_alter_preservation:a.isBitSetAt(b,6),file_alter_preservation:a.isBitSetAt(b,5),read_only:a.isBitSetAt(b,4)},format:{grouping_identity:a.isBitSetAt(b+1,7),compression:a.isBitSetAt(b+1,3),encryption:a.isBitSetAt(b+1,2),unsynchronisation:a.isBitSetAt(b+1,1),data_length_indicator:a.isBitSetAt(b+1,0)}}}},{key:"_getFrameData",value:function(a,b){for(var c=0,e;e=b[c];c++)if(e in a)return a[e].data}},{key:"_getFrameDescription",value:function(a){return a in
+b?b[a]:"Unknown"}},{key:"getShortcuts",value:function(){return a}}],[{key:"getTagIdentifierByteRange",value:function(){return{offset:0,length:10}}},{key:"canReadTagFormat",value:function(a){return"ID3"===String.fromCharCode.apply(String,a.slice(0,3))}}]);return g}(m);var b={BUF:"Recommended buffer size",CNT:"Play counter",COM:"Comments",CRA:"Audio encryption",CRM:"Encrypted meta frame",ETC:"Event timing codes",EQU:"Equalization",GEO:"General encapsulated object",IPL:"Involved people list",LNK:"Linked information",
+MCI:"Music CD Identifier",MLL:"MPEG location lookup table",PIC:"Attached picture",POP:"Popularimeter",REV:"Reverb",RVA:"Relative volume adjustment",SLT:"Synchronized lyric/text",STC:"Synced tempo codes",TAL:"Album/Movie/Show title",TBP:"BPM (Beats Per Minute)",TCM:"Composer",TCO:"Content type",TCR:"Copyright message",TDA:"Date",TDY:"Playlist delay",TEN:"Encoded by",TFT:"File type",TIM:"Time",TKE:"Initial key",TLA:"Language(s)",TLE:"Length",TMT:"Media type",TOA:"Original artist(s)/performer(s)",TOF:"Original filename",
+TOL:"Original Lyricist(s)/text writer(s)",TOR:"Original release year",TOT:"Original album/Movie/Show title",TP1:"Lead artist(s)/Lead performer(s)/Soloist(s)/Performing group",TP2:"Band/Orchestra/Accompaniment",TP3:"Conductor/Performer refinement",TP4:"Interpreted, remixed, or otherwise modified by",TPA:"Part of a set",TPB:"Publisher",TRC:"ISRC (International Standard Recording Code)",TRD:"Recording dates",TRK:"Track number/Position in set",TSI:"Size",TSS:"Software/hardware and settings used for encoding",
+TT1:"Content group description",TT2:"Title/Songname/Content description",TT3:"Subtitle/Description refinement",TXT:"Lyricist/text writer",TXX:"User defined text information frame",TYE:"Year",UFI:"Unique file identifier",ULT:"Unsychronized lyric/text transcription",WAF:"Official audio file webpage",WAR:"Official artist/performer webpage",WAS:"Official audio source webpage",WCM:"Commercial information",WCP:"Copyright/Legal information",WPB:"Publishers official webpage",WXX:"User defined URL link frame",
+AENC:"Audio encryption",APIC:"Attached picture",ASPI:"Audio seek point index",COMM:"Comments",COMR:"Commercial frame",ENCR:"Encryption method registration",EQU2:"Equalisation (2)",EQUA:"Equalization",ETCO:"Event timing codes",GEOB:"General encapsulated object",GRID:"Group identification registration",IPLS:"Involved people list",LINK:"Linked information",MCDI:"Music CD identifier",MLLT:"MPEG location lookup table",OWNE:"Ownership frame",PRIV:"Private frame",PCNT:"Play counter",POPM:"Popularimeter",
+POSS:"Position synchronisation frame",RBUF:"Recommended buffer size",RVA2:"Relative volume adjustment (2)",RVAD:"Relative volume adjustment",RVRB:"Reverb",SEEK:"Seek frame",SYLT:"Synchronized lyric/text",SYTC:"Synchronized tempo codes",TALB:"Album/Movie/Show title",TBPM:"BPM (beats per minute)",TCOM:"Composer",TCON:"Content type",TCOP:"Copyright message",TDAT:"Date",TDLY:"Playlist delay",TDRC:"Recording time",TDRL:"Release time",TDTG:"Tagging time",TENC:"Encoded by",TEXT:"Lyricist/Text writer",TFLT:"File type",
+TIME:"Time",TIPL:"Involved people list",TIT1:"Content group description",TIT2:"Title/songname/content description",TIT3:"Subtitle/Description refinement",TKEY:"Initial key",TLAN:"Language(s)",TLEN:"Length",TMCL:"Musician credits list",TMED:"Media type",TMOO:"Mood",TOAL:"Original album/movie/show title",TOFN:"Original filename",TOLY:"Original lyricist(s)/text writer(s)",TOPE:"Original artist(s)/performer(s)",TORY:"Original release year",TOWN:"File owner/licensee",TPE1:"Lead performer(s)/Soloist(s)",
+TPE2:"Band/orchestra/accompaniment",TPE3:"Conductor/performer refinement",TPE4:"Interpreted, remixed, or otherwise modified by",TPOS:"Part of a set",TPRO:"Produced notice",TPUB:"Publisher",TRCK:"Track number/Position in set",TRDA:"Recording dates",TRSN:"Internet radio station name",TRSO:"Internet radio station owner",TSOA:"Album sort order",TSOP:"Performer sort order",TSOT:"Title sort order",TSIZ:"Size",TSRC:"ISRC (international standard recording code)",TSSE:"Software/Hardware and settings used for encoding",
+TSST:"Set subtitle",TYER:"Year",TXXX:"User defined text information frame",UFID:"Unique file identifier",USER:"Terms of use",USLT:"Unsychronized lyric/text transcription",WCOM:"Commercial information",WCOP:"Copyright/Legal information",WOAF:"Official audio file webpage",WOAR:"Official artist/performer webpage",WOAS:"Official audio source webpage",WORS:"Official internet radio station homepage",WPAY:"Payment",WPUB:"Publishers official webpage",WXXX:"User defined URL link frame"},a={title:["TIT2","TT2"],
+artist:["TPE1","TP1"],album:["TALB","TAL"],year:["TYER","TYE"],comment:["COMM","COM"],track:["TRCK","TRK"],genre:["TCON","TCO"],picture:["APIC","PIC"],lyrics:["USLT","ULT"]};h.exports=f},{"./ArrayFileReader":3,"./ID3v2FrameReader":7,"./MediaFileReader":10,"./MediaTagReader":11}],9:[function(f,h,m){function k(a,b){if("function"!==typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,
+enumerable:!1,writable:!0,configurable:!0}});b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}var l=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1;d.configurable=!0;"value"in d&&(d.writable=!0);Object.defineProperty(a,d.key,d)}}return function(b,c,d){c&&a(b.prototype,c);d&&a(b,d);return b}}();m=f("./MediaTagReader");f("./MediaFileReader");f=function(a){function e(){if(!(this instanceof e))throw new TypeError("Cannot call a class as a function");
+var a=Object.getPrototypeOf(e).apply(this,arguments);if(!this)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!a||"object"!==typeof a&&"function"!==typeof a?this:a}k(e,a);l(e,[{key:"_loadData",value:function(a,b){var c=this;a.loadRange([0,16],{onSuccess:function(){c._loadAtom(a,0,"",b)},onError:b.onError})}},{key:"_loadAtom",value:function(a,b,c,e){if(b>=a.getSize())e.onSuccess();else{var d=this,f=a.getLongAt(b,!0);if(0==f||isNaN(f))e.onSuccess();else{var n=
+a.getStringAt(b+4,4);if(this._isContainerAtom(n)){"meta"==n&&(b+=4);var l=(c?c+".":"")+n;"moov.udta.meta.ilst"===l?a.loadRange([b,b+f],e):a.loadRange([b+8,b+8+8],{onSuccess:function(){d._loadAtom(a,b+8,l,e)},onError:e.onError})}else a.loadRange([b+f,b+f+8],{onSuccess:function(){d._loadAtom(a,b+f,c,e)},onError:e.onError})}}}},{key:"_isContainerAtom",value:function(a){return 0<=["moov","udta","meta","ilst"].indexOf(a)}},{key:"_canReadAtom",value:function(a){return"----"!==a}},{key:"_parseData",value:function(a,
+c){var e={};c=this._expandShortcutTags(c);this._readAtom(e,a,0,a.getSize(),c);for(var d in b)if(b.hasOwnProperty(d)){var f=e[b[d]];f&&(e[d]="track"===d?f.data.track:f.data)}return{type:"MP4",ftyp:a.getStringAt(8,4),version:a.getLongAt(12,!0),tags:e}}},{key:"_readAtom",value:function(a,b,c,e,d,f,n){n=void 0===n?"":n+"  ";for(var l=c;l<c+e;){var h=b.getLongAt(l,!0);if(0==h)break;var k=b.getStringAt(l+4,4);if(this._isContainerAtom(k)){"meta"==k&&(l+=4);this._readAtom(a,b,l+8,h-8,d,(f?f+".":"")+k,n);
+break}(!d||0<=d.indexOf(k))&&"moov.udta.meta.ilst"===f&&this._canReadAtom(k)&&(a[k]=this._readMetadataAtom(b,l));l+=h}}},{key:"_readMetadataAtom",value:function(a,b){var e=a.getLongAt(b,!0),f=a.getStringAt(b+4,4),l=a.getInteger24At(b+16+1,!0),l=d[l],k;if("trkn"==f)k={track:a.getByteAt(b+16+11),total:a.getByteAt(b+16+13)};else{var n=b+24,h=e-24;"covr"===f&&"uint8"===l&&(l="jpeg");switch(l){case "text":k=a.getStringWithCharsetAt(n,h,"utf-8").toString();break;case "uint8":k=a.getShortAt(n,!1);break;
+case "int":case "uint":k=("int"==l?1==h?a.getSByteAt:2==h?a.getSShortAt:4==h?a.getSLongAt:a.getLongAt:1==h?a.getByteAt:2==h?a.getShortAt:a.getLongAt).call(a,n+(8==h?4:0),!0);break;case "jpeg":case "png":k={format:"image/"+l,data:a.getBytesAt(n,h)}}}return{id:f,size:e,description:c[f]||"Unknown",data:k}}},{key:"getShortcuts",value:function(){return b}}],[{key:"getTagIdentifierByteRange",value:function(){return{offset:0,length:16}}},{key:"canReadTagFormat",value:function(a){return"ftyp"===String.fromCharCode.apply(String,
+a.slice(4,8))}}]);return e}(m);var d={0:"uint8",1:"text",13:"jpeg",14:"png",21:"int",22:"uint"},c={"\u00a9alb":"Album","\u00a9ART":"Artist",aART:"Album Artist","\u00a9day":"Release Date","\u00a9nam":"Title","\u00a9gen":"Genre",gnre:"Genre",trkn:"Track Number","\u00a9wrt":"Composer","\u00a9too":"Encoding Tool","\u00a9enc":"Encoded By",cprt:"Copyright",covr:"Cover Art","\u00a9grp":"Grouping",keyw:"Keywords","\u00a9lyr":"Lyrics","\u00a9cmt":"Comment",tmpo:"Tempo",cpil:"Compilation",disk:"Disc Number",
+tvsh:"TV Show Name",tven:"TV Episode ID",tvsn:"TV Season",tves:"TV Episode",tvnn:"TV Network",desc:"Description",ldes:"Long Description",sonm:"Sort Name",soar:"Sort Artist",soaa:"Sort Album",soco:"Sort Composer",sosn:"Sort Show",purd:"Purchase Date",pcst:"Podcast",purl:"Podcast URL",catg:"Category",hdvd:"HD Video",stik:"Media Type",rtng:"Content Rating",pgap:"Gapless Playback",apID:"Purchase Account",sfID:"Country Code",atID:"Artist ID",cnID:"Catalog ID",plID:"Collection ID",geID:"Genre ID","xid ":"Vendor Information",
+flvr:"Codec Flavor"},b={title:"\u00a9nam",artist:"\u00a9ART",album:"\u00a9alb",year:"\u00a9day",comment:"\u00a9cmt",track:"trkn",genre:"\u00a9gen",picture:"covr",lyrics:"\u00a9lyr"};h.exports=f},{"./MediaFileReader":10,"./MediaTagReader":11}],10:[function(f,h,m){var k=function(){function d(c,b){for(var a=0;a<b.length;a++){var e=b[a];e.enumerable=e.enumerable||!1;e.configurable=!0;"value"in e&&(e.writable=!0);Object.defineProperty(c,e.key,e)}}return function(c,b,a){b&&d(c.prototype,b);a&&d(c,a);return c}}(),
+l=f("./StringUtils");f=function(){function d(){if(!(this instanceof d))throw new TypeError("Cannot call a class as a function");this._isInitialized=!1;this._size=0}k(d,[{key:"init",value:function(c){var b=this;if(this._isInitialized)setTimeout(c.onSuccess,1);else return this._init({onSuccess:function(){b._isInitialized=!0;c.onSuccess()},onError:c.onError})}},{key:"_init",value:function(c){throw Error("Must implement init function");}},{key:"loadRange",value:function(c,b){throw Error("Must implement loadRange function");
+}},{key:"getSize",value:function(){if(!this._isInitialized)throw Error("init() must be called first.");return this._size}},{key:"getByteAt",value:function(c){throw Error("Must implement getByteAt function");}},{key:"getBytesAt",value:function(c,b){for(var a=Array(b),e=0;e<b;e++)a[e]=this.getByteAt(c+e);return a}},{key:"isBitSetAt",value:function(c,b){return 0!=(this.getByteAt(c)&1<<b)}},{key:"getSByteAt",value:function(c){c=this.getByteAt(c);return 127<c?c-256:c}},{key:"getShortAt",value:function(c,
+b){var a=b?(this.getByteAt(c)<<8)+this.getByteAt(c+1):(this.getByteAt(c+1)<<8)+this.getByteAt(c);0>a&&(a+=65536);return a}},{key:"getSShortAt",value:function(c,b){var a=this.getShortAt(c,b);return 32767<a?a-65536:a}},{key:"getLongAt",value:function(c,b){var a=this.getByteAt(c),e=this.getByteAt(c+1),d=this.getByteAt(c+2),f=this.getByteAt(c+3),a=b?(((a<<8)+e<<8)+d<<8)+f:(((f<<8)+d<<8)+e<<8)+a;0>a&&(a+=4294967296);return a}},{key:"getSLongAt",value:function(c,b){var a=this.getLongAt(c,b);return 2147483647<
+a?a-4294967296:a}},{key:"getInteger24At",value:function(c,b){var a=this.getByteAt(c),e=this.getByteAt(c+1),d=this.getByteAt(c+2),a=b?((a<<8)+e<<8)+d:((d<<8)+e<<8)+a;0>a&&(a+=16777216);return a}},{key:"getStringAt",value:function(c,b){for(var a=[],e=c,d=0;e<c+b;e++,d++)a[d]=String.fromCharCode(this.getByteAt(e));return a.join("")}},{key:"getStringWithCharsetAt",value:function(c,b,a){c=this.getBytesAt(c,b);switch((a||"").toLowerCase()){case "utf-16":case "utf-16le":case "utf-16be":a=l.readUTF16String(c,
+"utf-16be"===a);break;case "utf-8":a=l.readUTF8String(c);break;default:a=l.readNullTerminatedString(c)}return a}},{key:"getCharAt",value:function(c){return String.fromCharCode(this.getByteAt(c))}},{key:"getSynchsafeInteger32At",value:function(c){var b=this.getByteAt(c),a=this.getByteAt(c+1),e=this.getByteAt(c+2);return this.getByteAt(c+3)&127|(e&127)<<7|(a&127)<<14|(b&127)<<21}}],[{key:"canReadFile",value:function(c){throw Error("Must implement canReadFile function");}}]);return d}();h.exports=f},
+{"./StringUtils":12}],11:[function(f,h,m){var k=function(){function f(d,c){for(var b=0;b<c.length;b++){var a=c[b];a.enumerable=a.enumerable||!1;a.configurable=!0;"value"in a&&(a.writable=!0);Object.defineProperty(d,a.key,a)}}return function(d,c,b){c&&f(d.prototype,c);b&&f(d,b);return d}}();f("./MediaFileReader");f=function(){function f(d){if(!(this instanceof f))throw new TypeError("Cannot call a class as a function");this._mediaFileReader=d;this._tags=null}k(f,[{key:"setTagsToRead",value:function(d){this._tags=
+d;return this}},{key:"read",value:function(d){var c=this;this._mediaFileReader.init({onSuccess:function(){c._loadData(c._mediaFileReader,{onSuccess:function(){try{var b=c._parseData(c._mediaFileReader,c._tags)}catch(a){if(d.onError){d.onError({type:"parseData",info:a.message});return}}d.onSuccess(b)},onError:d.onError})},onError:d.onError})}},{key:"getShortcuts",value:function(){return{}}},{key:"_loadData",value:function(d,c){throw Error("Must implement _loadData function");}},{key:"_parseData",value:function(d,
+c){throw Error("Must implement _parseData function");}},{key:"_expandShortcutTags",value:function(d){if(!d)return null;for(var c=[],b=this.getShortcuts(),a=0,e;e=d[a];a++)c=c.concat(b[e]||[e]);return c}}],[{key:"getTagIdentifierByteRange",value:function(){throw Error("Must implement");}},{key:"canReadTagFormat",value:function(d){throw Error("Must implement");}}]);return f}();h.exports=f},{"./MediaFileReader":10}],12:[function(f,h,m){var k=function(){function d(c,b){for(var a=0;a<b.length;a++){var e=
+b[a];e.enumerable=e.enumerable||!1;e.configurable=!0;"value"in e&&(e.writable=!0);Object.defineProperty(c,e.key,e)}}return function(c,b,a){b&&d(c.prototype,b);a&&d(c,a);return c}}(),l=function(){function d(c,b){if(!(this instanceof d))throw new TypeError("Cannot call a class as a function");this._value=c;this.bytesReadCount=b;this.length=c.length}k(d,[{key:"toString",value:function(){return this._value}}]);return d}();h.exports={readUTF16String:function(d,c,b){var a=0,e=1,g=0;b=Math.min(b||d.length,
+d.length);254==d[0]&&255==d[1]?(c=!0,a=2):255==d[0]&&254==d[1]&&(c=!1,a=2);c&&(e=0,g=1);c=[];for(var f=0;a<b;f++){var h=d[a+e],k=(h<<8)+d[a+g],a=a+2;if(0==k)break;else 216>h||224<=h?c[f]=String.fromCharCode(k):(h=(d[a+e]<<8)+d[a+g],a+=2,c[f]=String.fromCharCode(k,h))}return new l(c.join(""),a)},readUTF8String:function(d,c){var b=0;c=Math.min(c||d.length,d.length);239==d[0]&&187==d[1]&&191==d[2]&&(b=3);for(var a=[],e=0;b<c;e++){var g=d[b++];if(0==g)break;else if(128>g)a[e]=String.fromCharCode(g);else if(194<=
+g&&224>g){var f=d[b++];a[e]=String.fromCharCode(((g&31)<<6)+(f&63))}else if(224<=g&&240>g){var f=d[b++],h=d[b++];a[e]=String.fromCharCode(((g&255)<<12)+((f&63)<<6)+(h&63))}else if(240<=g&&245>g){var f=d[b++],h=d[b++],k=d[b++],g=((g&7)<<18)+((f&63)<<12)+((h&63)<<6)+(k&63)-65536;a[e]=String.fromCharCode((g>>10)+55296,(g&1023)+56320)}}return new l(a.join(""),b)},readNullTerminatedString:function(d,c){var b=[];c=c||d.length;for(var a=0;a<c;){var e=d[a++];if(0==e)break;b[a-1]=String.fromCharCode(e)}return new l(b.join(""),
+a)}}},{}],13:[function(f,h,m){function k(c,b){if("function"!==typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);c.prototype=Object.create(b&&b.prototype,{constructor:{value:c,enumerable:!1,writable:!0,configurable:!0}});b&&(Object.setPrototypeOf?Object.setPrototypeOf(c,b):c.__proto__=b)}var l=function(){function c(b,a){for(var c=0;c<a.length;c++){var d=a[c];d.enumerable=d.enumerable||!1;d.configurable=!0;"value"in d&&(d.writable=!0);Object.defineProperty(b,
+d.key,d)}}return function(b,a,e){a&&c(b.prototype,a);e&&c(b,e);return b}}(),d=f("./ChunkedFileData");m=function(c){function b(a){if(!(this instanceof b))throw new TypeError("Cannot call a class as a function");var c;c=Object.getPrototypeOf(b).call(this);if(!this)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");c=!c||"object"!==typeof c&&"function"!==typeof c?this:c;c._url=a;c._fileData=new d;return c}k(b,c);l(b,[{key:"_init",value:function(a){b._config.avoidHeadRequests?
+this._fetchSizeWithGetRequest(a):this._fetchSizeWithHeadRequest(a)}},{key:"_fetchSizeWithHeadRequest",value:function(a){var b=this;this._makeXHRRequest("HEAD",null,{onSuccess:function(c){(c=b._parseContentLength(c))?(b._size=c,a.onSuccess()):b._fetchSizeWithGetRequest(a)},onError:a.onError})}},{key:"_fetchSizeWithGetRequest",value:function(a){var b=this,c=this._roundRangeToChunkMultiple([0,0]);this._makeXHRRequest("GET",c,{onSuccess:function(c){var d=b._parseContentRange(c);c=b._getXhrResponseContent(c);
+if(d){if(null==d.instanceLength){b._fetchEntireFile(a);return}b._size=d.instanceLength}else b._size=c.length;b._fileData.addData(0,c);a.onSuccess()},onError:a.onError})}},{key:"_fetchEntireFile",value:function(a){var b=this;this._makeXHRRequest("GET",null,{onSuccess:function(c){c=b._getXhrResponseContent(c);b._size=c.length;b._fileData.addData(0,c);a.onSuccess()},onError:a.onError})}},{key:"_getXhrResponseContent",value:function(a){return a.responseBody||a.responseText||""}},{key:"_parseContentLength",
+value:function(a){a=this._getResponseHeader(a,"Content-Length");return null==a?a:parseInt(a,10)}},{key:"_parseContentRange",value:function(a){if(a=this._getResponseHeader(a,"Content-Range")){var b=a.match(/bytes (\d+)-(\d+)\/(?:(\d+)|\*)/i);if(!b)throw Error("FIXME: Unknown Content-Range syntax: ",a);return{firstBytePosition:parseInt(b[1],10),lastBytePosition:parseInt(b[2],10),instanceLength:b[3]?parseInt(b[3],10):null}}return null}},{key:"loadRange",value:function(a,b){var c=this;c._fileData.hasDataRange(a[0],
+Math.min(c._size,a[1]))?setTimeout(b.onSuccess,1):(a=this._roundRangeToChunkMultiple(a),a[1]=Math.min(c._size,a[1]),this._makeXHRRequest("GET",a,{onSuccess:function(d){d=c._getXhrResponseContent(d);c._fileData.addData(a[0],d);b.onSuccess()},onError:b.onError}))}},{key:"_roundRangeToChunkMultiple",value:function(a){return[a[0],a[0]+1024*Math.ceil((a[1]-a[0]+1)/1024)-1]}},{key:"_makeXHRRequest",value:function(a,c,d){var f=this._createXHRObject(),h=function(){if(200===f.status||206===f.status)d.onSuccess(f);
+else if(d.onError)d.onError({type:"xhr",info:"Unexpected HTTP status "+f.status+".",xhr:f});f=null};"undefined"!==typeof f.onload?(f.onload=h,f.onerror=function(){if(d.onError)d.onError({type:"xhr",info:"Generic XHR error, check xhr object.",xhr:f})}):f.onreadystatechange=function(){4===f.readyState&&h()};b._config.timeoutInSec&&(f.timeout=1E3*b._config.timeoutInSec,f.ontimeout=function(){if(d.onError)d.onError({type:"xhr",info:"Timeout after "+f.timeout/1E3+"s. Use jsmediatags.Config.setXhrTimeout to override.",
+xhr:f})});f.open(a,this._url);f.overrideMimeType("text/plain; charset=x-user-defined");c&&this._setRequestHeader(f,"Range","bytes="+c[0]+"-"+c[1]);this._setRequestHeader(f,"If-Modified-Since","Sat, 01 Jan 1970 00:00:00 GMT");f.send(null)}},{key:"_setRequestHeader",value:function(a,c,d){0>b._config.disallowedXhrHeaders.indexOf(c.toLowerCase())&&a.setRequestHeader(c,d)}},{key:"_hasResponseHeader",value:function(a,b){var c=a.getAllResponseHeaders();if(!c)return!1;for(var c=c.split("\r\n"),d=[],f=0;f<
+c.length;f++)d[f]=c[f].split(":")[0].toLowerCase();return 0<=d.indexOf(b.toLowerCase())}},{key:"_getResponseHeader",value:function(a,b){return this._hasResponseHeader(a,b)?a.getResponseHeader(b):null}},{key:"getByteAt",value:function(a){return this._fileData.getByteAt(a).charCodeAt(0)&255}},{key:"_createXHRObject",value:function(){if("undefined"===typeof window)return new (f("xhr2").XMLHttpRequest);if(window.XMLHttpRequest)return new window.XMLHttpRequest;throw Error("XMLHttpRequest is not supported");
+}}],[{key:"canReadFile",value:function(a){return"string"===typeof a&&/^[a-z]+:\/\//i.test(a)}},{key:"setConfig",value:function(a){for(var b in a)a.hasOwnProperty(b)&&(this._config[b]=a[b]);a=this._config.disallowedXhrHeaders;for(b=0;b<a.length;b++)a[b]=a[b].toLowerCase()}}]);return b}(f("./MediaFileReader"));m._config={avoidHeadRequests:!1,disallowedXhrHeaders:[],timeoutInSec:30};h.exports=m},{"./ChunkedFileData":5,"./MediaFileReader":10,xhr2:2}],14:[function(f,h,m){function k(a,b){if(!(a instanceof
+b))throw new TypeError("Cannot call a class as a function");}function l(a,b){var c=0>a.offset&&(-a.offset>b||0<a.offset+a.length);return!(0<=a.offset&&a.offset+a.length>=b||c)}var d=function(){function a(b,c){for(var d=0;d<c.length;d++){var e=c[d];e.enumerable=e.enumerable||!1;e.configurable=!0;"value"in e&&(e.writable=!0);Object.defineProperty(b,e.key,e)}}return function(b,c,d){c&&a(b.prototype,c);d&&a(b,d);return b}}();f("./MediaFileReader");m=f("./NodeFileReader");var c=f("./XhrFileReader"),b=
+f("./BlobFileReader"),a=f("./ArrayFileReader");f("./MediaTagReader");var e=f("./ID3v1TagReader"),g=f("./ID3v2TagReader");f=f("./MP4TagReader");var p=[],q=[],r=function(){function a(b){k(this,a);this._file=b}d(a,[{key:"setTagsToRead",value:function(a){this._tagsToRead=a;return this}},{key:"setFileReader",value:function(a){this._fileReader=a;return this}},{key:"setTagReader",value:function(a){this._tagReader=a;return this}},{key:"read",value:function(a){var b=new (this._getFileReader())(this._file),
+c=this;b.init({onSuccess:function(){c._getTagReader(b,{onSuccess:function(d){(new d(b)).setTagsToRead(c._tagsToRead).read(a)},onError:a.onError})},onError:a.onError})}},{key:"_getFileReader",value:function(){return this._fileReader?this._fileReader:this._findFileReader()}},{key:"_findFileReader",value:function(){for(var a=0;a<p.length;a++)if(p[a].canReadFile(this._file))return p[a];throw Error("No suitable file reader found for ",this._file);}},{key:"_getTagReader",value:function(a,b){if(this._tagReader){var c=
+this._tagReader;setTimeout(function(){b.onSuccess(c)},1)}else this._findTagReader(a,b)}},{key:"_findTagReader",value:function(a,b){for(var c=[],d=[],e=a.getSize(),f=0;f<q.length;f++){var g=q[f].getTagIdentifierByteRange();l(g,e)&&(0<=g.offset&&g.offset<e/2||0>g.offset&&g.offset<-e/2?c.push(q[f]):d.push(q[f]))}var h=!1,f={onSuccess:function(){if(h){for(var c=0;c<q.length;c++){var d=q[c].getTagIdentifierByteRange();if(l(d,e)){try{var f=a.getBytesAt(0<=d.offset?d.offset:d.offset+e,d.length)}catch(g){if(b.onError){b.onError({type:"fileReader",
+info:g.message});return}}if(q[c].canReadTagFormat(f)){b.onSuccess(q[c]);return}}}if(b.onError)b.onError({type:"tagFormat",info:"No suitable tag reader found"})}else h=!0},onError:b.onError};this._loadTagIdentifierRanges(a,c,f);this._loadTagIdentifierRanges(a,d,f)}},{key:"_loadTagIdentifierRanges",value:function(a,b,c){if(0===b.length)setTimeout(c.onSuccess,1);else{for(var d=[Number.MAX_VALUE,0],e=a.getSize(),f=0;f<b.length;f++){var g=b[f].getTagIdentifierByteRange(),h=0<=g.offset?g.offset:g.offset+
+e,g=h+g.length-1;d[0]=Math.min(h,d[0]);d[1]=Math.max(g,d[1])}a.loadRange(d,c)}}}]);return a}(),w=function(){function a(){k(this,a)}d(a,null,[{key:"addFileReader",value:function(b){p.push(b);return a}},{key:"addTagReader",value:function(b){q.push(b);return a}},{key:"removeTagReader",value:function(b){b=q.indexOf(b);0<=b&&q.splice(b,1);return a}},{key:"EXPERIMENTAL_avoidHeadRequests",value:function(){c.setConfig({avoidHeadRequests:!0})}},{key:"setDisallowedXhrHeaders",value:function(a){c.setConfig({disallowedXhrHeaders:a})}},
+{key:"setXhrTimeoutInSec",value:function(a){c.setConfig({timeoutInSec:a})}}]);return a}();w.addFileReader(c).addFileReader(b).addFileReader(a).addTagReader(g).addTagReader(e).addTagReader(f);"undefined"!==typeof process&&w.addFileReader(m);h.exports={read:function(a,b){(new r(a)).read(b)},Reader:r,Config:w}},{"./ArrayFileReader":3,"./BlobFileReader":4,"./ID3v1TagReader":6,"./ID3v2TagReader":8,"./MP4TagReader":9,"./MediaFileReader":10,"./MediaTagReader":11,"./NodeFileReader":1,"./XhrFileReader":13}]},
+{},[14])(14)});
diff --git a/ext/handle_mp3/main.php b/ext/handle_mp3/main.php
index c683ac557..9bbbe55a7 100644
--- a/ext/handle_mp3/main.php
+++ b/ext/handle_mp3/main.php
@@ -38,6 +38,10 @@ protected function create_image_from_data($filename, $metadata) {
 
 		$image->filesize  = $metadata['size'];
 		$image->hash      = $metadata['hash'];
+
+		//Filename is renamed to "artist - title.mp3" when the user requests download by using the download attribute & jsmediatags.js
+		$image->filename = $metadata['filename'];
+
 		$image->ext       = $metadata['extension'];
 		$image->tag_array = $metadata['tags'];
 		$image->source    = $metadata['source'];
diff --git a/ext/handle_mp3/style.css b/ext/handle_mp3/style.css
new file mode 100644
index 000000000..5a6fa3f83
--- /dev/null
+++ b/ext/handle_mp3/style.css
@@ -0,0 +1,14 @@
+.audio {
+	min-width: 300px;
+	width: 65%;
+}
+/* Hide download button as we use our own */
+audio::-internal-media-controls-download-button {
+    display:none;
+}
+audio::-webkit-media-controls-enclosure {
+    overflow:hidden;
+}
+audio::-webkit-media-controls-panel {
+    width: calc(100% + 30px); /* Adjust as needed */
+}
diff --git a/ext/handle_mp3/theme.php b/ext/handle_mp3/theme.php
index d6beb1265..039eade84 100644
--- a/ext/handle_mp3/theme.php
+++ b/ext/handle_mp3/theme.php
@@ -6,17 +6,35 @@ public function display_image(Page $page, Image $image) {
 		$ilink = $image->get_image_link();
 		$fname = url_escape($image->filename); //Most of the time this will be the title/artist of the song.
 		$html = "
-			<object classid='clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'
-			        codebase='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,19,0'
-					width='400' height='15'>
-				<param name='movie' value='$data_href/ext/handle_mp3/xspf_player_slim.swf?song_url=$ilink'/>
-				<param name='quality' value='high' />
-				<embed src='$data_href/ext/handle_mp3/xspf_player_slim.swf?song_url=$ilink&song_title=$fname' quality='high'
-					pluginspage='http://www.macromedia.com/go/getflashplayer'
-					width='400' height='15'
-					type='application/x-shockwave-flash'></embed>
-			</object>
-			<p><a href='$ilink'>Download</a>";
+			<audio controls class='shm-main-image audio' id='main_image' alt='main image'>
+				<source src=\"$ilink\" type=\"audio/mpeg\">
+				Your browser does not support the audio element.
+			</audio>
+			<p>Title: <span id='audio-title'>???</span> | Artist: <span id='audio-artist'>???</span></p>
+
+			<script>
+				$('#main_image').prop('volume', 0.25);
+
+				var jsmediatags = window.jsmediatags;
+				jsmediatags.read(location.origin+base_href+'$ilink', {
+					onSuccess: function(tag) {
+						var artist = tag.tags.artist,
+						    title  = tag.tags.title;
+
+						$('#audio-title').text(title);
+						$('#audio-artist').text(artist);
+
+						$('#audio-download').prop('download', (artist+' - '+title).substr(0, 250)+'.mp3');
+					},
+					onError: function(error) {
+						console.log(error);
+					}
+				});
+			</script>
+
+			<p><a href='$ilink' id='audio-download'>Download</a>";
+
+		$page->add_html_header("<script src='{$data_href}/ext/handle_mp3/lib/jsmediatags.min.js' type='text/javascript'></script>");
 		$page->add_block(new Block("Music", $html, "main", 10));
 	}
 }
diff --git a/ext/handle_mp3/xspf_player_license.txt b/ext/handle_mp3/xspf_player_license.txt
deleted file mode 100644
index 12d609e12..000000000
--- a/ext/handle_mp3/xspf_player_license.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Copyright (c) 2005, Fabricio Zuardi
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/ext/handle_mp3/xspf_player_slim.swf b/ext/handle_mp3/xspf_player_slim.swf
deleted file mode 100644
index 24b36c9daf922a26fc1515e5dcbebc748221b787..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 56327
zcmZU4V{j%+(Crf&8{4+Cv28oq*tTukPi))X*fut{Hs;;?<ExAJ*HoRE>6-37HR$dU
z(NKXJ2L}Uq<Xrl~{Yn{bxxHjH0EQqZ0i<5iI6(&A5s1kG$&fh=lK~_+9OD#PTbE(m
z(_ou43p5t&y);qfC9N${%WoFwwzNyy1Lif)=XEXG+VoyJ7cF0(wskvM-#M(TyVjf$
zpY}bU--LH2eVJUW&c{=ktmZp>Hou8Sl-ru%ajTk<5D@T9ld+90ZFp!m5xzIEUe;}@
zi;9d72dj{L*?KF9zLI-VZ+;VQPKPNsfw1SUubJAlA?(*XIn+%E8{ocZh<XiO4LF#K
znF#Kg1$@(l<M%3qUrP>7|5E#E?<2-JgKLE<1m$wZI+PW*gAW0<y@Mv9-OGgl!J|%2
zXw+28AKJx@8U-JOMj*~Z7Oy|vcw50w7|9CsAi{$aAB^Be1#QaQPPo(9_RP?osd5g$
z-g6LK+8PW;%=|mKl4LBA3Dqs$n1)p4_jyhQEfS(T61Fz>YOl8AWPaI+RA`?9wm}9x
z)=-ErO^DM`Uls0~c;H!;R$nwB4UHRW$t_M&$VwXS$23v=Nt%&8{=Kg^fJM8N2V(HG
zg5%%L2Y&f*Br+f_Xu;r^;v~Egt~@%lJHO`{><z1qWxZ@&UD73o#uN?vGpi=H`EkTY
zbFe^_@#P46&4r$VDaxtl;rX|B5l9LQ)FE`_nu-koab|qJdaqWd(e@Jd(1c^Mm&=NE
z*^Xe=JXqlJ27YW~dX>hWj`#?yjh1wqFVTU>rnavHSwBJ3f1U2ckFibw(<Je|ZJTmD
z5mxGGdV9^3HPSAS*^?N}7zLI7S4S5Vk`nh>e^2*h7Muw;SIP|5NXgPJ4(tobr{WRB
zo<Q2Plri!Zt-&ko<P0CjCni$u4wKh_>=-3%!9jUk>%gkto_Y1;F2Pw{Oo-r|=}~DT
z8d<O_QUEE00|T`1e9wE}Y6zBvJ$N2_fgq>y4aDoO2Em*loP#c5kQ6AZdgDx~kkN)H
z3-9KJDm@f!D(KH=fe#+!w}%Hz0^Ro<YoTPK<}pzVYkOV-nD1a{dNx#T(U985Hi&=}
ztvxk(U@%qS!CF<fR&(RUwhCUr>jE>!SdQ^ZJ)-DIMNFw`l$LRQ7bRLb(L@!=r=im2
zUE$gbA=>6s^hngn2>lrPu=@0HoT!lDXK)msJ_b)Pw0gxFdI4O3Jh~4r1^#rSgn@4a
z`tHjhkHJi*<qVI(;BgOJJq2<Py`(*XvEIN;EwbQ8AMlVi!33$R>}}>5Vx2VN5=PWb
zjtRU2RF3~Phw4Jcv<@DDPw3H=eq|N>X+cUIDb^MNZe*SPnwp_}Aw3RpTSh-uvw~W)
z!ho>T=~N(^#toOo70r}mUbUjdaEvKH8YQUq7#kKOvbhjSYD_9DL|j-B^vE54i7!!5
zwS-75Jb#tA4tXIVYTiwxZa8V4X<SsqIX>U8Q7CY0>hUVRim=_wyKq6w*As#!!-(U4
zD?Vf)YwRAE!7m&yGePV+KCJzC94d4A-T5fjjGlX46iiVOen&-?<`T9Rv#E%4viuCq
z74~6MX$Q`@xFRyKG+@PV%dGOS0-gtwp5*+}aw>);*3n2Y32<b4n*$t6D$A#x-Of!R
zm)L$+jB0RL=TyjlvOGZ+{)SJHT51h+J2nz~AHa*0;N}tfIS*k97ovnDk{_GnJD^#Q
zE;0b)w1W@73SMt|+GF{n)!}v*&nDg-yZel>-Vfe^<awNrW_jr6p3rr2ct;Vm^d!Fc
zjJ&zFE0K)!R8K>7CyM$yZnQ)v1Z%vqAFC#qcSgzc+FH{rKb)MeZ~PVK2|=blx7#PV
zVXJf|7!|8l>=hZ7Ve91(`V9>xvjmJqXhD|}JN$GOyEXsstZ8n{xGoOot^IxGT?i6x
z;uX3v$3C7(NUo2|Q~c=fsU5>L!5tlb50uZV)9>jUtFPIa*`FhJPUc*5{x@LJ-@K)|
zA@DVCukUjljX8p2a2JSufDbbvb)YThV|A0Ju?`ywEW6mJZTV<vuswCk6*9`qWZKsY
zFzdl`Hz(gm;9?rano<9qkkp^;xGwP|FtjS=D1cw5(0o^ge|jec5)@!cH_F0Me>vs)
zw6u$-$HGd>S@w~`Zrr$vcTSkh`du_kS<C&(dl=65iYK`zU5eM#(D!k~h+K4>adlV}
zJv(cdZs4__<C~7h<!I~n7M%)r<?n6EX%bnws*6qf4h)KXihYkGzvuXzf39;}Nmb|7
zNqse0?%h5y;5?rBcm`@JcjB^$Wt$Svy5ltkR|1*+Ar84nYEH+#9C@5E(M5i`8U7`X
zuDfof4uZ*Sa^KZ)9S<TUO#g6N$33sJtC-<8zm_=}X574cjIZm2thD14)gnT$j}SO@
z>k3Sq^NItpcAC!x&G8D`LO4{<-{aj%b-uK|u2!W=J3eNI(6kh!el4BJ4oA;LO!>S_
zPU=ewyk}Kqt6LPVT!bi;Z-CRoj}?Eb3S!<_@c3j{I>(gVTU@?TJeL<V5S`xFwOQa=
z6B5e%i*#;)IT4mFaimFRsxs+ROEq95XXF7BR%5LnM4qPugOM#$PgVf_H=y{P*yhaA
z1j2+E0=BM02?H-8)haQcEgHNe82s+`Q8x&WGtfRvDab>6FB|4}W^pW^cM+}^q+aKa
zFiYRpjsI&El`;srrDc#qK><ffC!uh<?}+gFY_nqIG|A8c9gD&$-Or=R>Xg-IrQHZQ
z_g8=K#Us$BEoo9sS|8ocAkm$I3B<Bevk!KA{l<=0@l{3wU9ZEX7K9!0e7qB|W9i6D
z-&Nzk%B%Vvo5k@Gt9ah$|GdnNiP@`}<kf9<($IyJ7eGfL{F^1BJ$$|7HA}0gw)@SW
zpX+Y)#sui`de-x_)Ma=W&B3H2#)pgZT3j!I&*hp*Nx$OsZj4C>WP0)=GA3{>0EOx7
z+oi!or>wNF?k-Smj?xfm)G$=5-kVZ!+8nS9H<CJeT-#2SG6%zS>30M*Jj`Ud^6hs7
zfmyJ;e2I!&tZFG;-`v*z0m7QUnNN|3kB&1cH6CMz-A3SX{Srj`bm`MjUv~J6l;fjX
zo<1=v*P|-=I4B{T8dJ`BF$#mMTB3$b>DzjBReo}<#FK}sljwbZn#I^lM`iH0LrLGX
z)F(Fe{#9`P2)UV~;i*ods!ZA02|;|>76nFwCD9>Uj0A#(BMRL6$;+mD{3vABrdp1K
zQukn(xce<;tmS+A5E$2ZE;<n+K4hl)H{MQMw_=41MTo{4B4kDQ6sB^12#FtBIiulZ
zWik)9&0;EuLStknxX4Z)Eo;^FgoVRw#T0jhKC3gog6iPBnzmg44b+@(RcOmsGeSGf
zaMzdKsWlD3{HdBXNf{sE32TGZsJcv?IiE8srAKKNsmY%m`Rj+tDioG$o`mxYO`18M
zcjcj-hI2=Q+>+KNxRW6axNSf`EweiQ`|86r>Yg)#I=%yF*Xb+$nix`Hfr4%!_ghp$
z90wUw7~Cxj^rJL$g)!q{kDJ43&DDA^uVW?}d<XT}pH8(pc30vMP5(!8b^q?0sx}Jn
zpk`_6z<S7q-<QZw7REsB_i<*GcyU&@bhM8`$61~PTb@1pl+Z$ErQ_XSvdu`QeSxNU
zMw~`>=WCGy{JJw+2#~ZV6e+II9`v#xITL-=AD&1ooDkwP$eFYV#sZD=l8<4(yuGRN
z$MH2Rdqu4v6H#4RgrJm9mdc$GB=lfQ9R_|#4+!EnD-8>BQvPs~T$JLVMKnN3>JZH*
z;$Xo|R}x|nJ2G=eMZl{kxTbEqu`~+5{QMOIkN?vFkhRFo@p<SACrpWJA&erCKD|(G
zm9)6|^SkA2am}!;vB>eK8(S0VD266&G~1i3o6#v^EdKGny)<1f^7<ok@2g8ADbz-(
z^h^2Wxk&dX`E7Pv!gM6|0@;!_^frmk7;H>ey!9!(G*YVb$W>Q|{?6#5)5^%bP;Jtm
z$&AIH6PD4;Wu=nwLMS|dKX@u;!QDkHa0OFarsG>Rrg6UIV>!R+*b}jO^PS^Tu^5cA
zi5xC0p&RnJh=)wNmy;UG^-P{SzQrz&ao%-h#8s<)MmAkF$?fN8bGLu~Yu98!Tc>|U
z8khei3IRg>N&lNDhv?#$em4+nsHlP%j1yMfFNDDKD*?$IoVJ|9fhgH`-xp_)tpSyi
zIL_PHGYIEo`hr(T);Zqu+K}qe3|c?{hKuPqXxD}8LK?4@!RRf4b5i&aTAnPXqw)0@
zrtr$<gl7%N87Wr<i=R3oyt9~+ML@PSRe)>2WLLpo`UmF<vA_A`T(otEq?;i>YQ&v!
z%3j4;-ygQ18s^O6%<qk`&a9Xh$wP3eJl;<<hC4(j+*ql}o-|+mpt~T;V$B;cC$QZ>
zuJD-`bu07Keh+Qzsf$|k$+7XPZAZ<E+96vaW;ob3&cSI8Y)v{dNC4?gJ#Ala`ptj9
zKRM^+6b+uhW2v0*Pa_VT7-2o2>n`>}@M{EVX*<YW-27?6fj<kf{?O<*=fkRoShXR9
z%bWfskKw~q0>|GL0HSs~P;7bYNubFCK`1L2qF%27%dfb&#|jV^98jo4F2Lnp4KhZb
z9XbKHutAKfkN$B+ash!DonYS3pPTm_m9Pt+tr8SD=1Yy!+Jfe$y*bO<hRHL4s!4i=
zzX+VQ7a5x2@!OHR^~B0r&M4@*-}_6PF!xbF&wl#~4=q;v*_*8BUng8r+|!QB>klQ%
z(B6BD{^Em+r7^ej7}s#UA-b*hQdDL9D`y|)sx2VzN~-K@Q5})<@%v{{#rGNA0nPHy
zM}Md{+BuvJ62mZ+C&gf5e`})OhbG?hUp{}9k?-3aRWijaOZ!g$>a+bk7l*U`_Tb2j
zJ=1yI7Z|`9F;X8C=V9E9rSRWTF0XZ5{g`Uq>~>n5v1*n^TgH^E?nPbXr&DMQ?pO9D
z{WjhCMqN(d^_$QACR<MTZ@(+n_YJll(ZSdOwMlMxs~l(=QuH0V{_M{}eaE}ke3ELI
zHKdv38)(K;rVdAJrN$DJ(}Jcu<6Ufy?_}Ilo}am2ZFR@)h}@L<`mrp5%>WhW!;cL*
z<Q2$Ol*i{drc0hHObgrkC(9!}(3UMq%6x=-?3bs(w{rSgK+5=iZ_8JRCKkca{q?r8
zNL*rq!$2PcJ}v8knQ{79%#BzD+{nIBp6soxb(Feq*V<S!j&lzbc8QrQx0x_!m%Y%0
zTs0|H>@aOtP=OmpTr*Vn*EJv->Y#rfnBcDgU9Z!QD#H0H(t{i$PF_OVsuD_K`{jYm
zCRD$<i~Y-XK7g>z_jTxxq%L>}4+$L}Rs^T8Dae&@a0uuh`SN7t)QTq6l||f(1?NYJ
zqA$HpR*Y_@{*RtJ=r_T*FSlMn?CAHRyR;P#EYAWiO|mUygx^LvD``)^;ERZ(K4Or5
zYvDl~(Nt+Sxw$&)smSPko>#J~(IdE4%~n*|+E}g6X-;duNm+G%Ho!5tk#$qxA&IVv
zC(1F~8KJssL&6W2{9X;PL{TH<3uH>sScY4`MQAAR<HNE%gN%a(4gT}g4_Jx|gYdjd
z;3&WP`5kxG3onp}I|jWk9vm^QZ4!ODgDxUfFem<&#Csa^o3v`^Dz;y?68oXZ;80h_
zdW^6aAblP@m?$?MEV<f-JSnPap92zKpr2)}Wk9yHiEjY|@s_VW5V0m|w}Ks^aTx_=
z<SGc(taWAsDjph9FNnrET9>9S;M)fOd*fqlp1>c?J1H&jTGF15$QfCaxj45n`|*Xi
zy@V14E~&hw`B9wN2&%3~a1WG$3P+f24(xuNL<^xXg2k>pY(;*mfH|&ls><LHp_huZ
zWyh*1!J>s@Zdzv8Nb!U?Vh$Is^^8j>(kPG~_dFnQ3|a2B`FEDDYc(ywjTVQun}5D*
zxW9%a*#=ja>*{6gFK?m++`KEKP$Rv>FU>Q->N1h&K2JG4)6Xz=Q5l3$)iyScYBkPZ
zUo=tTM6mSLuIZgCyEq7~5TxfT`u@%MOCWQB_te8>&CMy(%A3Lit#C^oqDOdXuS;I5
zD;jK^?91LdS*>i$`&HV}ay%F??nx$fnh?B-LRJoKyAv?ZGAFW%V1HVn%^IDAofkK>
zWGJd>bcnT#`g8JyryOMUD&&#r`dLuG1{>C$%@n9~3aEiBBYl(VlFMNHO)WR*UMh44
z#g6E$My<rZhHZf0sDvrkQR_*KEMe&Am+%sWfzx^e?X^gubc^8iJGJFscM3%Ca-}ts
zgxByHU>SWqzH)?;X1TwU(j;wp=W3{xlnJPIgyUZU<4E`M`oc*K*v3SD4veZbhoOX^
zv^b{+nzsWzB!-2U&vId)jy+N!DBsnGCf1q4sPTck%vOoGih7}>u}j>a#J>=#tVwih
zvo|+ef*uoo!_*dKS&7Cd=9407SCrIbtBDVmOL2e?_QWhD3<S5&i{skdvW_Tn@J&T$
zL8W*ZATNO!|1|ksT57~st~oBHjo9otw^G#!b|v&JjS*n<0KRtq<Tfbrx+B|OxgxC5
zX0-XkHo~x~>J%Ytzr|2qigSVI=MD`lM;do7b;C|8$EDL7{`=Kb#o?Bfxeoq&?v$lU
zhI?IX$zc&`D39*zJO0#J<LWWd4mS^E2U<2}A<Z6)AL+UurwZQQ<k;#NJqt+(wB=Z<
zfEuSI4UwTc|7f9ZPD-@O;e8<jJOzT5V>(z^@LVq5w*0AE;8z}e@Fhtf+JrqCB18@%
zIm8FK)}uJva7Zb9xEW``dbo%TdqD|ec$%583@#%5c1Rj9B5fekp?`+|BZSnHds{lq
zy)U{XpISS1jkFR5xBSV-$r{VOB&jN4+ykJG9W>uqMXWEJv8|(rw0=Y$nFcAOXdn+|
zir^CS5ZO7grv`Voq~Kv{?vMzY$MX%zFCDk27m^uAQ=Ekt$VO9?k|X>ub+4>xM+_Nj
zMv;ltgM!)-ODs%actXl09mvvIPmpUo=1k`qr-FA#L)MFiuAa@jXWyXljLqo7&Ah2g
z0ZN3ec85lSS}G*~^|C%~S;A@>Bu-9pf_(p5*oO2VMQXxi%-5lKfB`%WVqM-QY9eKj
zdx|yhsL0xi_#~!Ul>uD=HJSnrLyrEC<z|>TjAfcB1+Z%w!jk)y=3&kBBwOk|O|&xw
z&So@OZFOVvkO4`6ASU>V6b{Z%tXr54lUoFj9q3#+07IR!j|}DK{5mF4*St>qH&#1;
zO54*}mriOsQ#$MHv-=#;sKZ8`<3{1nWch^deI8U2aKN`bD&_UCr(XiyA}aejbiN{(
zw)zJ32OOMdrtRY(gg@pFy8$80B*n3$5>S84T^nOM;uRDEYc?5^KMR9z;18yFzQQOj
zw4;fRS`=AQ@DEXXy)1dO6t2i^7c8SLHd#wW)kMH`7hnzeG1h_8E{g%mtXi)unx8J_
z^q#f>X-kfUjvTng&#OmsAXy8^uiam@>uE%lH>j!_%J*KDc4%K}`d>PiEy`)2!<3wn
z`V`3nyl6{BdZZ=d4_RTQ{S8!S>|U8<)O-4Y*Q!%PQ_@T1odd%ezEGRfNh#j+>8d&?
zQgU%Qr#gIeb`%R*MV$EgQf)60rS^#rx4hOZc2Si^aldS18K^GQ5m&1Pk!PhOCm51x
zL}b8|QJQO>DUzfAXfgksVS*3Fp*Cy<rb$Xb!K1D(DEz5hOuLT@ZkPg%jsn!;PqAor
z#fWJtU&$*o1DoGfp>3(87k26M%Uzd<<w=(i0<!Xh>3<OWZ#R!z4UqT;e<aSuEwk)q
zWQey~VgxoYQl7@bP}J}SRzj-DdIgOD_gdc2ysKglkr{c1j)_`)J_lrdf6Z$4A@uYV
z7e=Le3EMI~VIJu_ClIg<WXBzH(;dcP{)pi&%YfzJupIbO(n~DuJn;}qo_DzeSF!x5
z&deB_Y!Q+Zm3&}Lb-F_(jEQm1-aMa?r6)2?x&)g$1SOGW?uPX)mZU$d@#1-J&BC5U
zGSbJsydcS(C7JACT)vLeJ|3<fHEH&+c{!;dq}@t&l3>}S#+B~pJHhcruRK$<`!_X>
zB$3CgFVtym248E?X;V33Wm(#Zo%W05Yg5+L7Q&=)WaHGH#~r+~%9YN+T@_P{+t`8r
zsH0f9QzrFqhxXX~s4k2Z2}CFQc@b6d2yzn4(Mq<zIhX0G<hm=2cW4&}?SSxQSxUzQ
zVs1QUiV6zx0diatbismBXNMoWiWbS1I&5MQE*Xplw!^)U>^eiz6YDr~{NfOlO1I^W
zEK17$(UW}2ppkS=G=auLkN)-gDBnB848Z*wWd^RpnSra1NW?Sxr4Y-?hkBm1v}^B1
zY%8E%;e-@-C)@dMn^yKGWwPyryji^->o@G0!@nJ@oN|Ie-3?baoyvQxC0N%$Jq=U3
ztQu#>tZy*WuR_U$L9G=7Lrdq%bYh1L<FzEuTITpbAim?9{VrOYwJl8shAW#qhDVU#
z`HVk3y-x7*=lB7-E<vAmt)nGji640hf70K|c*Qzy)FlvMd|uQgIGD$CRzcVGFnqM)
zxm{}q#efPune8=8<pY>h#TtWjn-G!2S_3Ux=_l*Fz%iqzBgYLo4S)ZN40HzDXqWU>
zaZfK!ADqlmnnS~PuGMyrU1%W85OTw`Kcm2GR;M12tNm^6aPw*Ubs8xxwyqm3UgBUR
z#n;LCT>rH0l+2uKD3y<wgl8CXz$hq}FuN;<y?$t58(G2zr~9D)LdQD`$?w}!1B|C~
z?`;iTayViV<mh+5AXjshR>HXwC&3<YKVYugepB8GwNwI|fc=H0ssX=1&XjjqYgE}Q
zc=z<>;A8m+A>8kFPJ!W+=Qem*uLJ5H(eJxs=<Foy-i=VrVQ4EgLv2FCQKDXD9Zo<&
z)#Kav_{BE78D1|S`59_c%68<DDjV)gLnti%9NTQh>x{=2iYO1?TR)?BA2>V^T+khU
zonuP4jLYjXN_e7yXUy9tG;vdT`1%JjlbSjp`LQf{!-iqE!-w5ub-499?MOv$_oC}=
zR8PlWj}uNh$h^L;pmI}&TBO)=uM>kL6_-TrWBu7j<?E;SLB;Mjt;2r!?ziLPK-X;5
z0I70nfN!pA%U`Q%(JdC1VZ;gn=BpvF?Kf4Ijxg_vO~c@7kK7_&S*g%wASm^km)M-6
zY^~58Emo~LA02AK7Nzaw<EjBvA#k#Z@BS+`*0+VyfBr6<An=JD3`amR7wrlXY@<S@
z3}ya>Vd>Ke^BlnmlO}2^w)uxc4T6Oc1ALoEYiGuld8ryrOdCy+6Q40>!_9^hPH+KS
ze*zNtAia$DKK-xi&lNXQ*d@mPTz~+?ScrTT%$_x%58?$?(2vHL7Ni%}0c)=ezzCWH
z?oh_uik1(vR|QZ2>xNRynOWlk7=U<S{~}|n#s(k&G(fgsZg~Pgk%Q^~;V(b>M*#;-
z4we}WHGoynEhGo{J+%JnAN_~{egWPfeqi~4zDf`V&==<ZK2RU{dU%s2q&@n8$bMo%
zLF7H0fExfW)GciQ5(q_1&<6k!@PW1G8qfzi1*ugD^^<Uq7BCCw24TY4@WJmN2Dk%0
z5c83(9(4n#`auFT08W3gH^FXE1D-*m;PT-Cn*c}<L@-{MTb%#}z(|~-&5r;iB6tUg
zetbYYSU1S+4?zNW!DA2)5I2A>qytaCF`y6p1(^s6$Bw$6I{-0&56}j}3wz7b4+Zc5
z6oCJt7o_bM18{=zg5Q$#djl-<ze>>xAYga_?a03b`oRFRU>^kidhj1$RA6hcb5IWW
z{XPF|mIGQJY{meo30V(A1j_{d&#qDdyP!UxOzNTcU@w3{fCgX-<o0JjE`Si^P>3}P
zY7b%!!~whi3J?$SfwCtOkOQOW7vKuO2Y3VQz&z0QOaqVrU+}lY{RSZXpf3sm3b%L*
zqWPHpFnf@SfCT^xpb^jr;slTeSpjhYT!OSC>?sALgYXM(N%b29v;b-Vm>^s5x5)j`
zfE$ovImj<iRX`4s1987!02H7X>0if>00|I3@LQ~Y=73R<9l#4Tkv;4!SU+4n*d9y3
zCI|u83weJyfJ-G%|NmcBqu_TMpc=vgq8<8QDl;6Q5AK0PWXnAVrwHP}-yaHi2O$7>
z5bQkzu2B-80$2iS0KR}#kS(}dwti~BJN!S)6p#%l1Ox-ZL4e>d^!=0oV{_pyP%218
z5DI`SXa?wi1Zf4pDMHqx=OgWL|Kk@B@+ZVE#!wfKG!Prmi2ZAofFXba=m*9gYCuDi
z5Cw=2z%YOoa1HRl+d~M52izYE;sgHU|F=Em|0*__{$IuTQwZ}x_k052K%T&O0k^#U
zH~)0W{{WZ*bU@w!wP5X-dzJwzfTz%Z4*aiTm_o1rSr3NDD@Zqh2fzT<j=#qoU;yd^
zozMh6fmDx}5B3YG-xd%L+6{jTBDkVVCD5-OpdJtnu!Hn~-V+OW1}vog6G#J?f%?Dc
z*n>BL^#9w(0OSbjzjSmXPa*7wLWXPy-9!8zzt_P}ApM7qYX2`CkJLO2RNc&0Mpo@}
zTHIIU{I}el78e#8Dc=^advDwYY<F^V*WI?W3FUn}HV3MmZv<K^xOAVwFFt1<=zIE*
zNnA1dUjMX)Q}8c6&56EkKPmnZ*?jwbBNFOs`|(`B0ownr_`%P1hqAjJTySv1fPnAW
zhNFD$)paZK1C*Jlg|rAat8jTzqF3F^Zl%LHe*1Oh4^rDBrk~;U=xXoWZC4?bpZo3&
zV8^HabWEoXDXdZ?{(;SY)I>hh(zmMbxq{Tbm*3+1skF;r`&Ig3xyk_BrKZdM?DK%o
z_aZfS?>krcsmkKzWj_+?hW<Oo<YkAOz>BQ;a9cuHMr8CyK#0A7+RMaVmC~3+LM9hw
zP7W=qf8$-npnH`!;y07^<{<rIk!_F;YP_lWTOI}70BOG$VZA!t77INMiXTLBEf6gk
zyF=Pqo^Sqn>MQTsztvp)Z~tb^B-rdr-kE07``GVbt;w71diNFDGNQ{u%D0`^7KR(&
z^RGLk500x64AO#BP8&bhlRCHF=dr@U@J&QSyY@4CN_odaiKwZ@`P;NBzx}V^P?nwX
z<KEW3v@Ixk4&@;c6iSgjTAsiojV|fQZQh>u9ck}3;6a^)h|JI^rrg#v7yq5)Ur%qD
zQ9t*GBmur}n_ZpHKyx?#Ob$&j@{Z=$)Kh!JZ<Ei*gp)*01N@KWJ-b*DWXoMbdpcL!
zYt5a`kH!)-(F(`JuHw7%LH7drUd2xOtC^${a)I84Q;)kQ%pUaFo}+B2o5#|a8_nJm
zyMbxes8+O+>cenne|9gK@fiU=b1LfPzlpX6-1@RDbK$q5{>R7f(F6kUkIxHk)LIf0
zI~-nr$*1e|KdXesiVo*EfnlAX&wJxT0_&X*)4|G9fZZ;Vuwmcl#9I_S&6(WyjXmk|
zoM+$_ae*fm*<FjZ!5Z7od?^6x2N%m5Z}DwvTkd=_ZmS=o1D>dn+C|blxr98Q;}5n!
z2fi{%=)AhyP!)E4e`^N#&-(5vj@{$C+YX0X`($|^uF3>0{92N4J#eW*Jc5aLAS)ly
z2!Ss{3rE4Ufg#0@G~_M}Xjsw@qo_CeY`${omTFwXp0A?uVjE@hi^BO*SRoldN49HS
zcVh!Hih`(QH{GtBIX@A|N-XL&T(CSom~TB^w~XD{`>0(|qy8*e+FP^F-*z28R{&@I
zk8#q9g?giFzB~%0f4rjmEhgAm;-_r*<B7TqpW5%BB->J6r3JQ0eHBt>Yv5v6OTj|#
zRQHH|7rjhh6l|oq(>>>5`MyYaeT1wyUNT8vxkVq^=y~P1thUqzm-nU%5U_KeidgvZ
zjV>PseGl{Oiu31(ghiGT2F*=ddi|XaCd;mi<$bbrBGqnca5Gn}`xi$um%{Pwv;Mmn
z3|2G?w&g#&<#Q;f6_XtPZG13$<u0K4Ao(K!-07KM4FAv=-v6uYeK+=s_iN81u4%J>
zKv`q)bkI64J$Icz%an+u4yjkemh}RC-Bb7djkXMU%BU43`G?#e<P$+GdHUnW*v*L6
zsHp*1ji0^cfX+yxe7rg%O7}W_*O+k4Br5&zSMFUFw}fSh6@6zP)78u2K^^>8tryn=
z_Usis=)mVDE#+f31mnN-I54;48aSQxan=4j?JmS;C;_b&y*)7$s_C>OqM5LZ_oev6
z2s01Jy}%FnQ}l`N#ogiH_~Vd<sr&Fo(sTB?XsUnjk8{V3+~GM=w1>QaW%paVm_nwB
z=;`bq)n2in&<7;}a1uq`+t%+8F$!^{+CChw0M6avRx`yMMc01!ZCN4fs`!{n^70BD
zjYopMn`uIfjuqcJ$>b;<h7W=lVXgA6!qcH+P`zs+myR7Z7O#1QY|m#UJIfB8LJ9t~
z*tc3Ui;gW`5H5&N@Y3}=_o}Pi9o?6SWnLwXe_J!z8(*lu7orQzQy?WLzF(azr(i2j
zy#S<mZvE*@jXUA1rklevTCZnS%#I6|OG;@9(swG^AMY9&Itp;IP#T0}@Aj*-d7V<m
z8vX98v}SK5U7}I)!tAw3lKTNp`%s)q@BRHLISkh7vs)R1fT=VQGs+t){@x6qydwQA
z6ZI)>e!msRq<!$JShyeM-zAXV)fe;}Om{1|G6U6`EIxUT>O6VNGv+OSwXQzCOWZKB
zkf1VuGCPdFU8M2<B!J)GG?euiYQ=JRqDCXG-+NtqWn!zKzxjL^$+X9jg!uQm^tgg6
z9~Fwu<9RkVL4+rN{Q!fHuqd~+S=HI$9z656J(N0VhkR^gaNHqp-NpZ!AInSM@^v~<
zNO%l3eLX0e^w(~Gw^>`SZ!$C=nhDEA;K6m{xcuKhA8m~9M4vx}_Uu3Oo$dA0yzuJ(
z4E)?BbZd?0`k%r7nf?C&c`UM~1RQ~KCdq3i9HDZii)$|GgJ$)aHW;*~P3w3Z>C?u4
z*Fjqo=#8S+QCd^zjVIS(Ta!{7)T(o8%+RZo)Ed}r=&Q`wtJ7+XFSPJC`@5@w?DerP
zc$n5k(>AD^Q?2#RYwB(cn<F#ECrucwxvyHZ*2Y(K{oI<A7e+#@!Fv6|)!Ct1A&>RB
zbQ4B&GhSMR7v^9#m|Y3Jfxd~pk$S&-2kgvuO?HiT&D`s6>Uq}nE}6Qrebcvxu1$B1
zpBvuS!7hcKe4oIcki9eT4dd%2){)lZ*W%ZWFR6G&{00fk1xyv{^BO4E9o>TXhJj|Y
z_2%o&m!40~PoVD*-ie=Z?;1}i-kG0BPq5yppGiF<e#83a_Vor$$(Nj$ZI^OS81MKz
z!#id-_5Q|v=KjBK8U-4k*ZP{C*Ynn(F8vz?n!bnmP5cf0O}_{DjR>2*P5h1X_E3E*
z<yxu`mn%9|+p-F2tSYlgORKQ0O0!Dh6q}Y4t>U<)r`05?Jgs`Q^W&68D-V{0TO{e#
zN2@B&l_<+mm!-~4T%)+va!chkWR|ecWnI&>D`(VC%AJ=z&wX42I~Dbc8PwCuWtL6P
zom@jZmFZP9Dvr*rT7+v<tCrZ$wOh1nl&qIs&%IjYxAVQ0y;_8}%ios7Tcm8&IV-Z4
z>Cd^&)gN_Tv%P>`y&Hvg8lP5G8>OvPAT1(Ss$EO@ogzJg2o>8_nz7~KOZMe$RlBNv
zC4M?RBA;<yWnSrCnmsz7wO;XFb#Hu+{EvQ*Adf<i@8?KM;Y;Dmr01mPMdwJ%gcSnn
zgevisqf2?^@l^t9d5Zp}{1pTm3grqF3RSb^vz4<IvsD66^DUm21mUA+j-FdUwD^6g
z$70U~K5U?@LYjF9<tFPw@&WeI_+!k|q31mx1dtin0CWTjD<qb!vF;Rk@d9Chkw7Wn
zIFK4x0kj030a0e*XJu#U6e`SH&Ew2#&4K2<=7Ht~=85JF=8@(V=9%Ul=Aq^#Wm8QP
zD%V<96}PHhmAuxx)_luA9EBS5T=Sl?nWlk*$0ctZUR*wYg`%?Y#mn`>^~?2ruF<At
z=UVgZ6W-ZZAjYg){O;np<=<v+P#~g0S=l7&!{x2+9*k!vpP|C<#e?;;NG~H`d)eyZ
z$=Nf!hnpwEgU`TUvDtK9OizZV%O~Ca^@G<&${|PME}K()owXG!d$(?J<klXr?=1Xj
z#D`B->y|z<38wFN)}c9d*a6KCgQ|Y`&2~7I`2z>tue#;0xY!}<+vl6eT`MFN8@H$3
zb^q_(Z<V!mfAjC$&u9O?0wWCa!|BdQ^<VLe-yAM^-twg<6!k)!_UkNUwfWg$=`JmU
zqtjCqb%%`&xOXsypFc8-?7DwZ<qSSGq272+WNuRE)7sE>-1}ZZ<gs~1YSEZvJjOa5
zcnf~auyhBzNkf{bIV8x*cnF+QX|BfL7wcTKPG0Od`3oG(b}-t0h>!AhRWax;v41}C
zFl>LuUP!Rzbv_)wV;**zE%n?@rN|)7^l?ppwZs(#PDGs`nswS-P{#dq8D&+__i|w9
zsyZ9)v+3kw{9p{wWj(r*sPp+V(Cg3RQf~5DIF-JYPT)heNNzXTCDui6|Ml^@vU&e<
zW!5&aIc;ayE$D*3W&7bL?uU=(zxs4>KiCw!5o(@pt<lXzgg=?gvoFleS!(LR6~Y=z
zawL)!TBh0XrzeNFazjMbcD;L})-cRH%i~fBOF4!SCL8F?9Tjgem=Sv2xp;k_t#s!k
zVr6p~>wLq2#LL@Eg~ewI$9bsddT!0wMwq2L>gTu`)^JJj<Jpa#;bawiL`^ZNH<GT&
zH(1lGFV`<;tHeh{x9UV2K(%Yc{+(7*yGwtQlWiu@yT9UHRqJE_J*0JjPSGP#jQ;g5
zCb5(K{jg%77Cl<uCuf5_unxLzY0sn=7C-GLvqXsLj$RM<?ZRT(=2LG;g>G-rOiXU0
zmPXU7qm3i@>oYe{)ACu+QilwO%C;8Wy%*7xkLgFl6JL^3NQ+AtNzE5Bzb-@2k4(!k
z+e8OCf-Bo(%#kNi(mP2X4TS*PhzAI;)Pi3~CjT;rZ4s1>he*#C`|<UbeOu}J0hZVa
z@>gI60ha6JdK*ywB8vRrrqX?>1Zn0Zp0^wMd><=?eIS^uuYWVPA>%XFgDHo0BdzE4
zW1_KrTiA+u%$yD;HTGZWukaa+aP*hQ3j=!r^>{6j0y`^W@gU=5<gJoQ?#fhr{Y_&2
zxY49i24FK>{iC8e&YIrEGlWQ@TJA(U=$7__ln-lGUWW7wox!dluLstpC)1)SG(z-z
z;43Fc5Ss(;wqv_6!<O-H??<F|4Yfq7cG&`37|=C{p_Lw&8N^9{nwWdxxE6)##*}Eb
z6MF&CAscObdCm!m4`vAzddf+sHN<{ATt-f<L*eDZvXkNWQD^L8np9XLgkDJuiW2cN
zcQ>W|f<CrP$X4d`wuy>l((wao`<U}fg9hBu#JLX?1o7lJ!2$%&ZLUfp$RMf2{{ITR
zjJrB@NQt9{1uow2l!`6#QFkSxP%0x@OS>q0Wkju!1cRd`F;y+q@}VYHHgMrv7Afmm
zb_iB}z_%SZOIE#q3?O?sO=<S^h4&gIV5S+^S0rd3Knyt8qAQ`>jOJl6WBX{qf4xL>
zo-#Q7#(JxRxohJk|FbYHRhChB`{F~?tn{m7eVc-xW*k=&zw~lQD09rpi-md(2Oi>}
z%j!;xW-71`dkqD;ZIz@F4adGXZ@)HHyt6?S!S7$7yOE=*X_62O$SL|Sp>5%V>Cjpf
zY6P1{l+rVeL=R>_PO21hmt_~MT_SN&9!FJ7Glvlr5?RRcaD-RvK9FQQ>=8syU(BMT
zoiI(N*<FydCsw%q^>a+1XbtznaBfYh6e^KZ8SV_AE&;w4=fCpS6<nbAAT=Ev%}}|F
z@MS@%D#`h|Q~)Huvb=v%LWLO#%(LZ1unHq8xH{aL+C=u>ggf$Q_x)4lVfdwOME`vm
znn%S!e;+a^A-WE>T@(1!l7Pm-7KOxz!kJOB7pCx<W8UR~p5qLAlu9yzwBPBXx}P0U
z9&glQI43jEUM+rG@Uk_JAK?Z`7eum?ZTwgIBxQzPuR8<{T!Z9g*g5`PXBE1!c@(Wh
zUU>0w`wQgkh;UDzZ(dM>2-Zsp+`^84j+@@!yNe==xTZ8??pWB+I6cC-tqK<xjI6EP
z$=F4Py+|h8R=?A<ThPliDBaJzsi&KNHzL{}pI5wr`bW&kOS8wz>bSAQh>~Cdu^{gW
zOPJj6XV;eI95*OFqeAaBv~)&)#tiC57)xY)yWBW5pPVU%og?Mu_Z^jC-<ygZmLF+p
z$Z55qreq<eR)$(-Ft~}xX*Hp-ymFdx80sX0;!0;uJuFagJZJ{4oiV&#8DpOMnX%+f
zS;S6Xzc94jkTY$gz&F`9VA(cC;7duvjJccK2Z$p2PL=nXSEFwmw4b=9l9YNCC|G7P
z#ze($ZX(RJQ<z~=`BpU27)dY?MGO+f4H|$hec}d*^1Cm8&S;lTRbnGGPif`z?Yrgk
z%$YC=vE77zgB-(4v|G9nBpO03!RUYeUh)!J1HX$)STsEV`FpzY94XJ^Q>Fx#?E+Xh
zxG@<UwV-(}o6xXLq2|wgUILHI%6Bx)($5Fsz=pdXBw6>w0fvysEl0EQ5wD}ruVasx
zM2luh*UKIsmR^ic%Szg%rRi1xw;1R<v?9l+my)yjexhJshfrAraQB1qNfh%)@SY7D
zaA67QhhYXyFsqpo6f^Ih5y@k%bBAxh_x2U%I}`Vl)TI=N>B8nJ!}d`+>9))AqO@e}
z1WF;-llS^a;rO#KV=Fya>?+$2{uQ{m{j`DdkDSP;7STEuG5GvsS<b1`%RD)9nSEYR
zftLsu<x11hR!J<tlafSjP}ej%ijLBbQHUq|vmy=W2dblPLDFrKK!6o^d|;!8fBt+E
zWr>tZ|Fj}BzxD70T#Ow4h)QFuTGbL6Gu<)s=?C+<Y6;+qo|hqr>=u!QZ&b0ZBf0*t
z84GHRBFIsqpsA8yd{M`j6`80A_;BUEr6ZgQ|B9hr)S3V|-xx7eAh%lUg+94Z(3r^+
zq0=m8D$n*c=GsZmkgI{879~o`cQoSA^nqqI7;84txWc|=cFB|xRrX|<d2Pldi@d5^
zqE!pQPVs6@l5+)?T9rUL)r3N_^U7J%-!r8-R!EUMg+P~}aw&(b{NcNlKL*a=fjJ9t
zO_|mPdQNp%6KqBef>$mRyRLhE?PYGCCGop%jb{EHHN0!c_7OeCg&ZYDVs^%HYu~U;
zIV=v`u3P`=;5L{4`^QCS!w%T0aSBo<Qs>mAY~NyX`Qb|kn-d@`Z-ARS<3)W016w;~
z5@=~ru2OBaB(LyE-Yg1?oRw-#U1U&mKG<_n0+X+|cQlHiv*cOI+Y1MS5-$(_tB64)
zfLXsNrJ(t*MoD{jgZC%83TR^U#Q_m!aq{4z<D`on>dlDV{_tTT3>#N{KdNZDl?DfD
z5yzRmz(!=WPCk|8)EOkKu6VU7g_PC9UAnDl(xRwecF)F*156QY(h--rL&{}fJ~E<y
zgp?={EH8$A)sn`47{1Yd<!7TS6Bw@OgbS5756_rR>Ee~#l7`!nuEC&)&7-<+ryLqx
zJoO1zu6D%Kiw~hcCzgeqW9fO_&_*go9{c2#viA0*N%Ad{*+d-o_05vLf))CNDn_-f
z1BpEs2W25wOwz%iRc*KxB3x^mib*)b;@=FrZKw!;{4s%f(HfB3wnd5UG&r1Al}h}+
z_;mRyXDJ;_Mo`skFw5*|c-?-Bq*u*IWy%~<t^!Qv4B4BTdW&{pYXk^i;c<O{Z)wC~
zqiClP6MM1qZ!rqNO!9{75VLO50m_^`)WlZFcn$A94c^KT`cyC}c&whXo$(4+DXYAp
z2`6R-kK>u2R@X7B*gVEXhWLMpiB+hGaTOvw(A+nw$Tu&BM_IgzJS3YSy6G(SqhmcS
zBO~=^KwN3*D4691KMfQVE~1p({wi~qM&tBKx~QqKxuEGS<KWQ3nr>FDs`sXP^CYvj
ztWxTmU;R~{mxJxuEuMqW0!w-gs-7&*2r?HPsr}9J1`*BB+}d<j2;w(@mf!Pi15I62
z5OptBmzJz@3=Ywy?sO#sH6C-~EUjJCZovfgXu?esjF<-cq!*Fe{!{LA$&YcQ7>z{x
z2ig`<tiJMR;WR4Ogx#BWWXGURGwg}4m^6OR2A7SAK7%0}&p6o}cCu6pg1$UNw-Qq=
zAqh2Oa^p2WYvoSccaQ3}y+Zyu2hYhmL13u>Xx(a7cJh^Q){q;2@r#o!J`y^~J-Ue4
zi3Pcse@u($Z*A*H*E6ODh7wJ;9~Ue#)stb7uGqs~D<j5NEx$K7WvhMBtotHdJIGhi
zhkkbk8QEes^jbx_mJq8460fA@OtxUTCq;Otl3(vJIYJ>g?*5qVGO&&Go@QFo7g^#b
zGSd4ef19bHwn)<et)aH<_uB@Oi{G@Mc}IkIF!?pY(4hy|QAR1XEvFUe`!16Z=e|Be
za~#qUTk0X38X0P7YnHYc<EUdDN$sO9$7%n#wv-yf{kZC+>;~1c;2fDX8yE`z-_vBd
z)Wzn(%0MV&;@Ak8#aCl_7J6cADTO?r2Q~RtOBeL0NQ^QzqJO1;Wj_-?a8Z#<1{{-3
zuZ6N;AknSLlGY%8*o`1~E~@xIO_cb8byz)3i!D%`mZg(1t`KzeW_nS4ML9ET!%hgT
zTkq~Kj>Nbfv78FX4Tb5LLeZ4>{H8)Q<34fVj@?hN&mC)D)^O`rECdh3)Ur-v&5=M|
zNzT8-VB0L{3cRMGz?9Mi>fP9({q95<*d&@lEF-36_J;5?4I}BOkhBY2lnm*N6~hs6
zD`isHPVyGqR!w$EzROFp@0XkZX?wcJMTtTuoOFUVDElKLGsOosfyajg($WuiHvmnG
z@~p7;x~hnQ^}AU!d@R3940SF97&Xh;k#xIU@^@LY?;v(7xuxo_L&_d;3xTncY1r1x
z5C~|x3RUy3-!((S6m;|Oy@3nx1msf$hOGo&FExv1=NE9X7!krMuxxV@?5`}DNUbc)
zb&XPvQFYU4hK0Aidaq`mUp^mJiVO$3$5(L*8c{GHS>J<gC#m*Izxbw2sCGGc7o|P^
z-Mm>oqG)#iRBVs?U+)Wqzs_!doOFGh5C9EfO~>+(OoNn)&bZdROJ?4Hvv@h;1D-<=
z=8CtzUQEvfl;XP|HS0Vz1C`JO3Ipy4=^ls>yY{hsBENz114x>|GGe!~uzn8hza<oJ
zpKBV*{(Z5de&HD!R;T*u-o8f%`!(P&KuY~WEV2WeXC#wh8PI2!)s^qAOQ@g8==QcY
zEKi7)b>P7IDxWtY>8?N)gBmKLwSI<WnK#+s_A<@S-P_wIu?cFjvy<%OAKywZvim}!
z?n2x3@n=SmCv0q3bx0j~$cZP0hG@Jcu~mO75qY0576kfu@{C26WPJG^u}H)YB`RbU
zN`xd94z#QC-><a>?4V->M|%kXr?H@>GtzFB$l22K2>rX010{?CC5l}N+so$W^qJz}
z29tHo!knY~i1u}jZ3q#Y?_{K5pw`fc9zxI^a`o_KB%~2D&;iY3KOUl;6w7*#yfl}o
zxkPvqpUfSgRI4Q0pdngR!|XKPLkL%u>Xj_8go~Uy!Zl}p`zP*CYb#lGrNJClJS3AV
ziBK9l3WA%uXyH|0`I^g*8(5cUcK1m{MC~s7I@x{8JJfq~U6qrdx7k()KdC5w8#el!
z&C$lh<51`9gXYOY20jhr{I2<W6JS!kZkdI%K?RJVrM4!w0kmtJX&i`IdKDtq%KDp&
ztuVE*;&6v>Gnyj}J&F~jP*8iI-&f08H)3`sQ%NfM^y&}QxJ%Pl3LUm&MutD&*(qBg
z9T{}7z(m~}1~GVYiIXL&{Uu34K1HBP#I_&Ql608IbJs24>FboXX?nRmMMfMw&lvUW
z(CRhP)SJpbmm}MlBf&hHfrxQHTUfxb_sDq&r~KtCVSbCge;v~<0!+knu`JS<>H$j&
z*Z7qtLJr&fLCRFRKslxUNljKEpo{I<qlT&yh^bnnIJVNw3*+f&qK}$%Y+74B&u_9T
z%Ed6RpSoJc<myFnXKLyV(<J6_E5X9THJ=70VCXE*JoVf0@0z;V;jyZ30ry}p?YUrd
zNJFh@BR`6neTl%F{S;-mmbC*I>%RP7SUAnMv&+oGWTg=bI3Nv0Q*5kI_4yFfz06Xz
z4TVW~>NctGMo8_D<%w9eQP^7>X`g^GJ{P>JYGLH}IoZRSrO~cksbqExQ~Zxd3icsQ
znaPX>dbvM7PB@iVmrm9YytJk7hbs`4Q83SR14GQMjGB=dVvX=7X{EQWAWl;lh*=y!
zu%kR$57H6LEixb_?r)!p*<<Xm-Sw%ZbC#9`1}r>c3dqauczlJ*Dn+ewIusEfnPilr
znBfg36RCT{F=f+Cs{Z>F-=gNb->|wjWp&gqsj&vMsVrF3@R7DOMr4iB2eKuS4O?4(
z<_s_mf}bhQs$vTM9pB7>%lwlsWT|Uf#I{G$(bT!Z18QEkXR?;*cG7k8vX<fhO8v3N
zwOCZVRG8+FI9#;2jc&Xb^_g=J<RZimv^XoqsaQ9hAe-vg7jQ?m%g_@+wx;TCo-x#0
z9ow8~Gi4*hvx{pm+6N@lyGk7|o@yoQ*0kvr2Ya@UV>>KH)B=Pmt_Gjm_P^w}Qte-2
zGK2bO_N8P9PI3LP4TRC(`Q_eAP@g5+_BwLe!F~;feiHYRZkz^ZH#%}M#h^tjaq}K6
z%JVqScW7_Y)90pbFOGQ)1TpwmlORI})6T`I_nJmG_6~JrBas`$JSk2F4nv^(ES9b<
zN3XDP8pdw6pXnqFJ{wJbKG`NRVU6CEMsQRH2?-L(t~9EDNdAnwAFRQxy2;GidMosS
zYly+V*t8(9c72^SBmUm+8xnSl89?W7W=tSS_e3wCv6ZfjUY60pKG9r^wc}J_dBLPA
zm8B=o(Jwrsp}+(@%9R<m`s*fbQ#8W;NOKTg<y|np8yoP2IMyseF(TKj8h2AVr*Hw9
z8M`!*eT4SC8YNBFmk4FiFhH_%sZ>vLJ1ncS7B{~dd~6c&T$F`7cpoBvlx=n=joody
z8Q5J3Nkb_HwclXbF0rV$VGV9T{$`HEMTUDoh&Vu8IF5z3Psy@X{P|PG4rc*3g%vAq
z`0iJ9FIdpcw1M?O3R)%xVZ|gpinG^77Pq|QLW~phpJ_~$EVNAcXp%R(@^qb?-z(vF
zS&5onrAn%KmdKzT^o0C0HC#dHH%GYCy1bDv+O@7ho8!g(gFCzi?8`Mwj1)!}%!r>9
zuTwlwBd=2<S0;Eq_f}-+Bg;!6i$4P9tJt|R22mw5XLQ5BpVpW(^eC4Om+op%eKsRI
zz}dOPv;DEoMs4(#eb~1rKzp-(X@0iKvT5K_W{oqruSER-E#^z5wAxx^iESlp$NKQJ
zh)@=K_!i5i(!KDIJ78;Elw)47be>OBFx{{mR58I<)9}8Su6eW;DT}AHDA!N3M{A0G
zJpKd6W*gs1&9&~(U*7Z(*uI6KUwG4-N$i?x3$;k`!$e1y6ta#qCDZ7aa>eQ?U14X+
z*9?YAzt8in?txpKC;x^$FFwlLw6|p^p)5MLs0LB;1HJlbo-Oc0lW2b<C3LGiw_o<c
zTfCK_urHe3+dtCmhEdM$hEXL=2Gu}hT0<SS55<<UP{L7%?wa?!W1?89XQFKS$T?JY
z;3#a5wW(dh8lz1`bIYR^1DrQ=czX>aHbi*vn*S%_!6oihug}k}&45~+-9vEFhOlrB
zQQ-j&UbziZr_pNYJ4wA_LOO0cIA@itFOGoikP*7JmJ(W=v$_F+)ONMfHXS@DQ0FRk
z<eHoEn2?uoZeXzAzU;;o#)eTOFraNbXxW@T5IvBPL@up$Iay`?e*rT<%)bzc1!;aA
z*`+xoIhsez9I6KhigD^)9yH~-Xt<mrV?LX#`Scm{F^1{^eTIDa*<1gBjtLI<HU!le
z^V?u_%cHtRzgPl}H3^ic4FMR^w8c=)dSZAY5mz;cs?}iq%L#JBNv;ikkcYNFFvK7c
ze{Vd(Vm*Pjpg$zUjs&f%v4RPAg+FQ@F9}-lL>kASQ60~-#vg7+cEqH74eVllKqZbH
zDoGw=EYi`Da0FBvG2+QGaT2W$XxOCFAd~S$`eQf+=nJ<u_vnL3Je90-BSOQF5Cxe>
zFs3yheekNC+(r+XigucAt$`Qa)-&75mY#y)K0%ip_0s5A-t%A?NaI=aU8d10UovTF
z+_WLm8w+gi3IsxO%ohpket=?f(kBgr<r0uwda~4(zcq&9$@+}KYLMJum@hx^dSvav
zs95mA@nWzIG+vLyH7`tA2Cy4eH?D7~TGP-}!z%Pi1${=ru;@m!0sQ22m{SUa!6-15
zSsHIwBpSRB>J*4D4!^0n#4h+dhNQaQFpfmcTF=z<%u4H@ZKV32xu5SyHTmH=<BCqU
zG&*`X$3nE3A8?H0+BBaqKGKuUZqr02{bq{aEU#u$(Qmf+9Z43FI2Dnj*+Zj-A6=&S
z^mP?0t(Jp&sR`rPQTniL^f0{0(|D0TEHCmtPhJ!Z&x_F-FUEWtFY*(3VHm=m=E&wa
zEsH|k9tC}3O~2@Lhc?Fz!|P&=*G1;URdeFwNt9JNnNqAD=JX6t`2>yfiKnG}QUc{3
zo$?98P(E3se9~ztpJJwbvQGI_ZM|a=Gpso&(@Y!VZWUWAo%RE?#Aui&DN7g$C9t4G
zW5JBmvS4Nc3k>HqODsG18nsiKiR)*x<oen8zppGa&19w-PJn7BqbqTiD{DGS1)G`9
z?=v@i@xDJT+RwdGqWz-dPuFbk%zpW`-fbyvslKx=owwkT%rYmHPNA8@gl38go{cjV
z#DO`>w1a%<VhEMt%%o`y{dBsV=n=~~e8dkJDW}0m$=B2k4*Fq`na)4v@efou>Bwex
zCXSzIt$9B62n)oyAEEQnYhkV2iSEQ%ozxohreBV<h@Zx>X;q8$UPsk#I_}yhPiij1
zqeqCE@^3JFgYo84IS5_`$})?k;3ZGy#=TrFb&aQ4&=v5tQXZ)&Hm+q_bio{r;UoEm
z-`boyS|roXR1zyJzWmUqi~DM&nBx^=eQ>2ZUFrLCji>iy5jX)kl7KR&OH}VjXR6`E
zCdl{>X69mDB5PM!c3F=%G^!ca=FD?0*EqE-fd`p-7c^2#S?IIK0%x_5n+hp6l~Qgp
zx!j~Al^c1mBx!VvwaVBeYIF9|Ne<Da>Y_G*<@1TcG^bK+k+wX8w3XU4r6@}jU|g!E
zr2HPGs!Ca7lq!jB6`sjP;hB;|c!*0`RxZ&DxHHWnH(BJH!hH*+?^^Ozs^tu5wYNH{
zWHpmKq&c1G0^cZKPFa{KX8Bs{lru0RoN3}KOFNlc?Np4CmX}P@@{&s0l+#Jt6tkpF
zF-ckyVK<iY=hnn(WHPnJqsHs>isik6%`hRq4ly%K5@(kZXV(QbU4+b)A({#tq1jp)
zRwFATc^ph%hG=$J2Aw9Rh;?4W{sm2-HfUyAsbyRK6q~uwW}bM7!Sz1FPV>2>%j>yg
z9_jP?#HuP}5<#Bom$lX4trn3hsCm|#)ipmRkwp2MHImqiGMQO4_(o$}GoAK_`XDV}
z&d)?_B~_ZyGVmd>#u@t>&b|!EzTGwp#~Q^E4YO~P&!A_TK}^X$uTALN#qyaxR}QS!
zH?#mJ_tN1Mq1m)<63fN=enGpT|D7VX`#W)KzRz@BLp5*bc53IT>Dt0tin57|lj2NI
z=N6do-z@!I6epcT(hYTLPF5!5ri5rACe4_ETP9>vwum!&cu+?<$3RUz_u6X6jIZ4&
z=ZXavr?L$?HBm9=4UVC8tg+0Ar<?f!c$&Zx$5vdp@F1n*yd*n~&KHLj$B4s<U$m~0
zp6?U4P3ZL|53f6v7F|zNQhwlNL^D;cEbn$m%<ru?98PGZo~+HMA7C!R?TKk6%-tRc
z#r-Um&s;R|X^b8lF>9~kG^>paK&KGxmHf1zWgy-pR0JL$;8AcaC=N=t^BMs)_k$r!
z$|jO>+RR2_r*87$VkTFMy8Y+OH@5nK`5a9$+f<yg6)P&DPw(()8)>*lr_Z3AySOTJ
zIy0&@4F$dcLE{N*9&?9pf3{`eSxXbGJ>>!=q;xA`CBjp7v4p!JdaTEa9b@#-hFMs4
z>H@9_MzJ`RyTyqIfN?ftixNvP4z|#Gd)%chqW6ly-PqyoCF#}3>ie`SO!_s{{!dF)
zM_s9p+S?;-_5A7t<G_rL#47_@gaIBQ4MsmA!lm3=)z14;o4HWGRl-4%QY%g#L1N*(
z;?4tQGO4)(bkrD}U(f=Ix&9j|Y7Rs<lH`t&9$}&2?Fy2k8}#M#K0K6XFv{w<?swvs
zJ#j<B7sYA(G0cIhT~myw@gdYu>5>A6@+ECW>mqHL>f+=pTDz4?#G2I}fofOsltto8
zQC5kaYLg9iAbAv9Jw{qRMi@Nk5KeZA;Sf%i6+P4HkztJ=P060BZzC|BhWWBwIs1xO
zSj!c`qbT@NYq0sa%Vm17dDV^|SP5EVPZY6fMPKQ%29Gf<>g_cIpV^|`K5bFYB^LGY
z5?m0yghjn@98`0xG!%@*X(kx_tNd|4KiUzAvZ1Wy`IyQ+oAbP+%X~ZmW=MdU63`d^
za8)Mg578<>a3C1w+cU(?q~sH0?GP3G`-1HOx!gjB2gS(-N;Dw03>aL&Ho7TOxZ{Ct
zvy1hxwl05kHLj~P_w<NW#8_`@EKb)L;-tB0(i_}WMoNZV1#1fh{Lw~{6`+~uPj;rI
zI|6;8T#iaOsRACfJQ_e>nw0PD!Bqh~&);dG32?D&tMwHf?XFmHH>n5~oBcv`u__WM
zqY45A8h2n$(Lhhg-zNQIktn4UtJno;#Ntre+A8_Q%PsN(Zw(p!>Uh<51fwzXq)7BZ
z<>LXqNI&`GFVIEHT7o_hhX8IbBtM<jm|zNd^G|b?3*7eFsu&T(f-#NMj$kMrh;G1I
zz*U!KieAa3*tiUX%Zem(c%P+Fl#Fg6h6x_%N`g#MN_Y6;CBsn^!Nl<H-cUT)6AI{u
zt9nf|TIj)bRb1w#skty-*BQcP?-&bW{&dqWFt*JfYHKjxdx=MxP@c?TG}osE{j)9U
zOkzobAr0r5rNNaXrPPs=WT^*(|DGixu6xaQW7_q*F>Oi;?}1$<e80(`ZNnx4e-)#-
zk*Z$@Vprs?MP?h+ChpB~(w?FUad#6KC#T)*ohB}>vU&OLAzK3_1t!aVLv(UoNf(C6
z>5_oI88pG|VoK^~#LxUp_&783+3-hvMtZV8WBMb{9A6wvrb^5h9FK!O-2O(FD&lyL
zG`$;?0q#aV!uA&#PetkGzp%|l(b11wAI|pL4F02i)hlr883~ESsLsRjooNr8l2cgi
zE0cyPzbs)o(-#Rq6QcE+X<X={IQjaS5!%m4wuwtA&@AaO{K_pnEYaS;ZWpHNSg&~!
zQ`|w2V=W)wacI3fG~aY?rHD9NEa&lx_$E@CQ?YYPNj1f=%kxhYl!+<U^H0XJOrLfE
z>g2&fx$`tgy57lqRTp)uf8mz3zK5}nX5h3zrD@lqNZC5XTqEu#D$-TSRP#XGo}Z+w
zW|hFVG&*S~>ol5)Dh4VNSPjOjk8n!#JC*c{`=GS6snJ76U1q>gWv000uaXZSbS&-6
z&S-gC8)u7y*rL)9(m{8$@|sIEZr+=0nCBZIrH^yhGGybCOSP4^*_Qe$unq@#gxOjK
za|S1fw&&y--~mW};k+BZsL$JExGG~>t#<JR-M42qCOgL`u9hI~*nvB4ojZxRf`qw)
zV<nF|@R%_*eFtr~VN1kVdmg}i<J>w=WC87RG~SuU{pV_lFGTU=iQ~}>e>AYRH{AAr
znEXO5`9&6fkI>o&uT*{6^i1k;x>k?l`I*M_=}aNR5C`9nJ805QS*-Vlin2tX7gUr9
zV#ZKh!~qrcO~yl(>T`*Tvdoyka^u9}3R$~uN={j6YGx@|yBqn<9!i-7byXtj6oFb^
zD=Z^{y4r%uu~rh+KEc2W^OaU1<IQRUfrQe0%ST;~u3lVDM~z%>kTJxy$TBWXdpaHI
za=xp&8kaXN!%48Ec23nQzRB5Uu2!?&281k`2i+9+2f_79eWEv&+bwBH4j<6mR~nfr
zYsG4yUAJ*0wZ=<JMle%|IC!jWcK+^AQXV!B%R~J8*_oA&%(@ksm0{z|sv=&znzRd(
z5-zn!BG+!Qw4G09*A8<dTH_PlMPkd6i;7~+Y@Syx1yOG~U%PpTugW;lZDQ#@Eaqe(
z&ueQ>-&6CoGQQepS(*~fyVkPHVY5|DuQSYS8#!jYi-;}`L7BK!-nWB3+PW6b$4GUu
z-m+Y@C3!1bZQ0{5E8k)6lf}HRc}u???>xF+-pN;I)py_GwPHQYki!>fjr|~BrcE{2
z2wKA+NwHiawLvm`zF1Efj`auVtb%S<B)N}WR*%=hu4~P^-KUnD+K`EbGlpfM*1Oo1
zdZOmI`Q~T4(jaeUG%J`+;~^rK5CB2xMt*X{CA)7v-*HsC_G-U=MBHR$As-VAB$~i=
zVih3%`PvPI`mFw$RG-FMYb_xc8un_pHx64@jaof4S#JHj(^_R-v80($JI*AEgAW2F
ziSzl*bEw$#ZhyK@b2zb<%u3)#LwsrFQ>#b2taqKoJeX`Pz<OVT(V-gw8~Cb`OE<0M
zbPl~^bce30<<f+_#<Rk_v}HV&W6*~tD_cK0<aE~Y7H&Sz1KO1zKQd}caf9hNUhE{D
zlU=*Sca3&nT$HAQoe^RDv^*;_r7DW7?-rzH0D}-$Jn9dNnMh_!l<{P3_UBrgwRX8C
zTIzC)n={68LOS(BS)w6~6-&>}-f9vwKc()f<BKBsc-n}M5Y1ayaMfZHMBD7u6G|tR
zY%vZE5`)jNHm!+6S{twD;*genx2_nOH`ec8N-OfpMx{<ERMsdPlqSWitW(x2waQlI
zTxGm6U0I|oROTvklu~83GFh3WOj5?A6hMj<^`9~UZ#P{GwN0CbcZ+FwXd75{mT7ph
zdSj(D7i@USYbfgqH%8s(u@xnmd*`v3HI_c%-jZwrTD}C<6AHHRJBh@cd`pKlrG)9}
zWa(KhWD>58y@6glr?az#Z=e^G(%pE{0dEmvU35Z%M+ywI1$t13W6a;v6WS#=yvtJ*
zT+dr3BWWI$P7~0M`ThUhbCbVz?zc|2$(0~JZ%AV5GVarH^Qj<r33Kcueu;T;SC=UG
zK4!d2@IrBYXo}aec7D3~z%@+H^BD|E7wMX@Y=5>?$Gq!uD2gv%(~SC*;5|cve6fd}
zZhPT1`s-m%AE)VhdQLJF;O=k@wNY3$>B*CYzv*)AF=JSi42hCCEJ~(C$r=_V%d4LX
zr=hh{!rW9>I7YQ=qtz)k)Mz7ch0<HC4fEViSyhJJ4Ij%}m-#L6PLpzeLsQOtlZ?|z
z0%PMxRI3aV!y}EmL>)>Far)vU_oP}5H;$4^%SfsLZPhUKC|5x><Xh=7N5ixr1(J;i
z9iw(CwSqQYNQ-DRh386xIa9mDNM~V<<pw5g!~$MUzL(IHBNCTiEuWUq4u0w<<kRt8
z3p-tqZ)sLvrFVcvIGxpcH)*^DS{N3FnLMQc42v8&(+atX1=%tD4I8}ll2VY0Kgo50
zd_vMCi@?Li8m{Onkme7k)+wo7EU0x<^A;?x2S&T#wE5M;;1&Brhq&i5R~bjSD}^b>
zdoIsxMR|<Ym8F<glvB=hMOj<79Ll;a15?@eJ^Sj<vZAad@Yz<BE#1a2ou;85{6FsX
z>ah2U#cQi*U9<`qR9n^3Vpy*geQ%{d9FD|Q@K^m|71!(39)B#Z#=8P)Al$A-I_NXm
zqOV-{#KmH5xl{{WElxM$@wMJCfAf=ftcFEYK;r$XzIaPrDlyiyO06$O8`ofytm?{T
zR|+?*!Jg4FvvDC;U%M8)jByQGzF7!f^<mS3e$|@BN_}Y+7k>5S=s<f=-0R3Q;@|od
zEM&Q+ogOKy5-a3lAs(be3dw)FjqzW%{y8o+xw?1p1t8pEg{xElfJM-h={8#UnrI(3
z5xZCfmCqog>a(^kz6k0{GN30j$4y30i+&aH87zV#7Hw!0V_}SxuANG-<2{PzF~{{o
zxSNQpa*=k1uqeoA@a4<C0@SuC8R?y!+<Rnl?;I;F;<X$%?G74c*yLmk!p>VBgtCQ%
zWiVRr<r>6%;Am46e(kg713k|uOL#-Q))gwF^{y~o?jswG6LEr>#>jG5$5ACh?r;dk
zHPgJoJnb1E8cjR+exM7qxBtXEhe~^^9fo-(Ih4#N3#8Bxf%bx?Q;RB?!i`?-of5vf
z3H`f_u6NYq^vOO>M1dhq!#zKFT8u*6=4+xp9O&m->3U;axoNbB7*Z_e28;(8?9xo<
z_W_b6BC_N67~)c3K2OHHYZT(-`wX)})pBAxo$r)OQc&^SVy3oO=7NruJ!+mEoKU_u
z`6WYqoMD)Ja^iI+`t;94eJ;pB=LAiYPe*aK5F4;oJaJ`94ukRd6lJP1O_>gwp#&{t
zQ(2T5PPZ~sJO^f6<{fERrnJn>Ok>gn<h09Ck#>`+$8rZwsb!{Xb<)}KeAyyWy*h=4
z>QtsBGJUpY1`1hmqFsRYal|^OTt_qE`NkGtoZ2!P{S)<f1W>-k8)tl(1KO}I?{g9<
znrofhmY4JE?=(%cGIWE5q1wd$JTb9^;}*mGdb+qJKk)@0ymC@zGhbUeb?E)Jov&>U
z7*=f;kb0{!Pq-~iczSCQZKGJ6e0tpQMw9VM-GyYuD@$dnI-8c^(sHt;SDM)1w&w(9
zSzui{Y;w!_>t3lE*Ijy%6}eQsoEhp7T8mP@e~fG&E1-SY@wrfCCG;MyVH-o4z8)=<
zlb+ECJ$;(g*KhJF6vVmtSS5vwL8hQ3h%4fw1r^W~r#n-C3WaXHN}ymWpNU(plqnvi
zP#LQ%Q|2oZmAT4nWtLK^<SFBnRVg4_IPYe<+fsJ7XFBEgStjk$wULe@MmkFvy=HMH
zBOP(K1kGI28}&n3UoXX!_I;>4ai*i4ghccakM&v|^VJ^ObsN%y_6Ca6y84ADQM`hp
zxyQJ3Fsg5{)Ndn+M|ymb{;hIfDcv8TU&RPf_<lzu9XA<La=rjQJC5^=;48^6-<v|W
zd=L%Vtss^=Xd2_V=QVEKPpc0L<i17}xN}&1v*5!P@e5uxi0#t~A2T|DO(uuj^C|8w
z(OD+0c!^q);VkPkd|Pk&jOqa~liPgJzIpd4K0zM{g)|Pfw6qzWVpuCuY%^naCh_Cf
z)8OtFKG*?wo$eBGLPj5x!w?-bncVtZXYw#5qI+81lvEI8T_dDcbBH8@1`p%69@RiZ
zt<h~vK=-po*<_S2u`wBMe=%>aZG~YZiF~Zz-$R###z@ADo4@tjqE^R^gJ-dKya{U;
z{jGSqyS_ur43MZpdy*HIl0#l_Lr=V6ON$xzFN-a{+E!=&fo*|*QSSZz*!sXOElwK^
z<Y^f#ad$BwLi+RugLyN%VH>k)vo~!l=E{iDO?;A}Q`}plf6`^Mn0hTJgeYz;Y}wUK
zm-OHq1wS691%X$i*$1m!`~LK+c*LIh4v4{N(yj*rr5B7f;A;)|(t+lOY7fd+u`6+R
zH{K2;->AT6AZo)sy>Wab0_vxo>UnjnEf|EVqgjcLXr#Nc%O9=8K*SgRTQ<~r(aRqP
zcWZAPk1L3I3_68?U&g77NEoV=2-SA?lb4S_FCiSjh<YeKz8s-_cYz)Xp)L|tr3LWr
zU60rs*TZ|`JfI3{jF8(wSl1XcrVxHvai^}q_}$6UZM;VL^yeHb*CSQddz;pHoA?Du
zZM@UK`=L16n(m(XF1=Tx<sSXUDqVl`rWA|;wfwU?I8Ym(Yd(%*o-(YB&tsN@9{Mdv
zjaq}^T@7v%)Ne~_1yi7tdNKYsMohLS?u-hyTLP<sG5+uhdFyGI{qgl<{Ywg@?&C8h
zjy~r2{t#VHjI&wPMS&llrReZO>qp(mOg)A1;ES$$O$yY|F_?9`(SQ(r<o~;e240#p
z+@#rm(V+p3lEP=ejJHdr;#k~?SF^ZbD6k739M9}x4?6hxGL7FMkcn$%Uj2rN3`#9i
zYz9lC)e(VYxlls8V0MHzeJ|Y(07EDJ@Enced$gms4(;^g2tMnw(mHy|mb-xL_?n05
zx)8@Q%VgRELwr|i4g#TM(8k1_HZu`4U9-)mrDfd(lC86Glzg3ggyATKSPvbmr!Weq
z9&&NU3a4wdXVob<hYnWe^DhH^4fWzq)&k>e*JH$Dj%ll>e0qEwUgD5O6G6nZbZ^Ff
zx|-HfQALK!uJE23xxc#DaD5AM&Nz#r`i2ei5KR;GtEXX{?i2SROrq0|_2!Cr<rAbg
z#fkTN@L~By%u)r~g%VD~g%TsgG5+Kevizpo1uRL?%yLp}on?J&NbZT-pX8dEspRY8
zgbrBGWt;2#9A=V0n)Mi`U9F+{D(nnu$VB3SA$fg>JR>^=lclez+T}HqwJSxYIWzT3
zc9WkqNY_T$CB_54Q^aI#y0-6cM&e$wnT9E@VK1)IcU+a~8T4DPttv@4gE33LwraMK
zGP$jEgnm?cj%CAVlYZ;3QSE3uIWgpbUAseiu2-@msV=izfiQ3QqRuf)9SvX9*$G9R
zrx$erkBDcd`|!qe<H_j-ax><_(^bVH?KF&|&4+t9_zfR8>6U!co{&go30JN&%`fj{
z>${khMb>H49}k@YK}$J7bb+_e%8W$`%vh!~V_CwRREsrfU9L|P(gcz<;S~u9uhbJ>
zVT~-sy-XAL(-vuE0%2tuVXHJ@w0Gc)oQ1CP1iDu1bd_7;O0p`>jI7lOWL0QnRelP;
zsuJj0qtjJ29KY6{8DVP@2wSTWR(*PY)g;hWtJ76848PW$8CkUnWUVu7>ZaAhtT8MT
zudnNMAXS-W6U8v~t%r2dg!5E>k9?*v<2s*IKH_GhEN^wEF&$x3jVGf>A)`n!SWRY3
zz!P`S={TKx#jbv*VpL-r#LYT*LPS_m+W9N<hF@&dJ$BQI%cye0)=hqumV)%9YUx4u
z#f>;Op01GYbkY@Rr@jBgJ={KN&D6V?Khy10_{McN<Ehq>T`xM_RIy(=MFdjep0M`8
zZtQK%CP1M$c9EWu(D7E+b3)wCRJu3CWwMD}V$T(Ajd2-Lt(Tjqu*=WG9+}>ZPBGX|
z=?16KW}<}<iV9v6sV1VIp$r*`Wk}b`pk$=;GMoXyCWE8r6L~S1)7pI`RMiqeZGEC`
zXe7A7YIi*>I+2Y+oHJ#Aw_a<gKE5<)*sF~z`rk3HxNv4R4!if7h-*qT<eL(1D*E5-
zy$5()S9T`&Dxn@S2m%B_f;oZ#Vv;CPVh$iAvOpD~9H0WK0F+p$f~pE4DRnEW$quGF
z%4T<~b50KJ>>20r+C85Ayz80uuES?<u%|!ouDv_o*s~sw8+%W<@x507)oQmqyZTh%
zyE)%`?z!ju2czMGV$v4xrr}G34WFhkxmVV)1o0--iU-_htGnM?1MobS`_zLBwlYXy
zD+ld0o$w#Jwd@`yOWLVbo?%J*0ozjZ!-^{63*;kM@kjCRW1QhN3BoC*Nr{lxc25*R
zm2s%I_lJNUF`>dU?J4z&y)NV2PD1^|$4QYjn_RNyNBJgjyArQo?><Uywoj?Yv$BQ$
z6H-yZe^Rz^{Kg)5ziJ=!TGb;)lOamqk}H)emx*~r48-s7P5Y@39bVdkT3MDbY(8Go
zIBL|+R;|eA+mnC|oXgs$V%MbI^A=^g1~baB#uzTu358NQnW4QGHsdxgz0Bk1Xg`lL
zqmad0)IkdE3JGnT7(yTRNVJn1ImP<$`jK>6(#11C<hG+Coqb_V5!RJd9jD#(U_87|
zwuaOsYDgXATl|bGEXsw-KveZ>c;qE*Lz`3bvOQzUOY@TXpsVOJo$b>z{A@ruVx2;x
zCgq4Dpn#ha6H#qUabsgDnwk&6;7zPAMN+G{E^-SYJ?{fl-IL*6{BOO8aTS&O1$*;*
zoXy;;S!E7FE~6!jn*v=Y=O7aYY3#dEkG>7najGx+hOJhjX`nfP7#nDgG1^FEyovJ1
z&7S|Xe<|(i_?Kkea%u~irEM-Px4CkhVw5xL;I16zRCCtF702?so?87%wnLW((3U--
zA&wAE%pcDJes2)l0SiHG)3unDlm#N%;TdhGGv-&D{`l|zm!nVp#qV!S#*t4U{z@%X
zs#A^ODn(<Gh}zcb`Lisk<<}1*aNN`Wy#K6!*}tON;DV5qaLNqFR2T5&97*Ipg;=b(
zEoNT~JAI+fU|L8!V6CQ@fK}bcG<d6VEQ|+k8@e9v#NO)n#IQq7D79c`V-oRK56fxz
zoO9Z~;6+cv@*(%*dHL}!`4M(PO=On1IwsWWc(+nUOcu+NRk2fA*>BLZAGm?;aAVQ-
zxV@lZz!T~u<2~7A*s+j%w<+pm4(^K)CTqoIPEDln=^%G<``Sj+5{0Q&c*aCEc5c1b
zC7e0!Z1QRbpT+I6&9hF2H&OhsQMciamLu%fl-m96<-p_f67!`%gTmVySA#=^*j@i}
z)|nA;{}r6W+daO<uJmjynHb>ziRt`rVrKNMc61myJNl=r=o@8psg*+2JLOg{I5Pq;
zn+{#2fP<rU535$bRjUoMR`2>j)Jm6aG8F<<n)l2qZI)FEU`20WMqsc}`>h-{$sFVa
zlL_r~Ja=Apww!5Oq?3q(S9#T-LJxErlQ-=i`@P`7n+)+*5L}TqtJg5~>!zmfdmL%r
z_eeo-F9rB}za0zIIh@H7GC*3jDr|rPdeKc-ce*$Yo4XDjODkeg<U4O4{<VQI-b&GV
zJtMh|%B=NfLlE)33O#_g0TJ&$m0Jqh+U=4EasPd~z*I7hYF+>?ZMHt;zu&eo8W$dh
zp>xrqR&4G~ggNN6M53*|l6E(DE4KInfBZeyutEs&r)Sp(v~HKWT+Q&b{1N+b!u{@f
z*zY0_O+1(1C4SFI5NzjwGjDx*d%W=poZ_ki3iI<vsdfP1qyj%4UOSuBg9Q3D#s=^|
zsPEok@~rEj&jq3XAuWGyW(3r08yv+S_CLbM4azXPX2eUXJs+iNr_4^h8D4F>b`Wyb
zGtZN-=R@=M?OsEyYdO~XW1`marPTV3kg4#ay4Kcv-t(C^2))6=%nGAsek?;?HxcZP
zi6zB9g?1Xp<xNEGv1XAuV?Lnj`r{#WJ=kDk+|;#jG%P==^8C01xcrhU+x&5P=zl_i
z|9?{1EZ(5+w!4@$w!wbmMi{U+m5@4)(x<Wv4>l@(-RTxD%*64hor>M-R_xPR#-;8T
zzt12^{8?Gf=OjvfOCw(X=biV>k8)q`#D2?2*CDR0iS%n{*{`Gs8dZq+Lzz%n?o8kk
z@deED^Qy96<mJ`xB^4asN4Sb#B3doOWN(94jGNf5MYyuNY~G!@Equ}C#Qx@j5jPIu
z-1A?K)YUXplFY!b;NP#xk^7pze4s(>udCPyn*5n`-cyju-!KLW#T!=o-{g3$=@nim
zbTh^~;(v?d)$rEF-an=+p59bnKjEhkr6KNr$?r|Y{GSxRpAx^H7Qb(c-_MBO&x+sA
ziQmtQ-!F*YFN)tUrDEwe50zR20MVH7Q@qUL{$xs?2zRl9^C6s6zbsXd{skj3pXA`v
z82m5Y;9(9P!QfwUgYV|x!x;RlZtzhKK90e^<_7QQ;C&eU>u&H62k*w<-!Ou2Mcn;2
zmAHE|i@UG)U@<gDiMz8{`@iUd6xY`#^NqyX9r5*sQtqJ!DIGC8NAxaAoQ~W<(QXu8
zt9iyp&G2?npB;OrmMprG#<u0XrD(m<zXkbG$3ClNLy^rZ2CSTlx@+UKwZ`Uf(RwNT
z;V8#J1{lnXI<VDBT)kM!<T9@1R8!8~Fh42{drDD#TjM~CYmN<s;U}jDkzf(=AvOtW
z+mNi3qx6fFc5@Ky85D+1>}J<ErZzzvuyLy;I!&E~@hc?1%41JD4j~xXj;N|MT`J9N
zA_9pL|F?Al)T}_Q3$*De7RFR@dcIoFa?yrOS`=+{wG(WOjxeLel~Vpe>T1){r(pn8
zORa{O|18d3$W=v{=-Qeg#wo>)rHNANR+Nbkm^wBkNZ)DVpFM5*VeAKE1{D9MO>s@%
zlo~o`OAYykR$$WeTapRI{BBju?>3jbXeNaxMX_`QL?t@an_-uh!YECMslD5f(6T7i
zWdXvdL(6h>YpW3;a8dOnAwwF%JsBryZ<ZMzD>B211J{TBw32x#-R3>ijL@%;&2&F$
zE1j$CnmlSl8AFv;X96WU9$_V{%GwMZ4T<NN%#>m*tCbkb+8_a_$7UUY<WPNaef)y^
z3cMb54>ydM5S}rAW8iA5>bfq=Krfr{LNFbwaJouPt<B7rcq>C?+~o8SY|%n&)stS{
zBSSSvK5ji6&7;|78ot?1q%PYC8zgpV+}|PjraMjTX;YMOExePo^n1-$JpZbfsz2m4
z)z5l~{6k(ke-<uPI3z<#-tsmjgSkh&1@6V3*k@biBF_!ldM1F{_0n=>sAF^bB+&#`
zI+;xR$z~G$71dJ}-LEeZ3e=|RSrq*KEF&5mFfrb5x1oIQu$>2O=baL|NzX$;{H>Kk
z)^3RT1*<d8mX#zXF0bgj2_SSe<4fI>vFE@|V2y_aF)Fue-Cc&pyS08cb8QbR<k2Iz
zp&m7^oUQV1$})Fpc{lw-_in08=N*@`+r%e?hJ3_kXr4HBt)Xa>%m?ph!%$cMr1WMf
zpHsqpO1c9)k0$@Ldv*KVg2f(NCU51d^_7I%d&aqoUvb-eMz(j@?0ht{iPCthL!J}m
zGNNN+MCNdBCS<8m9KGP~bJ)XG_dac{>T{7Yz2`ut_kd@X49mV%F8fxwEodp<J{FI2
zL{XBmZ@%dEP4H?z8t~bcHJ&K%WfPl&(!{2!$4(BpAVcn#A-84B7;xGQ%S>bv!@Bft
zLrTi7y;ME8h`fXoUc^x%5-u|0m~KqTe5{qvd%>QdaQQYkh7n&59nXK#4hpuHyKL0K
zK)n&O4>Duoi8Ic91H8{X*8+Ca<W7!T#FO6AatWM{k=fdNW}_~qV}}m%bzXGm0=lIq
zdsIdn4#rdOAPub4$rHF+k$*|4yz+pYCl3;*ONoc+X@*}9CX=K5`B1neu!oiXuSb;8
zut)vJM&H;1evkW4&?<kD{u!r#j?=p%;sY>)=qdE#taAQ7{@SQ`HeI}%bRg&Bxa53H
zEY&>Lq~duz%{&iygNq55&GV>TDwb<Q7scPxrNS&+zZN>a9*0!dzvV3t;d@{L&rG0s
zA6kR4T9^h!$f}GZ-6!FihIwSsr+QT~DC8wfebBWNHR+WOJ>ApgRrH;9532=@-hBV}
zuqGQ|ig0#z#Nud5Goi1&=OmD(Me22jVIDTi2LuKtvhQojxL6N73tMh1Q))0gEG>qb
zjso`Ukf<eBy!cfRb0u6#piK#WQb+F8kuQ7k85OxpMP7!Hmp0A2)il4v(|j9F^GohD
zNA2^WlNT?7V)I4PMPKOnOd1kiAB?RJo9PtGPNOG#E}u92$LmubIM0Ccdfm&FiqmCO
zTRo0nCi`HbQUWFSa>1Lbl<N=CTt-!R^uRx7a<j$KRa9sO7L>?mgg%RPk@Y0TAq`;Q
zt(?zQr;!l{|D03I7Rx(J=nk-qFfn}0gL-VKC~ATVwuQ+`HHTcJ!t6vLf2IO3g736N
z_J5`VGkS3l+T{`ers5?gh;#aUN-Iq1cd&F&SUasN=SyMjG%_}t#Y9z1icXzF94&>w
zzTINLeVN4_y5-^oh292BZA6!N+A6V4XQj}~H##vC8>U^eVX&SZE)X1KQ}Mp<9_ozl
zp-$?d&WIj*OT~3X7uQ9_EqgnQ>y9q2n~Gchc8-6K$fqZA{CgH1|DLe%@4<TZzMb8&
zBDz~vP`C8GoyDz;E^Z|i*Z+1Fw<@~0RaD&Sw{y@3fY%T?=mU!m`asyA4`4mlyq(>$
zHo9BZQn#!%id*XOzD^zQB|hG_;_+SzKi(~HnT3werXk(+*An+dpYB!?eYi_{b)-B~
zs3K-6LvPq_z^!qkC{h=W8S<J`pOC-^u;S7?h6#zIy{8LxCyoIRV-O7LXx9XSL1bup
z#Goi9auQ^tDteTk8S!zFzvt_93HbrfRA&o06-G8nO{9*z^;|hsES2a>VYV<@2$@UQ
zB}%lPQwUXrJ~O#IBYOalOy!dF$48$NE;fndYd@R1p^T4X2AbavRLP9E!|-P%pSy}?
zOmp>0)v9N1&gwepoT^OD*Epmk%J(kM6zeeXd2hN}D3pcoytwO#=~u4jysHIJ%kd_!
z=E~kou2dPuDDZUxqQS>#6%mOvt$9%@P1T5eL=w-S3QbawsYj$hi9}@zQ&WNl>8Hrs
z^SL<>0{Pv{pfgR{(xD;WX@uiP5^s%gBwGL)6mES4jC`6H81nKI^Zl^YTcT3~{ymF`
z9Z|*zZlMA#ZUtIzr2;LX6+ly-aWAn0Fdyaq6T?rk9UN7ec2;LpmFdux(K$s`rd?Jh
zrme!n#MLn*i*<`+ArcSbS>$(tMN{$X7Qf}<*CT!)d$U6P`cknpoL(nK-zY-t7JsGi
z?H9jQ;<sA-AoYOwtw|w6(_bfk>&0(__-z!wP2#s%{I-bSR`J^=e%r-wQ2chJ5X{2g
zC4RfbZ%CB3l1h6NFUtOHdLr)uDOJzkD-JL5&%U(y>-qcB3lMfd{3ASX7oOsuJ48(3
zc`$u`;U&+%GyS)JyAzN$z28{y(yf&J?U4N;|87y}J=}=HDbGJ5en-XkG4VSteka85
zr0_eHQYq1d%xUbLUQXFf9fcitCWW@1{IlGdBjR^T3nwk@c)wR2@3VZo@5bYOHuCn4
z+mYC0N;%$T7CL?>0m-j_*XwS0hYzGQjL3k5i*b2}ySzmggl@J9+0H(jfgy9UQWhuH
zyeQvh9@s1cJE}MktjMPdbAVn|o_y!Y8$1}qHE+C=#>GzB4f_a~B^909Gy$?Me?x|#
zu4z^Gv|+8|*QF5=Q|*^Z^ZANx*%kSKX$=w3bj~5~IWqAZDD?{^otNOvn%+HR60l*a
z#ho7ENwK{wt;w2#r?II8#}9Hz9Z^iR<x=rTD?Cd)VQHgEs~ZF>-)bptSo}WAoSfLc
zX<Uv#=3;?HEylQ8jz)QBtp=q2wZLOYPHj^1vdhV7shhzvwHcIoGgyb4K{=FTeS$!d
z7dke^A;I+zddni2)g0G>n0;V`BcY6xAxdOQ7-{}$JvYty6!S!%YYDzk>rFrOW$OPR
z*wHZqDBlqX>X2p?@Lek)qwFi$-e&c5(h~N{B5sHf0p(jYG8cQa`yI3_I*%=NVs)vB
zRpE)X2`5%1bYf-2lu(oFGbu=P{qJH!k(0}auO}FLu;?VeTBv`~Q=#e3NHMq~OUEGr
zFXB)pQg*R2HB~D>{0Yk&Me9J8k;LniL?f1AM}^F}Vzoluyzd02eTWR50)@mJE-HG`
zaGTdgBP?*8qvDL~oqajPVCTMQTtX>l<5JpKe%8E|$(}H|@!b71Ht)10ygqnmd7CBs
z%q5%-NZk2K;;uOm)}q2%7hC$Rh7BlNXCe^Ql>f7}*FRu_@yQ#Sfs(k%d!wJupJgCh
zCw|L;VJePMdUzG5<1vkHll1VN$#i!+?&XfV$8gK0_eMjrbtoB+6`yE<mS8KCnpXQ_
zJ)x~@^erhWZm28O*4iKbfW69J&716iddgnoujQ|G{(An};BVxwP5x&7+Tw5JuWkPJ
zQAzS~N8mg4pycuG$lAfp7`!toIE}%(bnp_l_T6f0pX054J8tcB&elFlgnVrXg?lxJ
z@K;tt%ImMh4~6XSGLdH`(r?@bJwXE0NY8^5_3=6h5gUTl(hCIe;bW|#K95hpOSg2L
zC;$ftaFsK_t$Q|CECDZyQ_sv#O|b)SAe7`P0$)$ei*hJ)gvfR_GcXjTKy77GuU@FZ
z>wK+HeYTLdY7MQSo{)9FbaK8ba`7&WRVsk74Igu}6_LSAr3A+cxGf}nnR0v*`T!-x
z0eKmarZ1hKqiTN6%R?OOrC{0OGR9@t2>W1u0+?MI#2iix(HJUF^r8AL&(BU2s-siK
z=j$_~4~nyebGfT9u1bS}=r^<thBmcW^I=Z3hD?iH%2Z@Ew0%!D+~wXLK^;PNs5f4%
zRO;a%&*S5Hb6)+>&zhfJ8FAJm24nvZl9DM&`!xyL4{t}KuD6eeM!>rng$n}SEqIIs
zyj$VO2zs}{g(m0?_;u|;?+)04gWjEZf@teaX&tJKGj$o(oBYKhG%psRWw8jYi$!Q#
zEJFKY5jqx&&>0cIxX?G52k$Zx;{e8B&WlX|u$V3J)}3_@scsTWYgW)iN2Er!ysa)L
z$SdIQ;nMK-@p&C)vlGw!R<<R5Q<{~I$-H`RYzF|W)DBZdCW+ZzoXbrX09C7q62t#N
zG8)JPX%d+VK^iI!ua{Gz%q>`{u<$+%&w#@0hxuR&MnY6&Mq&;LCSA~U_8Qxz%|vFj
z>eezsJzi{CQgzbm8#`ntm5OCJE&q9SlmB*gli#45fG*w!-P9szUp<%7*hzTs`m&G4
zSeDaxmR;tNRP;ck_HQS1bI@**!j10Gh<9tQNz;JokOr*HXe>2<9Yu{v>$^#`#bj{R
zHWGh`LOT(+Oe^rWahWXuvKjZ+Q%g`Mc>uow8obq$ngL)mObKSDG%f(joFkCoGAbaY
zB{AExkqud?8Uma(;HjfVck+m0Fbv93FemH(KMrjC?4N2Jnl<}Ucl}SeSCY*n<ijmN
z6JyHK-Dc)4DuLm+GEK~yA6*{Q9BlvT`rZsc6m5~ZCXtQkWZ^<+#Lc+6x^7e;P%U7L
zjv7N+mLug_Jy#YR-*}AjmWoE38Q3dK4JZkxorK(yEsp4ogfkly9HDz!;siO%KqSiO
zbgRKs4>o%%L6@zG*qOIx7D+wA5CF@>Y{$u?27p>X!*I$APU!VCXpw0g1c@!S4eOY=
zI(lhm1pfONP0^){K-w4q!i8CU1e%sI0!`C;1e(+UHwB&*s0R_UKg54KnoLg`I|A_Q
zt@n#Z9J}a=r1gNZ+34%R5L&C*<MrhaV(B|*OCSXQB&>fj6wsn<Tr{x(_oOlC>kzxQ
z;h;B#4SGZx2SI0x!3Np|dwF_?Ty}I*OXT(KwMomj{At8=Zrt0-yu8uw)HMk#ok%A2
z;m|~#azu7bT#-02>Lh;+#@oSt5HtFqi)e-WB?0j#3q(5vmk7nwn6DI5fzr0$xLx#;
z*DfgP+B{t?Tg=XBGCHSCcTRuut#nQ^wy^mc!nT@|vZ>*uY@$h-?o%r>YEq_oQZ@%B
zWiwAoaagrc_ummRp8@c4nzwL1P}}<Cs~R4~Xu?I`Z+9M3w5i>OV@q!X%~yq$O@Jpq
zy%64!%S_Fs-E<VS`RlMnkHxrC6S8+(`Q9`X)a4s;&(7Pdb7DlH@Zg`HUx>`;&x8F)
zC5LBk>+5zi4I##?RpN(Xt`nr-sp6iMyatUkraB@HYy2iQDGB-b(<Zd7I495QZuX5N
zmLjk`){`wx(^K%QIvAslrWLu`=;$T)@1D2Vzu$6ooWuKf&r<uhl@R6uAj;}tEUe$?
z;8weXm)2Vc7Zf8MWq4Y5crBV>iy6DgUnE1dsocjox=o?3?tm8=V=oaAH)BqoxV_+O
ze_E~yA6IM4TCE#na<wv^bQ0~P^L}+o4;*VcuajEC`$^NBHJ_XP1ID`k9ed!KX@iNN
zpCG}Hd6WsOs}F^w*Ge?Bx80tV`}(7d1KdrwU^k`eix~FB&A`?vvrh%KP82Tq{qGSq
z*yAZ;QvwW=svR1o)>KQ%pc_T<{}hWFIljUCsTUlTpYeVGqw?sjj!Hy7#RL6>4L!1;
z`$@I_@4cwj^Nrzu{Ab<z+XJo7>sb;>_0w!w?9%WSsEnqN1+GboX70@9jH1etjYx_l
zx40=V-c6d$jRVE53BD$^Kop(TNv~;5@-^*OydWKsl3P?Vqy^Vh3)n`9652sn%%x6;
zxHTPidy3A70!R1==oITWNEyZ9GJ6ThN02INhEt~}y|B>fv14ocd)l!r9s9L~1$Jyt
zzld0Q=va|1c*@b2p3;t0>EG3kwdwC@$IA4-){edD-}6|FHTdEPe-XOCzk^2XAO_!=
zWpSdrBE*Rr8?$Z-6YO|~U;lP`FtpD&uYU**Q5$+-1T7t$Vq32G0QeUzkofx9`0XJN
zfRxS)rqeHfZb&YlzprrhG$p)LxOz5M&I4i-S(dJp?_)cw<5O-*40~V>jn#@=lpRsR
ziPD*pTLnYZN-ocVl`=TQKM#~k@BvaJSL=n^7ywr(7sM&#y?o_duC7Wjaw%#9q5-p}
z<KrP-m1=SNxa&>X+J255U3T3+UzjgQlq>93*=^D+tu#c7HfM8ajaHeZ#TPo$#BaS?
z0_P>{PS7qE6_Abduv_M-cS@DZ=foJ7xY^_5&y0KHVb$jMz)NZnO1iV&X(A)b{lJd=
z0}~kmg=B(35tml51@md%#e99YuHq&pyv#OSQ+S<pX(O>Pg*_B@K9h-v7AeQj78#{2
zGpZ^fQ8(H#ZU^%pK$5&&zBEC#S1EB9Cq<V^vCK{(u|B(XLtkcIV|QfDx@F~;M@Ctm
zaoN&6?mJqqf<bNvnU$F2s;*FV?X&CJE$b>lGL|2bF<06#<3Wi*SvT3rJz-RWs7Pz{
zW*&JswDOgLqpXgM(l4V7L`E5qQPxC8StFyYjf}E3Bh}Q`Xs}#`E%Y?c?scw77U7kQ
zk$@sI1b}UiIc^xvhEQHjCOXa9EHlVshL7S;+d@z;BAaf#ztP{MJDld~W|%1c7T0@g
z7OXpLGpx>#|912rG)$!^|CE;o=^PXBm=JW<xN=;9dhPfj*Q?t>_K||zJ0TumFC)_c
z%|xvCcVRAOc55W`%ubDgu-wT~rrsTvTH(2^l;Z9<d%UI@KGA;8BXdFOF=TZ%g0voD
zsq+A*xMni6!jh6jH^t!80`0(4Hm~Jc)|`xQhGZ2-e$I=MmoPvL^HsyrvSCTMSNgY+
zd5b25G6o#6SkfTaf|!DP7<wYv#LR;LH2yatt|dbT&24qh^KYShPRNV1vbMmTAK5i-
zbnK?fqMQ0)Q1|&8Db)`AhrqNrY(LLCo<K4TN#Y@qveT!>#}gnDx8Lvcm$5UY;-X!d
z*2Gc;pbscIxoUxAR0H_8)xyx}D`;4~B+)n*I{vN|5?=qa_;4r;ZdFjhP8tIZ7YHQ|
zwI#R!m(@eDFnGp20U)pC`B?=*I#(^sA!II`OY>EcxH3CeD%1-|ostF)#K~0)V-+Cp
zP_T+AJNmwyD}qcGlfshPwMk+K!eVqXL5)vdf*eI5)1W7cVTHU)J|h^chO5Em&dDT9
z%udc%t0twZY0v@{J4rppSx)7Or9yrbpC46wv5z={i2iJ$S|6(@<pl|iqdY8`bNXwF
zJKNIdN(h~xgF%)Y|FFju?~42c5p(#l^Qxz^BEj>jnGs8&D`9jS;D_Q!rv>+eqVJK{
zF5_N8(5>#gbCj<F3RW=Z-obiRKN2L}7uTyg>3Jy-ifDpG;?I?GlLeB-JgG!g5=DMe
zMOQP)R;Bei`lg|3h47EfVE$A-=%r08yiiRl3~9*><6bOvPlMnAtyWj4XnnvM0c?}@
zWRu^K0ujBm#L6<CjJvWnAE!$rFv1?O*?s&VKthv3UT%;HcqK{>djH9D9uQh>wX#1{
zr-_b$M>3CsU1l3GJ+gsQ>?+eCy}@qj4e6HN3_niDx513@0zieV$lCQmGXs8~)!LgO
z*97ujEf4fQ>Ire6uZcT7(QEg_KgQgi=(T!c8DzII*c<)XQ3_iX)>D#T3cj}dOQyEl
z$e2AKqqPV+AEedEw+Y^>;~**4gs>ctNs3|CEDIpKR#s+YS=j#%YePcrkZcGUk`307
zsK!&bZ*=?j7d_Q37IMS_KF8jh4BF!g8t)K(=zn2U#b6U`*clm*8sG8O8gEt?USXh$
zBoP%i2=-ADeG8jLfBTPIuZ=Wcng_j(nC6jk4_Wi&uU$4NneR}{QfqKyqo#W^xXsBJ
z_dD&(w>!&{`vk^^Ek-9Y(46lqs8HQ0@MQM=^(ME(=*^^DP+Jv81h3SeWl^+kdY0V?
z+_JYb#YP>I^5RK=5e52hhm;B1nUw*%Fkp8uU<d<l3kK}LfW5&0vbwN87;pdsZVv|B
zfdL1D0e51+U1k7w$01&HcVqZHW;g-nhIRz}JuI*5+ajZElTnUDMmdrh4G{51G2|Hj
zJ+8PWC*)bn?vpJ2zQel_xPth4z+w^CH#wRpw$}tlb%t#{b;02!9iXSwEggNZAxp<b
zSZ&g=6=oJnvukzSQ;pPdPfB&%(@w>gdTBVLE)6xlG;G03LoHNm^5lF?ka|jQ@=wx`
z?D|Jydm{BFtrXwC=A>i802L`qpqmTyETC0_0`EB_m%%YpsTQ9TR3lWZSY})knW6Au
zvkp}5EaWp=%!_-j%;~&`ioZzpO1~_TuSm#JLeB4sqSCLv1%*qgZcIulXZBwx7A6Y_
zzQW(<v1ZamSS;^ka|OQ|MDY7(uGH8-zfZA^R<Q-k4t)@ONNF^NZy{YKmvEU$hIb=y
z!A>^&wVbjAdP?pWy~=9^o`YML7?l~wx{jabI<AbUW4~QTt9}QJLi>V+_GVORSoknh
z^fn{Saw|fQGGg0nB;p#c3f6daM2!cQSmRaEHD0w?jaP-#c$KQLJ&)EHHW_R^&kx2L
zBA?Tst+iY54KK?0ayo0)&9=I_N@eBfuyR}@YM)&yIoDh5-e8T}2CF3U+lWNvPe#_Y
z*{bV$k%MUqBH>m#sq4Bv#NcG0(v)(ORn1Kj>bozh%^Q`L?PjHAyCq!9cB{XQHD$Lm
zlz}+*4b205Jnv7(v||9v;+xW-zsm1pP)>ixG0v*f->D3e?c%T1{%-#27Bq91&h2`s
z%rz9MbGuFlFOe{~O%VolCJb)(VA|HBtZ5O}+exyCHAGf*#%AVcCj_A|;6pao4~Ht?
zDid2)4xX8VCLBVj3Wp|`uNB~3nUz?<SQH|uT?Gx$tDv<BMv=gQ|AM=ko2Fu@0_PEt
z`s!>&<m8FU)E@zGYN?7^tZ9Qss9B2e1Fo$m%nxzz6jP9r5o?ewK}`X4HhPHW%$-v8
zz`rUlI|H^gMae4V^H58yaixrKcfc;K)y@DOo$$&QN(JD#R_R~Idvv~DE9MJCMom|X
zb3p9CzewvyA_~c!Mhr!h2}%6DP-vBjdU=%4Eex_ul08UgAq7@?=R&P)_CkV19?7NU
zK`RV%Y7G)c6#Q05BwDzl9!)NxM97@JNhmctRyqb;hFY_{v$dp@X^&RWAWVWVReT&5
zQgR%ZQes>#rqsAxPTTo`yiL9Hw<qO3+M&?DJCmtV#o@C_sP!>AO_$+m$8Xu0)=}-d
zjD7LsrFVPwX(QVw-JXuzhLq7}&yLtmDm3jz#P*EImIFvMF0u#HNtuF-Jcn9kB>-?h
zkH2Kmt!*-I<>OieS(%lohYdQ93hXDVR{ko<hd^cyz8sp8YXgU)2#I0OuD@qn)X~{F
zk_L1V%2RW_(wf@fOqGCX@m_ggYSKtua@WIIm~jn)Y*19tCMWZI!ZY6-sP3A8)s0Pt
zb*Hy2Q?13al{p0cpkrW1+A2HE;QOrRQP`dV+wyRhO8R0@Ww}FT88DKwBT%=USyhIp
z`z|r>_=&LHiMZQ}IAliDL=FYsrih$9_Etg9wGyFeFW4_d_TfH*tihoDFuj(ee51e3
zzumvXKZuMp|IS4bo8p#u-(8B(n76<^=A#IWi$!=cJAu$Zg0{$Rgp}6@(?8dUwy+Wf
zAi_>oX6GtpJl=uJ07qy6P?p5WF3$NAl`C*2>8CB*K7~ziIMj$b-wIRo0R#*lhf}$d
zIDwxnRPm5y*)urdE7EUDoYgAUh-iumM#t2AQNNV|IWj(8tAmM9IJn{C!5q>*7+D_X
zlSn?G7pT{sqhc`~)enQFIR}o8De=#<#lmIEuU@4h3$t@GIUo`8-f8^_yp!CVAePP*
zpDhTw1k!ob`<T2a{$MY#eN5r3dHDhW0AJ;ygDw-}Fym=Z)5%<Ek}QNMRuPW@<WI!P
zOy#ms53XOmIO*w%1~4LZEDd-itwu_uV-Hdn2-KuT_C^hgh76e0tMht9>tgik)td6e
zcGtz2iJlV#AjW~*D0050N}`ZD*bBup5Q!4!iz*U@)QjGfC}K+FI0ZROiEoHBRaBF}
zv>l6-91?rV7G|M7R+*m0_u4vrOdDP`dJ|^XwB@4LUPOn5vKZJ|z58Oov=x9UYEDGu
zHjL(mkg~X12@VX!KkcV>Fd3UI%!!pJnk$HEQM#Bu;67C-2|`kVcyi9<3u{Bho)iRe
zb;M4qoSceF2oUcPWVT$aV3}0h14P9IfiFmIz{25{um^uVi}Jw^Z7w_*d0T$YqjlDE
zXy6sVn4ulyqP>T{9k?2H!Bcv<zRzY{@<<fSWm9u}G#-wgPt>KB@GeQ?R?7DkOC{=s
zTjzx0df%TPDZ|3T{ZC|x|6)06M`S;_K4G1Si0}`_lk1LrWGv2)b~NKmFpCHTj+E`P
zXvt!E>Qf~&i=%CviljYTmSMQe6-}9{PZiV56g`ZgF`2+>HSsc~W%y3JM}2zL4~#V&
z4Oyv(!lzx5%QTE6skplprx<AI)|7lMYEc+PEy!4DH<jO5*jZk7^!=&Rx#Ap)*#$z0
zU#5Fgl5yxTG{dh;9I#9Wyg@=3P5ihdp>>!c84yg6_Z;9*n*86!u~!27N<qq{@a6b*
zlkb`$4HmRCnu^Jb#sISY9`}Bbby8QLRnq2<AUSM&o7H68H5o_9?_o<6SF-=tQTo)N
zmw@z1GyNq`-ei)<A2yzZX$o!}Hby5dFS#^;Y0%xoa^+CjwE8B~%$~N_ySYJq3`qu6
zg)I%LAR{fg@U3J9EIk-&dNxM@n|pDhHc?Y8Jt!7gJq5Mch9mUH1W$ZT13hm?UiDs{
z*a?4dIAnC?Jv@na7KgRq2{$ohE=Xty84C;Bfo)Bh4Ba&rg0iWj9QSu-SR1ZK+^GVb
zWSJ5xo>aznckA5%*Tn8Xh>|BBQnE)s=~^)q`Qr3|vXEWzE(FW+J*kz8Dt%otG^61x
z5vAG~yW6sAZ`hEbWROcMPfxtd;hv=72tJGYWZJ%KZNZrwd)0hcdt(#8H~9Sk-!Sc^
z&B>U8n+HffWIc&TLwuKJ&)>)I@Fx{gbqX$#>10xJq1T!qJW57-KU<}ei*vuj-&n;9
z@&Ivl$Z<PyZaB#uw0;0)L{8z9gbP~DKqFi1IcDhe>AC!`6mU;6bS}pioy&2W%go||
zVQV~>m(qzcCu6=RHIQ43x>fE5T863HnYG=45H)KLY70RH?^DzXwrTG>=?H%!LSFkW
z<3!uR<8?^<_Q_*pUuYr@ypsTYws@*6W9Q!oS?QSSaNX-1u3vMRKAX%p)w}WBqQ2ka
zk+cf0rme_n)9yR)9NWc}IczSxJ0!_q`EE6QMYE2K7-2_c*lwgC?#8OfCLCo$>tfqy
z0O-$oDz+p^<V=Aj@}_GX^(N3;l;oHR;76q$hgFkNK5<Z=GPpx9%EO~(f)lW^tOV`B
z1WH+;Q_dOUKl~hu5XPa-f53G*88!X84I<zaa%xSo;Iuq;&n%W6$bw-jJ@}lJyTk}(
zPmX)V?>^}`Cw}LpBSX26V^sVuNXPx+m&N@5+r{XbZkw)gnsjkdN~hbVbetxQnN3<@
zHt7MgNe`M$>NlJ8klCb%l~$HE-T8<+o(D+#35h<1Yi7#q4g`3XkE%oDvBgl0^?CES
z6ZKwCzT@(4qUca__j*E^kKV1_b`g)cTxV58v!Z6@q4T7cH-@YK5SKcx_RMi(13`$B
zlv?ADsB)f)C}&)ile5d&WcTQkfgYX69+8<(M59qZr6}9UhWY0M`4@Elh3NdJRQ}Vq
znE#B<e`YE9=k5G2s18&Y4qe(KxKZy`)8$QVyM1*=o69hEV?9z+0pTD$7m8GeWWSey
zI!KFocN1-GE(L|tQf#mko^}qZ=iJs`(&Caw+&R1#QC$6!KO0a;E6by$f}OL8#hd5+
zXJm|O77n(WASsaLUOz0?dd;cQQ{EB_k$o|zb!q1h_sN2vwF|x+Ecmih@Xm$>o9|y&
z)ce;}Cy$?V`|~;7pU;n~`YQTlO?Vr~?~pr=Ph~@pUVymhw&#_U#t$95cZD^NoAYj`
zIR`yi`4=K5!;1~_d&${@&TB$O96T>j9}KuveL9Pv7=X1q;5C|!T*}MAQX&W8g<Bs4
zF69-c6kWCFqpS96WTLPR<wUPJiKLNBLXdr3?G5jty#a3Ous8gPie}s*1nJl<`2f;9
zY0SSSS5iNoSAwh^B@jKs^L4mb+Et_qTxWbKz2_wT_nP!=zcM2HzKm3*m9$+yBWcI|
z_nToz4eVw*K{9tN%9Y#vfxuq5UG>M0@LtLN5sOh@Z-<5iV5ihg6)(82c{bNV-f%WZ
z7cx2=?h12tGSuHUMp#lZG)^$Pjl<5h_|k%GkkRska-^*O2vR#g8u0mmKJ7keUa1E8
zZulYW|Mi|G`2wqulYjWFB)_VXe}om>`#rB*xJ)ehlP&}FBlf*TZw(EX3kH5v$;f>y
zTt@B<|Ht^n_{SkCKpFWr@uip@$5=iN<BX@|*J|~(U46l&kEHBA?n>Ex!j!W6Bum+$
z<4s(5?D&)}Ip%*F7XUjxgGO)J@!51**XeWq=lSak{ulXcIq+5R>q{#1%PRCMD)glK
z`l<^3n)3U)`s!0(-%wxQRA1jxUuV?UPpB^(AN=a~zs6rH{Lk^%L;lzK>jD1@{B_Y^
z&R=7GAAddUe}lgs^uNSk!~Qq<>y-ax{<`3Qi@)ykzrtUq{geE4)<45v=l!qpSJwXt
z{_2gC2e>FD4pv4+8Iw^)BBQL3QSOb5@_>wTE;7o4GD;>gO23RU8X4sw8Rh=SC=bgh
ztKiBq2wz>Ix6X<_9v0&<CdRH`^y6vK)2GC!Tofa?0@;EmM!^OSSa12P{~7<&{-^vm
z{ZIOz@IQ|G-3b;iT_)PtE4pF?=e+QJ8GLv6pVPF|7wEuUPQXoHA|ma}B**a;Tpj*N
zTo?XVaYguF(`moXa!r)>8<h5&l=fSc_6(){2~3MMKPgWO)))E!KBD}j<O}{(mM<3^
zJcGeM?FQ#KcmjjJ?FLVBZ~=pV#t2@T=<ClaiIitqB4xh^o9MH*BKmqF2O2U*)<Y)O
zU-7?ntAekPzJZ*Id_A|tP6KX!bGLm>5!Tt<72&UKq=+B5L6FZd-VEX|{8(JmV!0?3
z!``4Yj<TOzu{qI6R0;}glt59Q+_F+m4E6>4!-j8dHYdJhy6KP@O3%DnpU;)fhA9oz
za}!ds0PQqO$0G7QjwFxK9rR3nsaPI4MKZopx<=+8g-2MB$PzxXU#+EjcA;7?g6U8#
z$S^;5yjrbXhMG}P50HlpAc+{PBj>EeBNQH4Stddm1nq6f5_{u@a+K1FqD}ze6Q>@h
zq?ZoFx=_&+Vm`BTeIJ<9Vo&O^oWsB!A{51;;Koo@9_OXpD!uYiX)H8~Fi|ZMxt1~w
z8BuwyONLV16)Mcs3<H1C$08vntse#<Wb%j%x=Ued3>X$JbM9ctrks1wE)vWvTD^Lb
z;L3ryZ%Kbip&3J%q*l*W>o`Lx4^zHG%BtwCK+B_mG`i{Uh@==RL3K0BuNl%Rbs28R
zt&rb*-PFdjVI!mpoh@&!r1%XXA#Fr){A#F>J?RV3-jOfVbH$P)H6-^zvDE^SoT$@z
zkYN#fAO1^8N9x`=Fql49ny*oCvCLmmCBP6<GP*|1NykqwB;`f@qQ<DEy8eO~>2N_N
zuAG!mTCymU)N5#<R8X__21}&L8F{BEH0MHP|1au<f)uH%ZHfFJkUNC!#{4WF>@1O7
zZ!{EqN^cCVkCDkKbGtCtomk>3;h0|AwjZr(+Yc7B@Ue9_K}zaEt}1-$V1CRwe4XRV
zIR$46;+)K%v~y6PFBs|sn$kb^A^1*{`g!}bC%(HP{PFRhLVKc-Dyigv#ODMF_2+zj
zZc#4>ZBk^0QO3~|F+U`{ZwHp!Y4UTrg5k^bGjAMYw5s=zxTlm8d(hPz&`Rh6tpp?f
ziVVMp_jpM?obpYca_I{&IGQzsV`ZRE`c<E-B9Ri{UPv--4fjibP%dSq&UCd-SaT8%
z1QV{&3D*Q_GoWg-HW0Q>g{^m_#HucnWIf^ci2=1m;bZ;=^|HQEy-jUmgbTyn<oR3Z
zOWaC&O^%q98&h&P9Xye!D!&m^<0apM4{-gXfSKunx!n|o8Ppo2P_-ST9%8ONCGwK+
zcXE>w{w^!`-K<)GY?y?9o81)&e-GSb@e4ae;SFKIdv*QqVR@gZn(xEz+A9+6$2KrX
z(SfW&TZp6N#~t*T8TSt+L0o`&nRfw)Mmi290hWS?;hv>e;V@R=9+Bus!zvt&s6q^6
zA#gmGXVhEyfg77akt#jtHCd+E#3-leB=zDI@0YM@sRq3x*~?h)F;UiWSqpf%KPerj
zlK6&xGwy9O;+`?%4x4e|y&QN4U_&a|B%3^<4Jm-|mzq6>``#4IVI{kBpYxdU1ur<+
zcnkB-@uZ2<q`}&p7v*MT)r^<;xO|Bx$HgSQh+~=2JRhiHPe}NK=Ey#zn5GZk*Z`x{
zGU%n}@L2X|@mAbCi<jjlxUwf5Se$M{RMUSXnH~iOH0*Ls()JJ=fY8Uxw8Ae>t4GSF
z(KlA$F0Hp7-`@K<f)+fL##eL%pUxeYUX|?dMPs$Qu{yJ(fwRLBcQQrlVk}bkQ*n7P
z8j^sIW~3z{xf6&H*{NRc@6qly7=Xvb?{VS(M8=e=#Swop36H=W?<rsg36ESb-UP=Z
zexTZid-Mhn;F{kjcgUWM0e>}#GbJCC^IFAAsvsgw$q6|v95Zsac_b6;J`NaemwQ7S
zO`;|+?ve0|q`-L9lfkq}v3IX2Z;*gj0x@yUdNPiD8j_;87()h{^&h5c9Mb1Q0v?}l
zBI1&p9%~ki>^9Bm%(X6{@jcj&rEIHXF~#-4*?}?b8q0;6@Mn#}wE+!-c1l^aQ_7zB
z#!F5sHu*JMh=VAer?ZV`uIJ2Li3jr7A(k(FTz)($Kc12w1^F>8KPC?8(nMh^B5K5C
zlyCG(u>@u`p{<uAwj@H?dS<kTO3qHb`8}+1uQ(5&Q=VD1Gfad%>PX@2fVFE1f$vq_
zX!_oxeC;8hQ^n6w@hMsSZYF+u6$ooU1lS}j!mP&W86~Ao!{#Mz-;Izs_9|Lf@A$lO
z{b%5va~XW~I;#Lq#a4W5Y<0<23XQjhVOiW`7j}z-SXBarab|t2L&Ue5U-#$vHepH)
zJgZV(*6)p%02UFSQ8&wOf5P1}n;j5DHgaJ$NG~?3@)h$jwVEX(IUsK^$)#<QrDa1(
z<6bz+1d!eb0_9u{E$0oiB+QL{4vbtPfOAu^Jn5xofvwZ8%!;a0pvixpnsz|H(wogT
z1djSMhA8GE=0QToY$};((?a|4q*6uiR*jKw(rZ0^#XH+=l+hJ}N{O8VvxzD?W=lx5
zk~t}@E_2q%?p<b;->uEGG$oV6b{BHDJ>hH-|KN_(3pjaSlp{gTm!b~RvS&tnSuf_J
z9Pm=ZTh1%yEr;?L#EpH0o3Grb!Ycc!QQ02Pe+|(b{n!2X$mU<m!hPU6#YmIzg#TV8
z&~%-q60A6wN(r1wRj$EnTDawXhk4I`9h=zacHOI5f(Uh2xLqJcvmCQR@Wb~TwQ9v$
zx%F{{Utac1w!ky)aoxkaAX5e(pb3XITB+Wz8#NIX+~;P;$)=f1>GHS(jbutvBn)Z2
z=HCd&GU;6@=d@;zHMGI*bq8JDt;d~=PJ~b0phQP5;6pKg#E>Mkv;LS>$4D~Lp8X#T
z&i=`Uv;RX&oBbbDvtJ2e+O-Xj?rFseJNjxp#LwHM>w!KRng)j{GR>V%nw8<>^CL<C
z<--ns0aN@RQOE@*AQO7DyB?3Y9{sj-N!%Y`=@JZe_&;%foBvV%n)E-$UoWYz{r(&L
zbzF(Uoc4cQ35eX}uOt4)m5|3LlsLsFl_<uWN-E(~N)+SMO2pzbN}%JjEF!br6_NRn
zDI)WVDI&Aa6p=Y>ipV^`A~L;@_vie3{Js9m{s;YT+HF36Z1j!e5b_1Ti^jE`{&|G{
z`6B)ECHm*fX#*?Y---XAz`{u$%CCe#QIJ087aA@B6-VA)&1}Akf4`RH{&`ek(5`0g
z%o^m!eMw3Qe4T{|R&nr34F0kk+{(d(zV$^NY@=_j#o%uksc!`u<C{tl;W7&%toLAb
zTy`yAO-&Uh>$Rb=%Y_0!V%*mZDXzaKwmr<;6-D+aa(RAs0_;n{%LP7am83N!cwBr?
zq%4&4@K1i8!4l|Ev4{`}dCKH?o<Fp}!pJG__+-8KYyksm@_le_zBc2@$EdN&C6UHJ
zewUw|CiHbHi+~Xr<9OYx&6SFi1?R~tUs0a{U45`FHD7&D1)Z4}hjpcl`8|L>{EAb^
z)r#fm)6dLPt3_MQsHe*aSb*RBs?I_bBGo(Y<>l^lVENqGf_%t+P%)(e2NgNgmGhcJ
zW4(kJaPPmfpHbq8EGknb0}4qgl)_AnNSl1Po|~Aj7xU8!0m@IN_^TOsU8I?5rD{<+
zm8}P~(zUB36QG;g@X%ZDH8OJo_Nt?vfkc;fxco`U{UU`JFrQS%Y5sq6RXfAcJb}#+
zf=3*T)g5INX1S&UUXM_;L)fWMiMrlQSo=ieFnd%hBD3ky`%oWKm0(E<yCSs%tPSJ~
zR{$P7w0d2d9SZd7GC@zC(>zc;dC!8c?@1k9b6RytJ{Qpn;#ihw)64jd!s^B`$(laP
zdO}IOH6j1LlfHm6l(`=ngs}_P*oOD-EZ7ElvGl_c{k>e%n5zy)4V$vK)yq#fJ2ds(
zu$y$V&>D^TI3!z_z}9Vdo~5{PWM0T<+jkZsK*Lrmz2uL22Y8)j$Z)E4V>C3N<G2LL
zd}zeFJImDLT0^pbt;vsy!Eww{BzfwD#u0=}J>xB7Hc)bMzKX}qpK=*Z$cXxs{h+Y^
zSXkfbOSaF;5<BrB<lH8>VU#PHm{OwWKD%0NC(akiZP}1@WXL~Es@1^C*lWT^Q0|<O
z&e6_GvLxEn8|8DH$3~-1C5&CO$=i@UyODZ!AR>-v|0a3K?bNe5#73?GN6^cc+5{b!
zUL4Mb9^U`fDmcH5T77WCjUG5!#1;{+d&vneG3mwf-Z@X}yd!SeKWu0|wsQBWF&Kn)
z8n!<_3N3GKQ&rm{O^7k)Z@3LQI5{k#(Yws?SH@0TJfK)HLXUMw5-s17{)JZ0Ylu<S
zp|`$miUhl2!JuA=k_Cn1bW%!!A{q;DXtR~ef-d{9e#qwfpQPT~NE+10!LxH{AP)+V
zREYJWWTqwyr4kz?E!GROW0i{p*)=U=Rx6iBa1S3Je^!a7OcxAsL_uHyP?v}R{{a2N
zQl;oD7D{<9Uzp0xm+Bfd41|*)7-WMi**k*BQn2nMUP$m?XpsrzTB!KKRH0fe<XMbG
ziKa@>FDW91vR@No42B7UwG2o{rIVFXrHaB~qQ}k@MIX$FY)X(71t}+FbW(Iu77PVd
z5siM*bW+_ALkXK|;E<JUtfiV7B~#WEsy0nkn;@iG22Be}`N5Er$ka5|i3UbEPUY%3
z26w8I=4Z<k00T;2B?zPXg#qM?CeF{D81`&nIN3dzkD!^x$0-{*zz?54mq7uyaU=U&
zUDSSJzAk2EMcSYmIW<1+?OHFX``Y{jH}Tx)L#Ho}jh{MwVeG6oF{~%U>DjsZRXyJI
zYOYM6vx0~oW$U>l$2c)Osw5hv%p&;7Z$s1&y@M!O%G-w60&fFvOA0+I?|D~F6s7Zy
z*UlHp^VD;=T;a;$O%$e!Wt?SjL7;zW^bK4y_z>MHWqxTIDv3uuO`HhhE(9I<!>qL@
zGKdk^SYA&o^I*a9>P9OBW>N)bTE<v06T@_cv#*CL4~kUfP9_(CkIB-sPu7Z~GB}O*
zDfe1s-@J^=m9-CzP8q#K`Q}P!6Ra*W6B8NzY5{068w$B{nWmGAg<QF8PN~b*M7pf!
zk8qeMZS0!=uUXFS-*-o_UH%E=?D~N4XoZKF`Yc>cTWAYgZAurUm2E6T%BYRy4nWjG
zQa|lL%=#|GYX?4<_(WNeQK*(=Q_`2*nr4Gqf|naXt?T!Y6g(xv9ggoJ`dXazjIvYy
z@~j(yKxCRkSWhO9x(6{ydS&VrSwqI8k1q%uTS;FCcM}tckHFhox(7P9PvY%>V4b9n
zlL^0{S${3ySS3i%gumJV_mDhL`Px1}_7B$Cgnt4dbDJq9<wrL-1I%dv-j&*1^rL2X
z7}mlQVv?+3`s;8;tmk(=QrT?QmIdO7Hr#>?I#KhuU2_}cL0PRm%ny2-&DS_<&a`B%
znf9v;5dyZ6AzHQEQ$BGoqHRs#ZA%8*mP$57v?}SgN)_vS7%Zz07_@}NxJD_w0cN*|
zAqEx<=Cmb4H!tSEn;6FUuO&6ORow*!N$LRJN~bE-Nzg!m4gLR!$z=z1+QD6H%SN>t
zH<**2@{5Ba9Yu3&u3(sp$t?YMX8W{Yp=KMPz$QfUcS-1^H+qa4qB5m5l-0sQhAiK%
zB%w+noA@@RbGk=;?Nwj<2nz501bBw5ul@4LCQyeJW*tPgCyga(*5W3b?_Fy01A#_h
z&DxT&Q7xL-CZ&?@NIIgD2Q#B`7ty>ov6NwwfD~G&e3Zu7zQd7FJ%Dzh@6<KDOU($0
zmwr3*JBF2kTY2L>sBXMc*Ph}YQnI;sFNRrvx5OCOqhGA<abA)R*+Mmgf!TE!GeM)f
zN6aOl_1}*XAX*CEc<EG1(5aLJI+kxxd-!sEoWztts>{d;4w)oA?DA}ER=Ky6%myF|
zaPGIojQQP!$NGsQ7TbjS_+(ZshB!t38{UFX4UCaI5%S?={L>lOz4|!LnT)xDPfN^6
zo!RH8<ZBWrjb{At2t(HeELR_NOadnTvoy{6**rB-10!TfbXd;*UuGkI_h#f22@#Bm
z`}bvKf))ih7`JVP9(G=scQF{j=Ez5vbNEhkUJg_yu)2($Gj8sj1ai<QU(pueNDM;(
zqq=}mcfnpT7i_4ID>@!XDsZQ`|4@=3oY3(|5`?ta@tANtE_bsh)Xw!}N)|VsB>70W
z<u`fKOG%;kNPz}%K}(bimrs_eE@n;Ke=6H&iJj%LmbeR^;eC!Y5N%?j4gu8ti7fBN
z1DKNQx*D_7U}<ZiVr_$7N>qw2w5`Shyf-NuWegpj{eIYS-=?X8gg?oIFAHGjM}R%u
zDFs}Q&>KEZ{0A9jXPaM;!jdbbxa_vjc@p=hNcbda8cCIK2V&<HQ~C~1#*{3qE&g;M
zf0~DW-~`7<Nq>e7KNNL3Q#?va-~kUdVW&g7J=uDWh*Yd}3Y(4Hu#UPR<zFHw&CqV?
z<lV2twmo6HVo)Ef2@y#))g;OIQpS`gPH~R7%2N=pwNF=XnJY{^(k)`NaLO{K{GXAO
zu2_Yq(Soh$LR<PUx?@F&ExggCfvQJxi&~)u&YrS?0Y-W4XYk1!WU88O-u&I8AHR9?
zCNMggHXNqcB79Y+y`+krTDv%UQy<S$O6an52*&RiTT0o6gChINuS;oie_jpzQfDU*
zu*&OMmDgn}FX~F!IiJMEfSsZExNW1+6m7TNBise@Sw6BWU^uT>b!f(Os+q|ciJ^ny
zNdDDiGj!f+ufdXoo=69l22J53+C<HBHW--{e%elEZIy!8b~Y@Fn;%Jbx_6W3?VNVl
zVtUWXl}tHJsl_EGw9J78WSivS)+P<~Cd>^@--aPMZ)^RyAg1M3y@GCqqK|$<n<&IG
zx=<%9rLVv8HBusT9ycvjzY8zI@6O2FR$-%3GI*I8Y!Ec(u{JMQwXv?kRNZ$6tGgWE
zZ<3&;BB+I<1{|@Z0A3{68xWD6tFi+3R{O<?M*BtQ_<B*1W7#16Xw!=qFoTz}R!?`D
zk1iDBWtHXF(z1MI(JWt8Sw84wxzSrB>1&3T%Pl5-T_t_=R+GLb66A5wq}L!RKJA=K
zd%w1@pv0xh{Gd}zfA_oJm6BRpKqjs6>rOz-=DK?0xyo-mJ3Xl5)o>fQz-uIE|I?+y
zEIhs}bo3=4@%7J(b1BjiZZMr;)=n~Y6^}PNe1cTm#}&I)ny@$x(k*AIXf@X1c*=ap
zHCwy_CBM@clz$bJ8IV#_#5}|akusmgn@B1h9wH~<hGoc&Y&1na(#O<Gwp!A@ntRR8
z+}ovJX-)ZY!_kD6uVH#7M%6XV&P0N<f=z(tj1-jUAO<Gb2cPrelX^@(ugjF1YKy5U
zOp-Gp)3%eRtu(3@8KqrDX^xB{>gkAw+ihmrv(x3&a!wbQYF)ZZt*qyGWewrVdM@yK
zS}hC}uGEL5syo^#0Rtg5vAF(KC#1h#P8LF+O{)bDte}J>)$1#l&kq+WvxR!~YM9kR
zQ;EKjr9(glL3j}9aRncO*)Yx=qTsOes;9C-cn|^!kzNxBCgAZu4hDvTv>~Vb*J#)T
ze&-8$jSWDXjJdlMK;R9~15onK5VKRTA%(C_37<K|c6IS0Jbhjym*^nFWxdyqRp!o#
zqU;w@>*Y82-f6rAvX5>1$=R{S9b+~@+cw&6liDZs!>xWvbGJ+BPgX1WU0Fv$wJO3H
zu?iHfOyRQOQJ9@5<j+)~yTwF+*@%BU6V^n(kf}ZXL1`q3KG>KN)NC>*M#`&Cd1fJH
z;}y{E0Xib=cS7?ioe+JXZ2Ag$W`{ujbZiBUTW*P(qk32L)pVI^4U;BdTx&8{o6G^s
z5>FnOsM*4Fv4(50B9;Z!Nq>ne{d57{5+jCzR;(p%&i+${Iq)b?UNu*M;cLxi!#}V%
zjIba2Ir;WI<h|MwIB_XB<lJpCuMcV9N#ZdU7n3nIU-Z5UwklYnN>Jy`^0BN1Ps%tE
z)*_%S7|@OZ9l?N34Co35EW?2AV8C(==m`e&V!(=EKpzIIGy|}OQn79ohOailxjzPo
zJ>6A|J?}^KB0X2YUp9z?yjoH=3y&|ZjcZcDXVSHN#uI-*1+GKy^*XSbm>*K}JE}@)
zdZKGG1-<Y|4P?sVBo5{jf_$>}V6rV3x)uL!qh#9$RDDv&wM+Sf$tHi0xOORjhj8qW
zj-A4>Q#y7D$1dsEEgZY0V@NmvU80*Mzy`%NGC}u!uyrE6cZ7TI4ENp@?!7zQd&u_2
zYV8r#+9T_@S2*@c$3EfMCms8RW4}@RJ>ezn4foy`?!Djk7F~WocYK;BLVD4Opw&9B
zC}h{$gGefOh?p)&%Iz8C;vJ-Fq;c)|@Ns9dSt4Gf{kw$YE@CLB{X0}9lDIu2RgcpC
z-E94I(EBQva0o>@KcS*}LBQE-0SVQ6vbOuMv_pFYu7|uDc@ZDA&61$sG3=V-mUXFP
zNdoksM2DCYbVAqtq&AK~hpuejDU^W3p4bmlL3WFrI+*&j9))LB%41S?GVPxU^!>5S
zkx?^Im(4IbZ46i7z3xmF$8FdgH!Nl^rGa-We!V?QFEaMikJ`zS@gtV7?Y+l>qp?SB
zsAq9^8&OO#e9U8e36F5A?$ei_O>V8vF&_xW<Gy4Pt#gQGWMoPE4asExd@=z{z5`Ci
zT4i5E(S@~p8eQbR42ka^;l3YL9l6=9(%rIc7w|a;UN44avip~iENdkb9euB1tL`EV
zuV3`iHSfRSI*$doWoNxNc6sT%$RqvTgrS_SUsk>c%6MZ4xeD(@QdnMQg;D?~6i~q!
z4%0CJD#1EFsI}RJ!|%WgVoctl$FQpRNY?0sq|f0ui!3iN;CO<YX}s+w{D*YkUqc?T
z@NzGebhJEtkp&eVfpZaKZn5Yb@_W?w!$Ka@g>0mkPXBTLi2-@hMUN-hqm4)1c$^$J
z<_sxegC9l^GwY8Q;8~OCq;@38WX?wn`X`BtD>PyoMQk%8%Duf=is;x|ew*!$qy*pT
z*Qke~ry?%r#<o9@<y1L`%3$vahrVF%N$1RG@4Q1n+!~YZHpL2fo>>7~J(%~;hcek_
za;3`9DUvM)7Qpv<A>H-=J@r~7e+`m&Dv8Bf8=DdL0To17l{)yH47oSWR`NMODlFIV
z)*&teQ^gWWbcze=CG{^|Rp^@%LNpeWv@sV=0LLkDNj#IAEtbUHrzXlk4-#i?Bx*Td
zD`;ug2!YWELDQfZXhmFcl!HW*S#BFmu1+plxD$Nr!k!(j7W06YDaJ#8Dqj{{b)1D<
zUgii&MddoxY^qWc{-dI@C|y2QEfmfuFAhCfs?^vbstzYlDVlz+kegBwK&+WeCl_mz
zBHDblU=?u6@-|{Q1)XvNyt&HU{G964x|l;(x%=tX%NUQ?q36WiH}tCP3c1qQNXGE&
zMCC-~ikF$6EmXl$bzyF<Kx1$mui%pfm~b9QC!ZjBa{>hBdd%eVEGX+r#B)$?&MH+p
z1F8maF+ZVaO$~VzBjvgII({9m7INN0Vjuw^n1;Z+j82XYGyWmE*iTeIg&<eY!HnSG
z<E28i?&a_=^%~mR#y@3I1Mfn$G7W;ffRKHBQdBQ5`tB@FB5&_r?d8=frDC3^7jqJ3
zbJgi$`5bWY=re10j{$}?ei7Cu7%8q7Cv&CY+?;m`#p)|!u*F!2+LiOU>bcz2%Dm+4
zJya-MI+eT1%qN%t^hq^4#XJ)hy%$4_QsgX2KOuU(<kiLhV*kn2tHmp0Xz#iL{Kc!@
zWpBn4J3=mB6uSwEoDYLT3<ipv1Ei=Wi;j8=74#SXOwL!)DJ9fVx8!7{EcUK>&<76Z
zof@Bt$7rV%vp!@JTg(+V*N{NN>z(#a@%Hgwj&{Cf{tHp+J7NW&e0&bZ*RJOD`GuD}
zrP%b^E3ZkAf>!snyG?=YwZj*t=tvu|2AxI<4DI5lG;}OOR33J8r~hM2WxU+)Vej5_
zn~t+0{p$<=MmqY^|HH!nDif?!<@cxm^iTg(##v=LR;PbQXEl)i&$=CJ{I%@8E`87b
zRvBk~djGgeut9|El#Y$u3{1UA^#Ve3@{{4z)Rc5=H67d1fAv>?B^}$-%XBRU{T=+Z
z)8EBkyZs?4J*sST?Dh9?^8M*Ibc+sfDe{6OCe<A-IY&Z}2QRvkXqdsB=Gfeo{?2#4
zWA%@b@1dpU8=Cs=TS|S8f7nWW<d)iWmzV(mPPXZ2`ts$9HWBmJfBo0eaXkHdzxP|x
zal%Y<GJW&rhr&=zlUPDhl;C;XYe`Xp;W%bGj+>4XrsE_#)M7rxGLuZ~iW}7#xEk34
z8PplWOX>_Mq<^QLwF!Gv#AWNOyjCN6r%}epQp@0M@3m6jcT1_y`RA?FneQw0=q=X#
zf|dIITTE?F^6V|9zG$T$yQOhmm;Uy*zb41k?Suzzy$kWH*MHE;Cve4Hq(Kjl+LI0)
zcctI=k@rc*Bk2_$<G_eJINZ76k}ZBuAO?_?Z{UmbcoL&p6&=5&zPpRpH#)X)U5(rV
zH{yo5^|GQc_Q5@VZd48sogGHL6SqDrTtcf^!r|x=CU0>L1)83}#iqCEis@+tRb=i^
z;l`bw*W#@h^paP+#8t29vX`3i;#Ds_>G`?R+)U0}E^gRf?=%yl-ZCWrYJ#SDL)p@v
zLY~ZB%+s0%%B7pRQZwM_Vh19ZcCzDXaI`Q)0JCaZARH1<4uF_z6tElZ4g1oEVG2Y`
zeHP_Bflnq%V%)zb1qYWA*J!|dW4V`J@LbGCNVklE^QNZ$@~AkprvR?C1FNvyEbt-J
zfVcz}EHw+T1CUMqa<ap(u;gePK%LDcQ^*W#gV1M^%bU*p*@uoEdNcdEHsGH@@{`v<
z+ErC}IXa<xdj0AMTTNW<C0morlFiAqUnNP(m|sJ&-j!Bh-40xj!ZT^j?`nsBN=s?b
zc@lZ;zQzE9$#^o}^r_GM<<Z}{`^BlYR(c#_@2ju;(b2ts^IvYFcN<AiCsQQVk1z+x
zWYe&rNbziT@i>?5IPE%)a>=kZD?RJQTrtucDdVkSzHO~eO5xY_{j?nOjxV7-?ZbAO
zwx~8x-3c66x7&n{;Cgqy<$A}5DL=Qy?Zb9m+lB+>qE-pEn7;z;014r@QZvp^jb2EP
zwhudV!%7nvTiI5bMz*Q(9BMRA-F0O0{;#U{<LBs(_c0r<#3Ub|$G`8wzwdUe-8OpK
zb*Ru63@Ws+2v}MH+2F`lMrQJhi<kJEWG264A2E_W{BmfUIPevxrnkmBepT^~-^IM+
zK@WJx?{av@v$?YPtk#AuUai#&v**d_Ep+^QACg}0i{BZ-K9;FGJC)`jBe24_mYT{-
z(W(Z5Rp-&lPA;E6C-Kxss%8Aj@jThtQ2{yEV|+a5b%k)xY~N~#-}rc#ugDPf-DTsZ
zD%Dvsh9-S-fYt`8G?d(mT`6O8&}`1Q=>TK~gyA4DIu@3*WqO$NMq)x^-U;uVm-Wt#
zd1K=52`_uXL;G|9HUO-yYN1q_glb^VS1EVfY?C&92Z@ULQUPUQYhJOYYX%LJ26;H9
zDdhJ~V>O*=(yMt%BC#>Q=@Tum22cj|=?E0AwDI<OCM=HFD$*fxC`lI{$Y-%p_}dbS
zS|;PS(xX?yIPDGMh#GZ-%B@C#nuTMqMMPc}61h7na(5^Sm=y5sp=VnFg_{C}kkBl8
zlL55h6&T#7j)#?>NJBnTNRX365(^kh?6BJ-u)}&`HpE;lR?2^s%6~QG*7`J0mG8tM
zoJL@PMM#v#8kRglLVPVt8lhty>(8mE>$TdPpfa_h%QdMt;)8~};hSU?yA2}@ac?Vu
z;bZHj7{%E*q90=+9~qwD@J-=)q#(|pv0Ce9BM+#d4F6RQ--6-Wg7pZ?^nILYtCU#?
zByvi5gcEF&3Cxy+m9U)?Y#(9ZWh;T1d-!Y^)Q{ks!zPT_kOu9y^Qdf+C|}hud?)FN
zM}`l8SV4pEHGusXHg9*4Vf)?wP@2@=qfyFkQ&W5oZIv&DQCMb*rYN|@K}&$3aVD#y
zGm&rfX=SE*ug!&zA#wmwT>Et)2ab)JsIj6!D2sTzR1v>psfKG0Dmv-iOebweI_cd}
zbdq(-FLb<X2c*3I+f5&9L?&5@7B^ALZ-5u(Ycp)8G~BNi6&V8xvvV`K8WLY3ju9@(
zIG?*RmYZNKGZq!DOAqm((69jVsBopOA|n;V)hwF<iVCqwLYwlqDhL)79CwY(vTA{X
zIwRmS;+j}A*9=(G4A6R2L0yWTcS$yANN%n^UsYo3(nO<_V!sSD5<|wp`=?2LmU6W^
z(WI_yy%bSb1R&VLl#V<mB&ei`OrbzkvM4P<qt(UGQ$W6QE(ed$`GP}Fs)~SozN{go
z5kAK!!ET|<dvv}^pHQ}lOpeK1d9qMC4rUy&48U#@Em3*U#|#_%<bMndwwjCrxt=cP
zC4O41egYm&$yqaM2i9}TrAjUzMiS#VY9aVpuOhm?bO~ew3`?vAu#{~=Rl|-|$`-0r
z0L08tW2hB!)yWwco^h!57}!*<d(b?#Dyw1W#;1zaS{*^$6c8Cs@sS#=0Qx43H^>Us
zjhJ@iQ5M528t|;h1Ue3-6~@a@07e2}3QUe4SPp(cKJWqB0x(s}dD5Y%R%X=##7J0*
z6H5&s_b;U4eMdA%+AW?CU3FQ`5}bV04-@2P>=Bi+=q8L|+z$eqi(Ie(x<_4A&YucI
z(#B-bh_Z7Vf&B;8LSAirR*Pqf^)azPJhZxcT&{_!VwqNw(N61Pl~)ZF`5W_dx}c}-
z_!TncDowh=mQ@<74AaKVxjiuF&0z0QZE348dKy)J%&Tn`RWm?{CMTxwslr@+MsHWs
zGomf%7iOv$Ex*!CG>pKC=?riG-oBwdLwkn~-f38cZ73iRA(s$5A<TQ7wTu7IZ*{vi
z1xSUrf}AEwO}Qiqv2oHSW||)m9&T0$IxVL7_qehv)0`ppm4l5#_q<jq?b)pK65HTQ
z+jELz9Gi~wwJFYaDl|Rlr7GV4<kHLvB?>hik|_&9=8FnKhHfLNWRs~5+L6H|NU_cH
z^FpT~#<@ZJfmZmmHl721>f#b79Bx+H*ky}Ww`=6JBxga~_~bQKLqE@Wzueqqj$-IK
z9))gGyR=<{*~)awqb0bPDOlhh2h!%jXgakQ|E|ay{ne+8XSI^YO2b1lHT#vO>?#I$
z>gQYIZ^s;<mQ`|ctX9M>;9so4Jk6&+3|cFG>ztQD4q9)J$k<&ScthBbj9Kokl<i*4
zmLf&>q95nBQ8oo<2r9Us|K^~7<L+B!SW6ANgHWt3GS*h4*gM^}Ak>Dx-88|fb(MEu
zb~_0ZD(3I9Z)dGs=mx5EvnM5jcVpctu&Ytv>X1Ml-fcJ51CSNWCNa2PrIaTP#CW-I
znZCMMIbjG^yos%Jn={LwH`TBAs3x`G^#?LY#mq6sZrNun)w{W%{UK~9>f{3%&0+^w
zGufMWsOB7W;K)7{tka!#ot!CZuDQEHR80=C%7KX=ad(#C8nOEKs6BEYfMN%b#T1g6
z+J^<f$U73D96Fj~h7QJvj;Fef;(15Ze#mRX&V&Q6F<{nL7v3<fpB;g2Lxd+my(Y?D
zjr8i{@`Vwz+?z2~)M1ovVvXz;9u4U<>Y%kMrMd&FuDU0wwCZnnP))wW#giGlV?o7~
ztyYBNCT1gfod|^%+=pQ&=@P$VKph1Mc$&a}Pis3ev_j8ht%CRHg2g^`95^M0`<T*u
zA@_-7QZ{keSvgz1CG0R~)zmqu8IBb&l_#ncqoG;}S}k#NQ#pxGy+^o!lbXHJ?*%rX
zliJ{z*-<A|!H0Ox?tnS_+nzD0V%RY;?wBueaU;eweJsRp7*Eld!OC_rd($!RIHKz>
z)saMvzqr5*PI-h|>Pl7#s=6ZCxdqIb+jbW*UIuY*xmWMN)HO%5_rMt5=ifUpa1VIg
zHy{%pb<X3hZvTaEBQp898+U-PLHnTR&w=ehAXk(6CfA%VR=u`TrE+P0&TGLt7Tzel
z&$nV@X|fafM5tK4MLvDIMUqdg%!_Rel287KGE0oU+vQ_{?LB09|E~0w-44iLKVy5!
zxNk~tsexsHsm1+FnCEDi=Y=rO`@=l5VV)Na&lc%9HZTTN{QWdJAK(r2fecSSF;l+z
zJ&m~c07K~|K~ajP+O{|)eaOh3!FUxoud2gC*yBl^`GxPPde|`^HlA!S=GN~atqa+o
zGP0vGY58kkY{VnDb3Bw8v2%XZpmo>bI%zRaut(^m$D^@@7v^I|lCOA6Df{upWkV}Q
zC2ri~l+!u7f!Iwuhg*DDbGrh4Y93IJC*^g>$f(_8E5_hU@$<YfJ;C*D)TSq_HucKt
zlegKcI9{?QPl%e_#H$FBsZU}GKKRDfVfdJ`M`qq%{$tX-zcfh&KrHqt#^}mr^tLF0
zY{oO@h)$@3R+l%)^jxz&K3ovqa-{v!N!@`{vdxqH7$;Ma1@PgJ!RxV;7$N;`|H>G&
zhF%X%Xbp`K#u?GjtgwUC&|u*1u(`N0vSH?=nxvt;1Le$`yF<GU4a@X!*G+_U-Go!Z
z*~PnVV$rUf2=BUy23<GNxa%fvx$6QAGrMj=(L?z_pTre7aGtYRLZ9Rp?UQ_XpX3|#
zNxpHP<ZrQ0LK<fFNnZ6yp+TP%IO!6WSYgpVDTMb)p+TP%8uv-zE%%9PnAs-<wQqOf
z9=6@1Q;&!`k|P7;&SntA5)>87G)|Fvta?TL*;ojLqn4`V_Cydk;9HNG=e+RvLob>_
zc>mwo6aq$gQg6!@b;w*}gu)c#of`OMw=pPkT;iuPftO~o90G}cMW)klBH5c}3ZXsn
zbTLm@v!frQ8{8|-ozgto_(sZ|$OfhFZ_p2~{;k~)Z)N0;{w=j+np*-Qe2~RY(Mvc~
zMjelDVq1K^@Pg0#J*)H0!kf8UxofcXJG~$Ul9ti!-jZyl2XRVJw~W5gCdP<c<TI0n
z+cl%^O*1!!Jkh}BK`&X6G=56c_&(71X@j<Z-P5r4JO>g?x2T(azv4i~Rrlev7-Gfs
zjsSXhPiPX5<WGxP=L2h1j7pQo;0xNCG1fjk=p`y%l4>8<wQqvjr;OUK@*vAp3eZU6
z2znmKvS{95Pk83t@irb1lf}`j{P-TIFLA$VUE-d0>^*!vNrQJOXzLqqWn>&AWifXo
zqgR`-<W6%U7qiT(fmlAaA(a^E<A1fpNsJ7G;M9JN(WFfZZ%$Kl>h{nt_tvM36BUy2
zg~JOd{xbvura)tdDHN14=){zu6LCGloK1Imo`j~s3vMaP+qdF_hy{FLRIe3d6(9`a
z6AAu!M1D-mkH_W5lky`kKML|=QhrQG!*LIiq)9SGtbQNXRYKJIp^VjMZ%Y0>_yjC(
zki8YX0L^ujOhDh=scmUHSP$SQ`D5*#Jhi3Ie$OK4taKBBbOrO0?GE3GB@AEO9lkgZ
zAJU%}oH?_^Inf|fW1C<JCq7s1v^Pkr-H!*_{fP28<?O?6!cZw7@$QVZLZ$;5JsH@&
zBqInX%Pc)VX@<&4335_4>M85cX87$?ezc_ZYgQBDg)4ykG93^zP9AtdESKxEO<8qR
z&u3QdCLX9!fPOeLp4fN~t2oTTR{}CzglsnFJ~2Fl<kCg^Ifzzw72lfLJ+^Fmo6Dl|
zv)16Ydwwm9yIylxT^nHS`E`GuMYQze7Gd~4t5RMDBc2J*AM~2U(RUTj!JT-AN?P2i
z?wI6OrFj=ln+s{kf`tb@l}*)kFdx7iBb!cP_Ju{Gbiz&}&OQnFb_KcBk}PV-v4V)p
zsP^#rw+qa31PFAUCFlrTGeLYplZmPA<|C%xpMTFh->y36+c@7c_tV3O#VdV4+Dz`|
z_U|HjQ_HndzY1|JWnWv5%b77VdmE?xnrU2hU&dOidiC~&yxFMA#)++OchD*xfa9hl
z>IrSq%Ub%9g)fnOh=rewWZ}y~)-s;{aS%hquVZY<RFtJr-=F7ar6TwH?|YK22z$s{
zVZWi%L&Lj*(t^QtY`jDu#?fh)5B=^eqaU4eLtc=e{=0CqUny$+V#f076J9SFUK+Mt
z<C4GPY(DFGKO4&Et>J3e*6^x+&MJ5X9=bX<lf-X#Dq^U?8^>+<0<om$kb_F-^EG}o
zf7<(_2>IyOX?gr|glzWf;d1X{Yh!a=aSV8meB#}pPu-b7me=s_^-PGrDC&A>-20&=
z{)S)$<jQ<6G!|#v`+R9X{rygK_WpqXBRqd^aMZYZaf{Q0#jj@+{=r^F-My}ugFkAm
z{}1Bd4`rkX3DXXQ`}twHZ+;|e%C5#4ne(GMc!{#ByOr$f3oN_3&4ao1LNq=UiZLOK
z%0kDw4oG-?d;IRk08u*41PHek%hM++SHJ?PMqjq2H?@GP36hMUz`6X>^DG>RIZ6QG
z@hi2-9OQJB{v}hPHq=WM&|WlRi;W5+ky=d2Ev&-4lt)Chm^ujnq7147>Jkvf)dFQw
zLKY<$q2*!vLQ2@z5&*jd2sws@+2bq=X2`yR$y)TQ@yGEAs9r$G)qvkph|S#N)c+t|
zt7RV*cvk>|Muu3>GOFGGpFo${)Ed44vYF0AKUm*3h0Wp#xv4d=3XnX|n()l<=?mcP
zOo=TiFcBrE7MB)2Tf!x4T1{!SHj^0;czteHM@+|!HNb}uG-UF!mp~o#rkt0qighBU
zkM|!^B;eC2eq9KU7%kbcjPy}SH@zEo^1n|IRk)mXE>>5WCQ8k?VctX!xxq>EWNi4S
z2YyRS+!ILL3%{i$?hPbf0l%dsUSTFi%Srq9|H0Ay;=eXBg2RV<pXj6wK-MLadM0YM
zc)nz>WaFP~kg%038PVr*Du(_T@$JFrmzKVC*T<ID^(Z_S==wzy_XHB_u3t29Zy>Sm
z`b873FcUA*_1vj(-KlZesgMEvF*^0FcVTe$-a;1!XYVa^VQ}`|LKn7<e*Y6sWc*9g
zY7$>7R16~Kd(qk#*~n5lUCV;{W^da{N_~GTX_0D#v~WwHh2)O08~HLDLt1Qm#BY7d
ze&4NCGOEVq<0YObD1qV+ShncW#M61gin2yZxj6=VF|Zxy$Sy0vIw@-vk$_Lo^>pYa
z2fhCi*Jq@Ox{kKN{7t|cA&WLhi3w8XK4qsEB5cVREKDf+G~ZgKdKmzt88+O|XI;Q&
zjp1_>EgS0V`TfQ{W*ZiYGC-gYC(izqOiA_GVchxsor+@Ej1<Hc;!w7zD#mR5;I@FJ
z$6Z-xV0UHD(zBeEaJOuSYU@y-twVvf4#99V==^pyNI!)(#%`0h_B{bhs_kI!0AcnF
zfi+`<#HGCl)=l1A+)0p|RG80-SD-xPb5X+Ykd)Yd!|Ew|956hjh<3tX$1S^kfLkLv
ze^c}%%LF2~M|Vo7B6M8hF;McAA>nrznXGhxB@QkQEU{h!OWYZnHwWHz>*&KR`gVCp
z-7a6`+vRQ#mfwp}nvtM|Rm#oHf$bE)E(H+c?{q-&>*@HeM(UBll!lJvOkwiUh`7@^
ziiL)f5+P1N6c_a%aEB^NfMIdhQeeX&02ASm5aEy#cvn@KnJP)9&Y!D#go>01oXo(l
z1iw%!l&9e;Ew9#68A@Fem6D*P7U@7t;P-jBMQWWUL%-0~lboBc&4g*})#ggYNvS&-
z93)c*${L(^@D=i|w!ng26g9#D7kE9u%0kQt;PSBHVieQZgFOFcza<^5mYtSQ8uT0;
z%vNk4erQn_B&b3gJs2d#rLX|f#)*>mVQDW7cjKobs@txabBDvCh|0I)79EndNpp)k
z4&%w10IoJ|9Kq<F>ZtDu*7ieIZO6Sub6b`*391P7ebq+U?cIl=lQ%CVds*4#H1I7?
z^T3~qhm<0YLf>Xg2ZykS%>-LQ$nx>H*EF-dLc>c0Yt|=UBILNe5Wpv)i2e9?mA)q+
z<+4a*dOV=I1@IQ+TR+L{{Z>SG_tUeI`4Y7n`Qfi(x2L6<U_qMT(^1JYtTk+L$;35T
zDFTFmc6gsSL>3Y3XjrH9izdgqUAV@$7()y6)*RN&${0qo6k`a9wl?@qA=6(&5D>FE
z&C+0inp_(UESe2r{b^4uPPNfUb$7&u(US_DhoSkc)rtyJ00R;=@6?mcd!yr!;L|x0
zMT_X0(3u%TYcV=9fYw4Cxhb^wllXWu>db_7a=f_Fo2b!EJG|tSHyyU9okpLGj-#JZ
zZ>`P$SHx=U<99o=1*ri!8ph>@ZMK)NQW1?AA|3Wxj?rF|OyIiN*JxWv#<+zL^NV=>
zrEA7;AfL&Gdjg%rO7G-N#CK^JU)|(l7o-T&k1j+HISL@$#8>?vbTxkMd$&Gxdh%^H
zL6FXvx<ygry2Vm~4Bd!0@2za|6<71$H)>gMvNW0_-&(v=Sr)Ut*!H0I)p%5MV3v2t
zH{qa-F0&Ea<kPq{KBpvL?slT={viVCYmg|yKZyYO8Vq^tr1=(RYPKnO6Qsy(A(7jn
zB6lqfnTsMX4+q-{j~sY2jl;b#BJ#$N$Qz>~uMLU3HY)O_kjR^&B5w|fyg4fJ){w|s
z0eTFt!h`C;c88O8sdjmHs_XDed>!86!D4&KeQZUO97AB{K|azgbUf4r$*zyZ_k=yQ
zD(kT-g}(j*ln?pgUwJcAmO0Po=Ggj7v6jhY2$w@RQQ~yG1XgDEh&wc(-l#MqWrej-
ztQoeijR(d_nFqZAp8)-4_!veQANU%rLY}S(9#vc07Eevtnx(4fLXEn(rd-OEdU1*@
zf)H$v5m&y*YJ3;l2CQqf*0OiY=D}<AYOy@6-%^#q*;%mFI|;UWE&H*>+DLh(P!)Gx
zHq6Sw+4=HVQFPqJi|&)MHu@W8y2iO0>zCVGv>5^u^@n<=zS<txK^Hepz6SKDTL--a
z4jgoYp-R6lfr}L`YGKPg&ghECgh8Y|$8!J8BP`vg51E$3;B~C=xznndwOnveq_SBm
zv-@qBzFi(bIv|*F2i|r5b?gUGA#8CcdJRVqa;U-KFKcwMq$u644b@<j<$PB)h=r5a
zl(C3pI{lyj;TPHPL$XO*Gf9ezU*+EsOum&c#ZMdQ^gsUNzoob!3`mww(BY@Q{nrfK
zo=nCyykd$REy#CnR{9!z*(0d(7T3E4ncmHQk7RoH5*xh5Ut#+A^a6zjaOL(-<Gm6&
zH81l_>nFm$!|VG&3~h8RR%JC@%yNbRFqYA8c?W1r)N37(N0#{LXBAcq0{|pb_NDy|
zg|6@nzvv9en*ew|&Yo+G^|x000R?cV&u}IahfE}hIPl~xcYBs!Nd}Thpylsh;1;gD
zF$fH!=0Pu2n<*6PxPd1o^`YgfP2&$@2TUGDI;7n{>4?q7Y_VCh-7m$=b~jNQFS(d5
z>ruBMg;LwTCv_U6UNbTnh(onJ7VNQ3&+Q^~Zpfgt1p#`#Yyn;<Svs@tHfd!Hx%=J0
zJT)E*{M&2`UfSVFG^{vEXyu&mW}NJg+7&P|IY#RWE4zif0&j!-4v0B*d4Va=2`Whm
zX{|SoZ<jm`nqV57_?~*W+|FXr2|W#xdd{cy(SfrdWg{iov*5otNJ%jpDao7#zh}*U
z)^z!K_Uz*^u@tZSO!4<F?aSR{OcdsO-M83UN+zwfq?guKT2x7=N7JZE#67x7_h<@w
z^zUSk_R<O5F&HztF`>G#IjLrdQ>&O=tC&$M+|H697u+nX6?q<(;>MwAZkmzjXsb42
z%cbZ}G|t21($B+|#m~d$#m~dmz<Jn2#=w&;`aA@~<LW$YO16fdhiOch775jPm=+1u
zd6*Un)p^(?R^v5klORowcAQyl=E0YsIKsQ#^(I>aZGrQ!-98Ulme<&oX0`5_Vh@e6
zI^FlP10_Z+ydc_vcG!g(nb3}sl+o8A=Ky3!5>g(R4(u9N%|5W-?z!hyrO_JLmNm|Z
zq~C`beN1XI`h9YQQdWc<jT{ez8p_m7XcH~#1aH&oO~EJhwv^Jh;~PQ?1g#Li9#kY#
z@_$YTYE<m)lBQ?(pt7@v$|x*dpHdvN(Cf5h$y<Rt<z2f8;J*{dOF?O;cHwB3j+Mf(
zQaV-%$Eu8ys7m;~h7I|4L3nZXcNr#vSB8793is}{y+s9g>jsjo?Ig=`jgmvw)_lt!
zYV?*rC|~h!bGl=xJc(V3C-E}#B=#at;$?>?0iw-A;(9q`i1`}$kP978r67yzUx}>`
z;ZLAoG(k&-rPjO(!*c?^^WyHRueAzI)`W{yaJ05SwDk;aV3=x|>`M8*Vu^8XO{wh$
zLIqLp*dYv<z|G#OP&g#0+da_waJgzTGs8Pjvv=@2`r9Xp{l5hsS8mPFXME86y9f?%
zO0x=54pv-Le0XqY#&0u*lVV4UDyzq2*^}jl78Wov6SUpvmij@J5<@_r;Df9kE5t&D
zyInc%4!BZ?O<NssS_85xq@ZOX1#Jl{sLNKi3gi`FKX+$zDa?d6BX>kb25tW!ROE6D
z>%qUhp<t41=K=q&42?l~@C$}g_3;%#{OZL;r_yrM9dPO|t;IV<vG-c16}M)MXPw%p
zU$HE?zY^G}%k^rdR2w==W}LxZ^Fqh%Nl16S8rvGWJ5v(RNMcxWM?ZudRu;7(20$<u
z%Vcq8e70C-i!<cS4)CWKWX(sa=!ndTfyvnJ&lalyMJ`jZGElLmN(1&R*e>VVj6~ud
z2UKtx03nOYi9Hk`sL?d_T!~$5ow`^?*YP?VuD-%f3bw2KPPTG$S8#WHyYP?`#*%eV
zk!{_^Fl^-T7_BNs8*4!KbBtXsXP}K=HU0MVC(*_wIy%x{0*A!+3cxdWWi)g!y><3`
ziA!)FNdxr`Pcrh2vCBjBT)$ghWtJ0sO6&;9DPw|dGQnz0K$1d%1Qy={0fuo;=us+$
zz0MBC-YflnRvlcWR18=91E$$w{95O)=dTU^#!*{2uoERWHp%<^=A|kJZc$s#tGwlG
z#4YF5s4a(~!52FIvKP`^??}D7(RRbp4PC$D>|Ck9-ne6+#-9=rgtwMbZlX}SkQ3X3
zly8LKkxAH0Kq7OpQZ`Hg7;1Cy<^yj_mx^VPv~U?e@Z|<YA#)`Wy<VMHb{;?yls*98
zzF<5+O;oD+0`m^tS0eQSRLs-cSGDl}ws&m3Q61;m-Lu}aUf;mC*esY}2w?6Q$c2yu
z8)67#?QDTGZA0QKIJH@4z1-5iR7wJEC8Vg;N<2jBU#Qf#Mo}wOYJ`xYRBfg3(3h$&
zQTvjI234u(e3!YMb9Q~4I4Ny-uy@X!`M#O?X3oqv-+UMB!y>qlCv<WNoFt1yW%Q`5
z9+fF0+8HjYrpd&y*~($r6YE-u19T8I=Ef(9e+*@q=BcGNP(bFLbaNI%Ip7Sxa$$64
zM!pggIyD7~qB3zt5>w1dx+8Hal3AxEA5y$L62)E&T6xaF!dk}U^Dv@v$rY2+pawfE
z=LmKPqj<=*S5!)Fr*%7>jtSO5HAjZ>^h|krQF+c+5YRSkpeBF-EHsUvFLJYi`AwI7
zQ~_i&dMLNZ7m)-*EyE(`X|TY^lPWzrzfifVCO=xG224<G>r*5sP3&4*oZi4fdmCR%
zPT&_r^H33nJ@~J`gt9rD?xz><8=&tElb8((z~%`~6xKWbCNKxS7RCWd4F?Yz4ByyL
zTs4wS*Jqvp(0a#^m_zmHq=r-VnKw2Rd@f_-pyrL?OM)K=!j#UPo3mne5XI)F%jc%2
zhFx&xFO>Q@6bY2LpIL!I+gHsB*i1l%xA<P(z(e+?8GQ@oYopmo%_;DSgEV{bypRjJ
zmXd%<xY!gS8EkT60H~5r7%SH$8rY&6*t%5FR$a91Mn7CMq<clOGJZ~YbJkLlg3YQl
z@fw@~TRDuYk`c8P4P$~<N|_$faA}<MFv`LDRu`4<&Tqeo5=1yuXc1!y)q-`AuA49|
zsQ=xC5h~UU0<DDK!)9c|<j^Upc$9#}7qCf_;4i`!uQsZ4l*8Yc+r>57T1*b?3qiZK
zBwN41*rS#hI?K_ARXAaxEHYWZYSywP@z^ysl>3dk;#+s4O*N5rZ|zK@ks|^+V&SA#
zc$1719DdOqJC0UL?iXycmhjgbe@ZPv3$eBCw36ClA2O;B>%kf;ouHx$jR^;^LD$?*
zQ!1_a+YiG-Y)#*dmPZT=EAyG8;1>w=f$XWK?OE<r-iUWSzPs{BFi&Cj9;w%UC<{e5
z&`_ktuCXV)ckTr~%zi8EL9?<L1nZVvY#+EKsAWr$8r+-#6W3%Q#K~{bocy*LhY3?+
zyW5C--9|9Xj(`iMneYIyrxvVir*^FMsQ%J`R=bWzmkJrSl9s5B`LLTN_3Eu+Rf#z+
z4+^Y$H^OAsx6!u+$+)dZH#ly6nP5gkFe4kx@WW9QBh~!j!@Fh-6!sXQTgu;S;?Af1
zL3n8C))NhX_Z74?UhbOli~Vr)>zorPK)Ev7U(i?dN&kTHYt-aFYG1B5`H$i7{48O+
zDmq20oWI{|MUz1^CTxU&o62V8aoqIKiD8zO7XN_P!iD8IG#4u7kJ|Me$7`32QJ?S+
z;)d5J$ZcDrm(5`b6U}qvnsRfN^q&Ncm)xihH(-i~Ft*`2HEqWU)hMzfY}0zk8NyK;
zemlGHI^^Z-*rHe_=lK!QMiCMv4;obd;ov#pN#$|b7-n1Kda5`wN?}Rs4vD04V~oMT
zW;R5Q91RK5&JCo>1ZuR&&%^gL4&SiQ-3Qf<oZELzb<d^@lfv_S?A{Ta0SzHYngO1L
z+?fG3qK4e4`VgRG+X!9A`al2}-ez)}kix>v%7?;}@P`08iwB6Zc=>t8teA5XbD-sJ
zI|4f#TB?W4QhoSFtFp2tR{C$O?lc_j5|6luBO#PWEx%=0O6|N;qPiM3w+~=I8x;ff
zEUQFem-fp)GXBMBz#Tmx{|4<`i`P_U)VZ{P@!4ZI2-&!iC-k}o48^f<xS6AR-#8xF
zjSjk)OgGw{7sm?v64sPeo54`+a8<`O-}qdOZSX|FM8HsJ);oN5R&&fx1woqGWM1-C
z%*l$sIItU>!F60mHc2wwMCE_0M0c<Q&#PhXu<f!GBU+Ge+Z5{-%1lLNdQq9_KqfZu
zM7?nwrJmy#z&-B|Mk@<W*^}lg*hGPT(#nU<FPLg$W&(7g$Pg_g#}q5~f@1W>c++(G
zsv_Ao2ysull>3&<>Jv2_UU*dIRLB*;X=K{d8p|1d8S<hQN`5<V@?#O>OS-^!{O|G(
zVy>yV(D(e8Id#^5g;QJn$2j$>KhCKMoto6CDV>_usTrL*r&H&3YStg-)N4BReVv-q
zsd=5cpi?ECT7cAcNWJctNtC-tKNb2R@0<RmjCQXv%#^qsArhxcoYxBxM`-)4+L@@x
z70kYh|KBKb!w$m97t}%heOR@cq3j**BuaP}m4x>PMP9=B^$@<k6nwpzUk~8xvh_Ni
zeE5f2KK!N=`1sA*&f`GTHH5-Iaj)gK?ErbbKXszM_c#m4$cj-s%yLB#D(V=OD6Yi(
z=cg;>*~vx0+_NRN#Ur)W+8>{rE`#iJ!hu5JBuE|0EW)f*O7keM<F@dfzY)g~ys@1K
zSR(}Tj?cq_a-js5TIa{7N|#L`2>Ce&wOVjSq-WPPzF@K#i=D-iOC@H;2bR5(Ad&@!
zlGM``ve>}Dv(U@IDeh<KVg=q>rX8-|yz=<etQ@)u`qv{zdsF4o0!50Qy#UqBPhYsm
z*d|N!6Qx4w!qF)hzuI!pDA#&5f|FXwvYsjwNfl;M5o4>Cuf`6Q>e4nq*TCS|gYL*(
ztuYmgrMcM%n~b`FSnoH{;mT=i+-j|{9)1x~WKwy*Yls#|rXvKB`bJSHIry-q`B_}m
zf&xY(qvRV)UqOGMZ!GnGz9U-jNGD<RPo1OcPy#a=Sr}TK#UpCo@_ZdE(Sr32is~j5
zKKgC6B(GBUkNDJ1?2$*?6ryUC44&J;#$dG5&aG@6{^u;^ck;QrtH8%-c`R$NIoKro
ziA|ehb`%ZNxwJd<hGKJM2qy)>Y`}u%5T9WG$u^jeV15wnp#tkJ%3ZC;0cc}|`d&Iy
zwzKP}H6hF`h`A+*c}>9<SL8!r&9;)P0m~Oyu@=GBhQOL^m0JV0wqTTV6QJN403*Ri
zE(o@+z$(QE))xY6v@Kf<SYLtlnFI4Qt>$Si!YM(*Utd(hWIOj^HYjj&L28JB2>Mf_
zdLZ8Aa3*&fC~M<!BXy7^LAWVf&<W@C7O&aMcuihTMY$mFTJJOD=Gu_W61E9-pB>0I
z8L~y$Yhc`1n^>*g)h_bLk~w?!EIW|$@F!R8QRfQ7ZfAs+WcCSvz`QUh@E<UILl7Lo
zvk{`iR{L?oV+=ByS%bCT!3sx*%$+-T0)iC8oFdFggPA<Obq5OD*k!GI;i)w~wAJG-
zZqU7Z_xPyg8HaNen#4G$OS!;cSm4oUkoxznM0L<2o4*Zd<Zq{+9cH=T=^l25N$|2l
zBeWGN_NZcS85PGE$-eMNzW3g*MCSJG-#N9Do-X@qUaIzGjrO25Ub3PjRg{cX(K5z$
zU5dt)1mS-b)iuK3o%yG%m8!pT<%-DMx^*jp=B5>PgNUBg7_<!};lPMQ9B~4!-QiTd
zI?UD?qHIEhJS{pM-jSpZ@4*iLG<sQyG5IX{sBA#0*2MAxz3jEn*$AR~U=X<9#qP|%
zM7{N8wT(G8{d?5%5*yfRRj)O8cDJmVm=YnEmd?QZoTJ(7HQUaQ1o`dc(HSIJif0L;
z0<x5ZzpvO$QzB7!N?4`cZE%0F+iX#w>BUS8v}ppH<J-*%?yRsWXLF%#SZ8}#FI%^A
zX7?U}aO4f5ajVEq?h*dvUXhs`6b+O6M0#?+@Fow4Q_1+7Jq6v(2I!bvijM5Yl*nhV
zRZEjFNT()dbG|S(XA(FKGd^0CUy&t|H3XWLw3`-xp4d^a28*`0SbN?XpR%#r=Y_CF
zEf2}4Rt8HaMd+(ra{49w1AN>YNQ{dJJ?%&FMDZB@f4o3fHrm}8h~N)K9tE8+;Av9B
zM_U>c(jD^CoO-GTG`@V=e}?65>-@u7!E$J{dIIIT{;+AR6&u6~Ao8q99yZA#Gan%(
zk7P$tg~jhRWk%=#w~=<?&FmnLcB)<Uw1<B75~Y2@gu3g;meyTApmf)dN78wDI_b}8
z0pMGX0PwBa0zgaI>|V=HdI0kJCy5>P1%MWi5dd0JL6ik9l1im5<8s7bAYnQtv2hp*
zqr$1>fR=<yIR}}Z2jx$6Pe}qZ)JnU!K)<K~i78M@FI}4E_gZrll+k2i_`$M}&_yv<
zmE@*gRf#LnLbfj^6^kPUv&5KDVoOW1^+1kAm~MA{jdHAjcD<@0bQ$RD?LDin`gVuz
zTZ3Mpb45#+s7a$}q8luTMtNBz&x=2G04Lk5c8-=JiF;&TtCOcLv@JX7bZ{eBO&UaS
z|4mA4Gw-6KQ3)vg4tRLOqlZp-*pi`#E_nDjOAp=f@asl;cnBWmn(3hj9(vp8p%)%@
zftFlH2TC+x^xjWa*E2(T^X5Bzu(#P25cdS>lt(%-O9|>|YenXS&<FVC!%I$ko!J#m
z3w3xN92^YF2qLyz7x|i^4tNl*R=>$=hI}na6Ri4|lqMu?X4|XThGfk)BqQ3;u4%Z!
zby#!`OD2+hY_(3XQPresR+Fkz&E30qbv2nd)p*OPMo#3H64jk`XK&~P6`pMf{n=-q
ziOfeI-HI{W9Huo}7wernf8d5KIe#3s(ZU*Q#M)WhV9Ok0kAph>27o1X|IxY<YeNKG
zKL7mlukYJdvOI64>#+KGKdc{e4c;QY#2WlHtqpQGI)s+Pd{qm>-sTnB*7klGl15DZ
zZ{oJbG<>kF#htyCM!l`wzWqVmZA~@r(@#H*xqC$bfBf+uV{THlYF_3hCA<4p*7{g)
zKG<g->@zF)u_9;pRer3$Z+I|!AI#qWNiM0$d%z_jt$9lPe@}hW&j*}X+%M!4@y+4H
z_|B+LUr0R_bs@DLg_(8$w|;dYwK4j(X_LNfit;R<R@(HNxfrO&Z{?eufne?7dze0T
zld~<dfy=weF>c`AcDxI{UCY(S8QZ(ik5d45{oi73J$D~xmg8LruXO4<02%}J=@s<?
zbb7(~07C6$;{pgma2pRmL!=9Szg=x4|BH@(YTCuy7ZR4coe$Z24otJ4yPZaL6Opsr
z?c891EiM4wmPP`+%m5EZ)X)?Kpd9*a5MhTtVF1URJgXi0G;7ls<=m`Qdq2bMRsL%J
z+S|25pANs1Q(b;Hr)<YRYvOuy%)@8g@~TWWiK-;6{l(7BE><S#JKK3=yfQ8)?xk6{
zJ<V6w2;t;lXVv$cmn)Je<L#l+sxPWqnwPAF95t4#T69jVS_-mAi>N+?wOIGaIy8O0
z+AU0=`q(XR6_NuKu4Bv46>7dJCr?CvtXhuAB5h!&sB6(~L$J;IDHgVMa`ZdI^^$0W
zrB!>VbbLxO3K#m7a;a2tBRygiNc8~b4AYAo8Is*40U#p_E;vby>PNe}pTZX&`8G`}
z$9_r~el7%T#a#&IW0b<EvM<2u;Wq>up=LbQnnfCo$&5}>?Fr5mBvO&6D<_h9j79lV
zvPhSx_99jtsnj7n&TS_r7UmgQq+3W9SuE{fHDBE*YIskL{T<2usMDT}W_!#-_w0;V
zI45M09#P#~dj+6x9sQt|E=xRlA>6FkBd|%0fUd`J7KS6><ix^!R2F$eR99IuhE+=P
zKq^khLiKl9WV5(_L}cItCFK=MMMWvK7=8uRS&q(;7b1mEJx6?XDhOrjP{d2x3zQw9
z{gOF7RG$<zZSnH((OA#1dR&x6wumrZOIru=TF<c;&aI-_;SRSR=uU+(9=2b~A_L<3
zE0Qd_nZp+sCI7~Kbsi#@P(7Y8hD<Jw9C0j38#OJCUfv8wqF|M>Uod;6=lpn#IX_gn
z0IcfaayjnT1j9D56y_epe0pIScwzOOQag2&7gEG(J;%m69m0Ahfc4BWu|6Y<%!q1>
zSq;&NU0$9L1*T$QIVp>rGZR%}p=K~H*)Hoj7RK|k$azs6sI#IXMp{JCR5M@gQ}tN6
bv1&Uai_97hg==H1k`i$-0X6>v59T9DW8k4|

diff --git a/ext/handle_video/theme.php b/ext/handle_video/theme.php
index e8b7008ff..9cc28fa58 100644
--- a/ext/handle_video/theme.php
+++ b/ext/handle_video/theme.php
@@ -50,7 +50,9 @@ public function display_image(Page $page, Image $image) {
 
 						<!-- If browser doesn't support filetype, fallback to flash -->
 						{$html_fallback}
-					</video>";
+					</video>
+					<script>$('#main_image').prop('volume', 0.25);</script>
+				";
 			}
 
 		} else {

From f9d0c83d5b3094104e6d5a5a8e253c5a9634cdc2 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 10 Mar 2017 19:18:35 +0000
Subject: [PATCH 236/250] .audio > .audio_image (.audio is used for modernizr)

---
 ext/handle_mp3/style.css | 2 +-
 ext/handle_mp3/theme.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/handle_mp3/style.css b/ext/handle_mp3/style.css
index 5a6fa3f83..794392e53 100644
--- a/ext/handle_mp3/style.css
+++ b/ext/handle_mp3/style.css
@@ -1,4 +1,4 @@
-.audio {
+.audio_image {
 	min-width: 300px;
 	width: 65%;
 }
diff --git a/ext/handle_mp3/theme.php b/ext/handle_mp3/theme.php
index 039eade84..95868018a 100644
--- a/ext/handle_mp3/theme.php
+++ b/ext/handle_mp3/theme.php
@@ -6,7 +6,7 @@ public function display_image(Page $page, Image $image) {
 		$ilink = $image->get_image_link();
 		$fname = url_escape($image->filename); //Most of the time this will be the title/artist of the song.
 		$html = "
-			<audio controls class='shm-main-image audio' id='main_image' alt='main image'>
+			<audio controls class='shm-main-image audio_image' id='main_image' alt='main image'>
 				<source src=\"$ilink\" type=\"audio/mpeg\">
 				Your browser does not support the audio element.
 			</audio>

From 2691a6bbdc154db1f4492890e68989cc098fb945 Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Sat, 11 Mar 2017 18:34:36 -0800
Subject: [PATCH 237/250] Change PHP version check to use a configuration
 constant, rather than a hardcoded version in the code. (As it seems this
 hardcoded version number is easy to forget about, and then it doesn't
 actually get updated..)

---
 core/sys_config.inc.php |  2 +-
 core/util.inc.php       | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/sys_config.inc.php b/core/sys_config.inc.php
index 50ac40a67..abc007661 100644
--- a/core/sys_config.inc.php
+++ b/core/sys_config.inc.php
@@ -41,7 +41,7 @@ function _d($name, $value) {if(!defined($name)) define($name, $value);}
 _d("CORE_EXTS", "bbcode,user,mail,upload,image,view,handle_pixel,ext_manager,setup,upgrade,handle_404,comment,tag_list,index,tag_edit,alias_editor"); // extensions to always enable
 _d("EXTRA_EXTS", "");        // string   optional extra extensions
 _d("BASE_URL", null);        // string   force a specific base URL (default is auto-detect)
-
+_d("MIN_PHP_VERSION", '5.6');// string   minium supported PHP version
 
 /*
  * Calculated settings - you should never need to change these
diff --git a/core/util.inc.php b/core/util.inc.php
index 29e525b3e..64b49bee3 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -1600,14 +1600,17 @@ function score_assert_handler($file, $line, $code, $desc = null) {
 /** @privatesection */
 
 function _version_check() {
-	$min_version = "5.4.8";
-	if(version_compare(PHP_VERSION, $min_version) == -1) {
-		print "
-Currently SCore Engine doesn't support versions of PHP lower than $min_version --
-if your web host is running an older version, they are dangerously out of
+	if(MIN_PHP_VERSION)
+	{
+        if(version_compare(phpversion(), MIN_PHP_VERSION, ">=") == FALSE) {
+            print "
+Shimmie (SCore Engine) does not support versions of PHP lower than ".MIN_PHP_VERSION."
+(PHP reports that it is version ".phpversion().")
+If your web host is running an older version, they are dangerously out of
 date and you should plan on moving elsewhere.
 ";
-		exit;
+            exit;
+        }
 	}
 }
 

From fb3cc1832f54432b77dee241ae10b0a0cb14b767 Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Sat, 11 Mar 2017 23:19:37 -0800
Subject: [PATCH 238/250] Use triple equals, because PHP.

---
 core/util.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/util.inc.php b/core/util.inc.php
index 64b49bee3..21a451ae6 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -1602,7 +1602,7 @@ function score_assert_handler($file, $line, $code, $desc = null) {
 function _version_check() {
 	if(MIN_PHP_VERSION)
 	{
-        if(version_compare(phpversion(), MIN_PHP_VERSION, ">=") == FALSE) {
+        if(version_compare(phpversion(), MIN_PHP_VERSION, ">=") === FALSE) {
             print "
 Shimmie (SCore Engine) does not support versions of PHP lower than ".MIN_PHP_VERSION."
 (PHP reports that it is version ".phpversion().")

From 8de816d7dd34d921f76884aeca6b5f2eeb35696e Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Sun, 12 Mar 2017 00:18:26 -0800
Subject: [PATCH 239/250] Some more linting via PHPDoc comments.

---
 core/imageboard.pack.php | 12 +++++++++++-
 core/user.class.php      |  6 +++++-
 ext/ext_manager/main.php |  8 +++++++-
 ext/index/main.php       |  1 +
 ext/upgrade/main.php     |  1 +
 ext/word_filter/main.php |  3 +++
 6 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index b21cbf6a9..71b57191d 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -59,9 +59,19 @@ class Image {
 	/** @var string[]|null */
 	public $tag_array;
 
-	public $owner_id, $owner_ip;
+	/** @var int */
+	public $owner_id;
+	
+	/** @var string */
+	public $owner_ip;
+	
+	/** @var string */
 	public $posted;
+	
+	/** @var string */
 	public $source;
+    
+	/** @var boolean */
 	public $locked;
 
 	/**
diff --git a/core/user.class.php b/core/user.class.php
index 3e375a8d6..e2b30a1df 100644
--- a/core/user.class.php
+++ b/core/user.class.php
@@ -1,6 +1,10 @@
 <?php
 
-/** @private */
+/**
+ * @private
+ * @param mixed $row
+ * @return User
+ */
 function _new_user($row) {
 	return new User($row);
 }
diff --git a/ext/ext_manager/main.php b/ext/ext_manager/main.php
index e92eea96f..9f6045c67 100644
--- a/ext/ext_manager/main.php
+++ b/ext/ext_manager/main.php
@@ -12,7 +12,10 @@
  *   extensions and read their documentation
  */
 
-/** @private */
+/**
+ * @private
+ * @return int
+ */
 function __extman_extcmp(ExtensionInfo $a, ExtensionInfo $b) {
 	return strcmp($a->name, $b->name);
 }
@@ -189,6 +192,9 @@ private function set_things($settings) {
 		$this->write_config($extras);
 	}
 
+    /**
+     * @param string[] $extra
+     */
 	private function write_config($extras) {
 		file_put_contents(
 			"data/config/extensions.conf.php",
diff --git a/ext/index/main.php b/ext/index/main.php
index 24fe3f5bf..5d09218b0 100644
--- a/ext/index/main.php
+++ b/ext/index/main.php
@@ -225,6 +225,7 @@ public function add_control(/*string*/ $html, /*int*/ $position=50) {
 }
 
 class Index extends Extension {
+    /** @var int */
 	private $stpen = 0;  // search term parse event number
 
 	public function onInitExt(InitExtEvent $event) {
diff --git a/ext/upgrade/main.php b/ext/upgrade/main.php
index ce92cd6bb..8f4b7dc50 100644
--- a/ext/upgrade/main.php
+++ b/ext/upgrade/main.php
@@ -129,6 +129,7 @@ public function onInitExt(InitExtEvent $event) {
 		}
 	}
 
+    /** @return int */
 	public function get_priority() {return 5;}
 }
 
diff --git a/ext/word_filter/main.php b/ext/word_filter/main.php
index f9cbf21e4..9a12b4fa3 100644
--- a/ext/word_filter/main.php
+++ b/ext/word_filter/main.php
@@ -43,6 +43,9 @@ private function filter(/*string*/ $text) {
 		return $text;
 	}
 
+	/**
+	 * @return string[]
+	 */
 	private function get_map() {
 		global $config;
 		$raw = $config->get_string("word_filter");

From ec4111430db7fa6034aae73fc5eccab2d65675b1 Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Sun, 12 Mar 2017 00:29:10 -0800
Subject: [PATCH 240/250] More linting.

---
 ext/ext_manager/main.php | 2 +-
 ext/image/main.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/ext_manager/main.php b/ext/ext_manager/main.php
index 9f6045c67..3a19809d7 100644
--- a/ext/ext_manager/main.php
+++ b/ext/ext_manager/main.php
@@ -193,7 +193,7 @@ private function set_things($settings) {
 	}
 
     /**
-     * @param string[] $extra
+     * @param string[] $extras
      */
 	private function write_config($extras) {
 		file_put_contents(
diff --git a/ext/image/main.php b/ext/image/main.php
index fb1101065..fde7b7276 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -376,7 +376,7 @@ private function add_image(Image $image) {
 		$image->tag_array = array();
 		send_event(new TagSetEvent($image, $tags_to_set));
 
-		if($image->source) {
+		if($image->source !== null) {
 			log_info("core-image", "Source for Image #{$image->id} set to: {$image->source}");
 		}
 	}

From 7bd581b53070ae0938c0ed31fbe6b48e61f109c2 Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Sun, 12 Mar 2017 14:29:35 -0700
Subject: [PATCH 241/250] Scrutinizer commets.

---
 core/imageboard.pack.php     |  2 +-
 core/util.inc.php            | 28 ++++++++++++++++++++++++++++
 ext/wiki/main.php            |  4 ++++
 themes/lite/layout.class.php |  2 +-
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 71b57191d..755de669e 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -1265,7 +1265,7 @@ function add_image($tmpname, $filename, $tags) {
  *
  * @param int $orig_width
  * @param int $orig_height
- * @return int[]
+ * @return integer[]
  */
 function get_thumbnail_size(/*int*/ $orig_width, /*int*/ $orig_height) {
 	global $config;
diff --git a/core/util.inc.php b/core/util.inc.php
index 21a451ae6..36f37cae9 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -433,8 +433,20 @@ function endsWith(/*string*/ $haystack, /*string*/ $needle) {
 }
 
 if(!function_exists("mb_strlen")) {  // D:
+
+	/**
+	 * @param string $str
+	 */
 	function mb_strlen($str) {return strlen($str);}
+
+	/**
+	 * @param string $enc
+	 */
 	function mb_internal_encoding($enc) {}
+
+	/**
+	 * @param string $str
+	 */
 	function mb_strtolower($str) {return strtolower($str);}
 }
 
@@ -1028,6 +1040,10 @@ function transload($url, $mfile) {
 }
 
 if (!function_exists('http_parse_headers')) { #http://www.php.net/manual/en/function.http-parse-headers.php#112917
+
+	/**
+	 * @param string $raw_headers
+	 */
 	function http_parse_headers ($raw_headers){
 		$headers = array(); // $headers = [];
 
@@ -1157,9 +1173,21 @@ function log_msg(/*string*/ $section, /*int*/ $priority, /*string*/ $message, $f
 }
 
 // More shorthand ways of logging
+/**
+ * @param string $section
+ */
 function log_debug(   /*string*/ $section, /*string*/ $message, $flash=false, $args=array()) {log_msg($section, SCORE_LOG_DEBUG, $message, $flash, $args);}
+/**
+ * @param string $section
+ */
 function log_info(    /*string*/ $section, /*string*/ $message, $flash=false, $args=array()) {log_msg($section, SCORE_LOG_INFO, $message, $flash, $args);}
+/**
+ * @param string $section
+ */
 function log_warning( /*string*/ $section, /*string*/ $message, $flash=false, $args=array()) {log_msg($section, SCORE_LOG_WARNING, $message, $flash, $args);}
+/**
+ * @param string $section
+ */
 function log_error(   /*string*/ $section, /*string*/ $message, $flash=false, $args=array()) {log_msg($section, SCORE_LOG_ERROR, $message, $flash, $args);}
 function log_critical(/*string*/ $section, /*string*/ $message, $flash=false, $args=array()) {log_msg($section, SCORE_LOG_CRITICAL, $message, $flash, $args);}
 
diff --git a/ext/wiki/main.php b/ext/wiki/main.php
index cd61a1e43..5d5d28da7 100644
--- a/ext/wiki/main.php
+++ b/ext/wiki/main.php
@@ -494,6 +494,10 @@ private function arr_diff( $f1 , $f2 , $show_equal = 0 )
 
 	/** 
 	 *   callback function to format the diffence-lines with your 'style' 
+	 * @param integer $nr1
+	 * @param integer $nr2
+	 * @param string $stat
+	 * @return string
 	 */ 
 	private function formatline( $nr1, $nr2, $stat, &$value ) { #change to $value if problems 
 		if(trim($value) == "") {
diff --git a/themes/lite/layout.class.php b/themes/lite/layout.class.php
index 1728044ff..337d60a33 100644
--- a/themes/lite/layout.class.php
+++ b/themes/lite/layout.class.php
@@ -241,7 +241,7 @@ public function block_to_html(Block $block, $hidable=false, $salt="") {
 
 	/**
 	 * @param string $link
-	 * @param null|string $desc
+	 * @param string $desc
 	 * @param string[] $pages_matched
 	 * @return null|string
 	 */

From a5a89dc08dd654db59c46b3e6ef43b17753a923c Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Sun, 12 Mar 2017 14:43:19 -0700
Subject: [PATCH 242/250] mb_strlen and mb_internal_encoding have been in core
 PHP since version 4.0.6 mb_strtolower has been in core PHP since version
 4.3.0

---
 core/util.inc.php | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/core/util.inc.php b/core/util.inc.php
index 36f37cae9..1a17f70c0 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -432,24 +432,6 @@ function endsWith(/*string*/ $haystack, /*string*/ $needle) {
 	return (substr($haystack, $start) === $needle);
 }
 
-if(!function_exists("mb_strlen")) {  // D:
-
-	/**
-	 * @param string $str
-	 */
-	function mb_strlen($str) {return strlen($str);}
-
-	/**
-	 * @param string $enc
-	 */
-	function mb_internal_encoding($enc) {}
-
-	/**
-	 * @param string $str
-	 */
-	function mb_strtolower($str) {return strtolower($str);}
-}
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * HTML Generation                                                           *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

From b053be5d884cce8bacf96347208b402e6b7e9a88 Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Sun, 12 Mar 2017 14:53:49 -0700
Subject: [PATCH 243/250] More linting.

---
 core/util.inc.php | 38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/core/util.inc.php b/core/util.inc.php
index 1a17f70c0..81582cdff 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -1025,6 +1025,7 @@ function transload($url, $mfile) {
 
 	/**
 	 * @param string $raw_headers
+	 * @return string[]
 	 */
 	function http_parse_headers ($raw_headers){
 		$headers = array(); // $headers = [];
@@ -1157,20 +1158,38 @@ function log_msg(/*string*/ $section, /*int*/ $priority, /*string*/ $message, $f
 // More shorthand ways of logging
 /**
  * @param string $section
+ * @param string $message
+ * @param bool|string $flash
+ * @param array $args
  */
 function log_debug(   /*string*/ $section, /*string*/ $message, $flash=false, $args=array()) {log_msg($section, SCORE_LOG_DEBUG, $message, $flash, $args);}
 /**
  * @param string $section
+ * @param string $message
+ * @param bool|string $flash
+ * @param array $args
  */
 function log_info(    /*string*/ $section, /*string*/ $message, $flash=false, $args=array()) {log_msg($section, SCORE_LOG_INFO, $message, $flash, $args);}
 /**
  * @param string $section
+ * @param string $message
+ * @param bool|string $flash
+ * @param array $args
  */
 function log_warning( /*string*/ $section, /*string*/ $message, $flash=false, $args=array()) {log_msg($section, SCORE_LOG_WARNING, $message, $flash, $args);}
 /**
  * @param string $section
+ * @param string $message
+ * @param bool|string $flash
+ * @param array $args
  */
 function log_error(   /*string*/ $section, /*string*/ $message, $flash=false, $args=array()) {log_msg($section, SCORE_LOG_ERROR, $message, $flash, $args);}
+/**
+ * @param string $section
+ * @param string $message
+ * @param bool|string $flash
+ * @param array $args
+ */
 function log_critical(/*string*/ $section, /*string*/ $message, $flash=false, $args=array()) {log_msg($section, SCORE_LOG_CRITICAL, $message, $flash, $args);}
 
 
@@ -1201,8 +1220,8 @@ function get_request_id() {
 /**
  * Remove an item from an array
  *
- * @param $array
- * @param $to_remove
+ * @param array $array
+ * @param mixed $to_remove
  * @return array
  */
 function array_remove($array, $to_remove) {
@@ -1221,8 +1240,8 @@ function array_remove($array, $to_remove) {
  *
  * Also removes duplicate values from the array.
  *
- * @param $array
- * @param $element
+ * @param array $array
+ * @param mixed $element
  * @return array
  */
 function array_add($array, $element) {
@@ -1236,7 +1255,7 @@ function array_add($array, $element) {
 /**
  * Return the unique elements of an array, case insensitively
  *
- * @param $array
+ * @param array $array
  * @return array
  */
 function array_iunique($array) {
@@ -1260,8 +1279,8 @@ function array_iunique($array) {
  *
  * from http://uk.php.net/network
  *
- * @param $IP
- * @param $CIDR
+ * @param string $IP
+ * @param string $CIDR
  * @return bool
  */
 function ip_in_range($IP, $CIDR) {
@@ -1400,7 +1419,10 @@ function list_files(/*string*/ $base, $_sub_dir="") {
 	return $file_list;
 }
 
-
+/**
+ * @param string $path
+ * @return string
+ */
 function path_to_tags($path) {
     $matches = array();
     if(preg_match("/\d+ - (.*)\.([a-zA-Z]+)/", basename($path), $matches)) {

From 1caef6d633ceeab6d18cb8458ce45a1ac2b11eda Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Sun, 12 Mar 2017 23:45:38 +0000
Subject: [PATCH 244/250] Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 ext/index/main.php         |  2 +-
 ext/ouroboros_api/main.php |  3 +++
 ext/view/theme.php         |  3 +++
 tests/bootstrap.php        | 12 ++++++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ext/index/main.php b/ext/index/main.php
index 5d09218b0..906b446fb 100644
--- a/ext/index/main.php
+++ b/ext/index/main.php
@@ -168,7 +168,7 @@ class SearchTermParseEvent extends Event {
 
 	/**
 	 * @param string|null $term
-	 * @param array $context
+	 * @param string[] $context
 	 */
 	public function __construct($term, array $context) {
 		$this->term = $term;
diff --git a/ext/ouroboros_api/main.php b/ext/ouroboros_api/main.php
index 8c8a5138f..95a69d970 100644
--- a/ext/ouroboros_api/main.php
+++ b/ext/ouroboros_api/main.php
@@ -776,6 +776,9 @@ private function sendData($type = '', $data = array(), $offset = 0)
         $page->set_data($response);
     }
 
+    /**
+     * @param string $type
+     */
     private function createItemXML(XMLWriter &$xml, $type, $item)
     {
         $xml->startElement($type);
diff --git a/ext/view/theme.php b/ext/view/theme.php
index 68e6affea..64bd1a572 100644
--- a/ext/view/theme.php
+++ b/ext/view/theme.php
@@ -45,6 +45,9 @@ protected function build_pin(Image $image) {
 		return "$h_prev | $h_index | $h_next";
 	}
 
+	/**
+	 * @return string
+	 */
 	protected function build_navigation(Image $image) {
 		$h_pin = $this->build_pin($image);
 		$h_search = "
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 73172759c..d17b242af 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -63,6 +63,9 @@ protected function assert_no_title($title) {
 		$this->assertNotContains($title, $page->title);
 	}
 
+	/**
+	 * @param integer $code
+	 */
 	protected function assert_response($code) {
 		global $page;
 		$this->assertEquals($code, $page->code);
@@ -84,15 +87,24 @@ protected function assert_text($text, $section=null) {
 		$this->assertContains($text, $this->page_to_text($section));
 	}
 
+	/**
+	 * @param string $text
+	 */
 	protected function assert_no_text($text, $section=null) {
 		$this->assertNotContains($text, $this->page_to_text($section));
 	}
 
+	/**
+	 * @param string $content
+	 */
 	protected function assert_content($content) {
 		global $page;
 		$this->assertContains($content, $page->data);
 	}
 
+	/**
+	 * @param string $content
+	 */
 	protected function assert_no_content($content) {
 		global $page;
 		$this->assertNotContains($content, $page->data);

From 204ea1d23944d8aedeb8e8d0a37120658cfed27b Mon Sep 17 00:00:00 2001
From: jgen <jeffgenovy@gmail.com>
Date: Sun, 12 Mar 2017 17:13:32 -0700
Subject: [PATCH 245/250] And more linting.

---
 ext/index/main.php  | 2 +-
 ext/rating/main.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/index/main.php b/ext/index/main.php
index 906b446fb..49e53781b 100644
--- a/ext/index/main.php
+++ b/ext/index/main.php
@@ -161,7 +161,7 @@
 class SearchTermParseEvent extends Event {
 	/** @var null|string  */
 	public $term = null;
-	/** @var null */
+	/** @var string[] */
 	public $context = array();
 	/** @var \Querylet[] */
 	public $querylets = array();
diff --git a/ext/rating/main.php b/ext/rating/main.php
index 8345b74b9..fffb60f0d 100644
--- a/ext/rating/main.php
+++ b/ext/rating/main.php
@@ -242,7 +242,7 @@ private function can_rate() {
 	}
 
 	/**
-	 * @param $context
+	 * @param string[] $context
 	 * @return bool
 	 */
 	private function no_rating_query($context) {

From cd7352ad9b75da67e4804da9bcc7703c04dadaa0 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 17 Mar 2017 23:12:54 +0000
Subject: [PATCH 246/250] only need to disable these on PHP5.3 and lower

---
 .htaccess | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.htaccess b/.htaccess
index 30a33a42f..25a39b029 100644
--- a/.htaccess
+++ b/.htaccess
@@ -25,12 +25,6 @@
 	RewriteRule ^(.*)$ index.php?q=$1&%{QUERY_STRING} [L]
 </IfModule>
 
-<IfModule mod_php5.c>
-	php_flag register_globals 0 
-	php_flag magic_quotes_gpc 0 
-	php_flag magic_quotes_runtime 0
-</IfModule>
-
 <IfModule mod_expires.c>
 	ExpiresActive On
 	<FilesMatch "([0-9a-f]{32}|\.(gif|jpe?g|png|css|js))$">

From e2272e77861d9f806278be36e22ef44d77075c8e Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Fri, 17 Mar 2017 23:56:26 +0000
Subject: [PATCH 247/250] linting

---
 .htaccess | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/.htaccess b/.htaccess
index 25a39b029..d6a437977 100644
--- a/.htaccess
+++ b/.htaccess
@@ -12,7 +12,7 @@
 </FilesMatch>
 
 <IfModule mod_rewrite.c>
-	RewriteEngine  on
+	RewriteEngine On
 
 	# rather than link to images/ha/hash and have an ugly filename,
 	# we link to images/hash/tags.ext; mod_rewrite splits things so
@@ -37,19 +37,31 @@
 	#ExpiresByType text/plain "now"
 </IfModule>
 
-<ifmodule mod_deflate.c>
+<IfModule mod_deflate.c>
 	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
 	AddOutputFilterByType DEFLATE application/x-javascript application/javascript
-</ifmodule>
+</IfModule>
 
-AddType audio/mp4      f4a f4b m4a
-AddType audio/ogg      oga ogg opus
-AddType image/jpeg     jpg jpeg
-AddType image/bmp      bmp
-AddType image/svg+xml  svg svgz
+#EXT: handle_pixel
+AddType image/jpeg  jpg jpeg
+AddType image/gif   gif
+AddType image/png   png
+
+#EXT: handle_ico
 AddType image/x-icon   ico ani cur
-AddType image/webp     webp
+
+#EXT: handle_flash
+AddType application/x-shockwave-flash swf
+
+#EXT: handle_mp3
+AddType audio/mpeg mp3
+
+#EXT: handle_svg
+AddType image/svg+xml  svg svgz
+
+#EXT: handle_video
+AddType video/x-flv    flv
 AddType video/mp4      f4v f4p m4v mp4
+AddType audio/mp4      f4a f4b m4a
 AddType video/ogg      ogv
 AddType video/webm     webm
-AddType video/x-flv    flv
\ No newline at end of file

From 2b62cc81716c345dc620af00557f849e21753204 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Mar 2017 00:13:16 +0000
Subject: [PATCH 248/250] loading SVG via <img> instead of <object> to stop
 inline JS execution

---
 ext/handle_svg/main.php  | 2 +-
 ext/handle_svg/theme.php | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ext/handle_svg/main.php b/ext/handle_svg/main.php
index 6db9ad1d9..c932f6ba9 100644
--- a/ext/handle_svg/main.php
+++ b/ext/handle_svg/main.php
@@ -3,7 +3,7 @@
  * Name: Handle SVG
  * Author: Shish <webmaster@shishnet.org>
  * Link: http://code.shishnet.org/shimmie2/
- * Description: Handle SVG files. (No thumbnail is generated for SVG files)
+ * Description: Handle static SVG files. (No thumbnail is generated for SVG files)
  */
 
 class SVGFileHandler extends Extension {
diff --git a/ext/handle_svg/theme.php b/ext/handle_svg/theme.php
index 8e87ee1d6..277703dc3 100644
--- a/ext/handle_svg/theme.php
+++ b/ext/handle_svg/theme.php
@@ -5,9 +5,8 @@ public function display_image(Page $page, Image $image) {
 		$ilink = make_link("get_svg/{$image->id}/{$image->id}.svg");
 //		$ilink = $image->get_image_link();
 		$html = "
-			<object data='$ilink' type='image/svg+xml' data-width='{$image->width}' data-height='{$image->height}' id='main_image' class='shm-main-image'>
-				<embed src='$ilink' type='image/svg+xml' />
-			</object>
+			<img src='$ilink' id='main_image' class='shm-main-image' data-width='{$image->width}' data-height='{$image->height}' />
+
 		";
 		$page->add_block(new Block("Image", $html, "main", 10));
 	}

From acba60e7aa35dac8e5c86de89ad72c59eb355209 Mon Sep 17 00:00:00 2001
From: Daku <admin@codeanimu.net>
Date: Sat, 18 Mar 2017 00:49:08 +0000
Subject: [PATCH 249/250] remove extra newline

---
 ext/handle_svg/theme.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ext/handle_svg/theme.php b/ext/handle_svg/theme.php
index 277703dc3..5b7def3b2 100644
--- a/ext/handle_svg/theme.php
+++ b/ext/handle_svg/theme.php
@@ -6,7 +6,6 @@ public function display_image(Page $page, Image $image) {
 //		$ilink = $image->get_image_link();
 		$html = "
 			<img src='$ilink' id='main_image' class='shm-main-image' data-width='{$image->width}' data-height='{$image->height}' />
-
 		";
 		$page->add_block(new Block("Image", $html, "main", 10));
 	}

From 495776cac1a30b945220a8c7e71fbe1a0ff10d9a Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Fri, 17 Mar 2017 02:12:47 -0400
Subject: [PATCH 250/250] Fixed bookmarklet when logged in on imageboards
 running gelbooru

---
 ext/upload/bookmarklet.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/upload/bookmarklet.js b/ext/upload/bookmarklet.js
index f1e734fab..5ea5d874a 100644
--- a/ext/upload/bookmarklet.js
+++ b/ext/upload/bookmarklet.js
@@ -79,7 +79,9 @@ else if(document.getElementById('tag-sidebar') !== null) {
 		var fileinfo;
 		var nodes = document.getElementById('pfd').parentNode.parentNode.getElementsByTagName('a');
 		for (var i = 0; i < nodes.length; i++) {
-			if (nodes[i].getAttribute('href') === "#") continue;
+			var href = nodes[i].getAttribute('href');
+			if (href === "#" || href === "javascript:;")
+				continue;
 			fileinfo = nodes[i];
 			break;
 		}